diff --git a/data/data.qrc b/data/data.qrc
index 4d49d45c6..f7fff7c07 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -330,7 +330,6 @@
         <file>providers/22x22/cdbaby.png</file>
         <file>providers/22x22/digitallyimported.png</file>
         <file>providers/22x22/dropbox.png</file>
-        <file>providers/22x22/echonest.png</file>
         <file>providers/22x22/googledrive.png</file>
         <file>providers/22x22/itunes.png</file>
         <file>providers/22x22/jamendo.png</file>
@@ -363,7 +362,6 @@
         <file>providers/32x32/cdbaby.png</file>
         <file>providers/32x32/digitallyimported.png</file>
         <file>providers/32x32/dropbox.png</file>
-        <file>providers/32x32/echonest.png</file>
         <file>providers/32x32/googledrive.png</file>
         <file>providers/32x32/itunes.png</file>
         <file>providers/32x32/jamendo.png</file>
@@ -396,7 +394,6 @@
         <file>providers/48x48/cdbaby.png</file>
         <file>providers/48x48/digitallyimported.png</file>
         <file>providers/48x48/dropbox.png</file>
-        <file>providers/48x48/echonest.png</file>
         <file>providers/48x48/googledrive.png</file>
         <file>providers/48x48/itunes.png</file>
         <file>providers/48x48/jamendo.png</file>
diff --git a/data/lyrics/ultimate_providers.xml b/data/lyrics/ultimate_providers.xml
index 563fc11ca..5f90c9747 100644
--- a/data/lyrics/ultimate_providers.xml
+++ b/data/lyrics/ultimate_providers.xml
@@ -62,7 +62,7 @@
   </provider>
   <provider name="genius.com" charset="utf-8" url="https://www.genius.com/{artist}-{title}-lyrics">
     <urlFormat replace=",._@!#%^*+;\/&quot;'()[]" with=""/>
-    <urlFormat replace=" " with="-"/>
+    <urlFormat replace=" :" with="-"/>
     <!-- When $ is used as the dollar sign it is ommitted from the url
          When $ is used instead of 's',
          in some cases it is replaced by 's'(Too $hort -> too-short)
@@ -127,6 +127,10 @@
     <extract>
       <item tag="&lt;div id=&quot;lyrics&quot; class=&quot;SCREENONLY&quot;&gt;"/>
     </extract>
+    <exclude>
+      <item begin="&lt;br&gt;&lt;br&gt;&lt;a target='_blank'" end="&gt;&lt;/a&gt;"/>
+    </exclude>
+    <invalidIndicator value="Click to search for the Lyrics on Lyrics.com"/>
     <invalidIndicator value="we do not have the lyric for this song"/>
   </provider>
   <provider name="lyrics.wikia.com" title="{artist}:{title} Lyrics - " charset="utf-8" url="http://lyrics.wikia.com/{Artist}:{Title}">
diff --git a/data/providers/22x22/echonest.png b/data/providers/22x22/echonest.png
deleted file mode 100644
index d504dba28..000000000
Binary files a/data/providers/22x22/echonest.png and /dev/null differ
diff --git a/data/providers/32x32/echonest.png b/data/providers/32x32/echonest.png
deleted file mode 100644
index 278a7238f..000000000
Binary files a/data/providers/32x32/echonest.png and /dev/null differ
diff --git a/data/providers/48x48/echonest.png b/data/providers/48x48/echonest.png
deleted file mode 100644
index 602f2dc53..000000000
Binary files a/data/providers/48x48/echonest.png and /dev/null differ
diff --git a/dist/clementine.appdata.xml b/dist/clementine.appdata.xml
index cc9700ba4..93ee8f088 100644
--- a/dist/clementine.appdata.xml
+++ b/dist/clementine.appdata.xml
@@ -15,7 +15,7 @@
 		<p>Summary of included features:</p>
 		<ul>
 			<li>Search and play your local music library</li>
-			<li>Listen to internet radio from Spotify, Grooveshark, SomaFM, Magnatune, Jamendo, SKY.fm, Digitally Imported, JAZZRADIO.com, Soundcloud, Icecast and Subsonic servers.</li>
+			<li>Listen to internet radio from Spotify, Grooveshark, SomaFM, Magnatune, Jamendo, SKY.fm, Digitally Imported, JAZZRADIO.com, Icecast and Subsonic servers.</li>
 			<li>Search and play songs you've uploaded to Box, Dropbox, Google Drive, and OneDrive</li>
 			<li>Create smart playlists and dynamic playlists.</li>
 			<li>Tabbed playlists, import and export M3U, XSPF, PLS and ASX.</li>
@@ -24,12 +24,12 @@
 			<li>Visualisations from projectM.</li>
 			<li>Lyrics and artist biographies and photos.</li>
 			<li>Transcode music into MP3, Ogg Vorbis, Ogg Speex, FLAC or AAC.</li>
-			<li>Edit tags on MP3 and OGG files, organise your music.</li>
+			<li>Edit tags on music files, organise your music.</li>
 			<li>Fetch missing tags from MusicBrainz.</li>
 			<li>Discover and download Podcasts.</li>
-			<li>Download missing album cover art from Last.fm and Amazon.</li>
+			<li>Download missing album cover art from Last.fm, MusicBrainz and Discogs.</li>
 			<li>Cross-platform - works on Windows, Mac OS X and Linux.</li>
-			<li>Native desktop notifications on Linux (libnotify) and Mac OS X (Growl).</li>
+			<li>Native desktop notifications on Linux (libnotify) and macOS (Growl).</li>
 			<li>Remote control using an Android device, a Wii Remote, MPRIS or the command-line.</li>
 			<li>Copy music to your iPod, iPhone, MTP or mass-storage USB player.</li>
 			<li>Queue manager.</li>
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index eed402835..591575fd2 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -33,14 +33,13 @@ parts:
     # See 'snapcraft plugins'
     build-packages:
 
-       [libgpm2,liblastfm-dev,libtag1-dev,gettext,libboost-dev,libboost-serialization-dev,libqt4-dev,qt4-dev-tools,libqt4-opengl-dev,cmake,libgstreamer1.0-dev,libgstreamer-plugins-base1.0-dev,libglew1.5-dev,libqjson-dev,libgpod-dev,libplist-dev,libusbmuxd-dev,libmtp-dev,libcdio-dev,protobuf-compiler,libprotobuf-dev,libcrypto++-dev,libfftw3-dev,libsparsehash-dev,libsqlite3-dev,libpulse-dev,libqtwebkit-dev,libechonest-dev,libchromaprint-dev,libqca2-dev]
+       [libgpm2,liblastfm-dev,libtag1-dev,gettext,libboost-dev,libboost-serialization-dev,libqt4-dev,qt4-dev-tools,libqt4-opengl-dev,cmake,libgstreamer1.0-dev,libgstreamer-plugins-base1.0-dev,libglew1.5-dev,libqjson-dev,libgpod-dev,libplist-dev,libusbmuxd-dev,libmtp-dev,libcdio-dev,protobuf-compiler,libprotobuf-dev,libcrypto++-dev,libfftw3-dev,libsparsehash-dev,libsqlite3-dev,libpulse-dev,libqtwebkit-dev,libchromaprint-dev,libqca2-dev]
   
     stage-packages: 
       - libc6
       - libcdio13
       - libchromaprint0
       - libcrypto++9v5
-      - libechonest2.3
       - libfftw3-double3
       - libgcc1 
       - libgl1-mesa-glx
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8ec05d4d4..d635aee7c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -109,7 +109,6 @@ set(SOURCES
   covers/albumcoverfetcher.cpp
   covers/albumcoverfetchersearch.cpp
   covers/albumcoverloader.cpp
-  covers/amazoncoverprovider.cpp
   covers/discogscoverprovider.cpp
   covers/coverexportrunnable.cpp
   covers/coverprovider.cpp
@@ -129,6 +128,7 @@ set(SOURCES
   devices/deviceview.cpp
   devices/deviceviewcontainer.cpp
   devices/filesystemdevice.cpp
+  devices/deviceinfo.cpp
 
   engines/devicefinder.cpp
   engines/enginebase.cpp
@@ -428,7 +428,6 @@ set(HEADERS
   covers/albumcoverfetcher.h
   covers/albumcoverfetchersearch.h
   covers/albumcoverloader.h
-  covers/amazoncoverprovider.h
   covers/discogscoverprovider.h
   covers/coverexportrunnable.h
   covers/coverprovider.h
@@ -447,6 +446,7 @@ set(HEADERS
   devices/deviceview.h
   devices/deviceviewcontainer.h
   devices/filesystemdevice.h
+  devices/deviceinfo.h
 
   engines/enginebase.h
   engines/gstengine.h
diff --git a/src/core/application.cpp b/src/core/application.cpp
index 7a0a94a0f..50092ab95 100644
--- a/src/core/application.cpp
+++ b/src/core/application.cpp
@@ -30,7 +30,6 @@
 #include "core/tagreaderclient.h"
 #include "core/taskmanager.h"
 #include "covers/albumcoverloader.h"
-#include "covers/amazoncoverprovider.h"
 #include "covers/coverproviders.h"
 #include "covers/currentartloader.h"
 #include "covers/discogscoverprovider.h"
@@ -99,7 +98,6 @@ class ApplicationImpl {
         cover_providers_([=]() {
           CoverProviders* cover_providers = new CoverProviders(app);
           // Initialize the repository of cover providers.
-          cover_providers->AddProvider(new AmazonCoverProvider);
           cover_providers->AddProvider(new MusicbrainzCoverProvider);
           cover_providers->AddProvider(new DiscogsCoverProvider);
         #ifdef HAVE_LIBLASTFM
diff --git a/src/covers/amazoncoverprovider.cpp b/src/covers/amazoncoverprovider.cpp
deleted file mode 100644
index e2613d26d..000000000
--- a/src/covers/amazoncoverprovider.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/* This file is part of Clementine.
-   Copyright 2011-2012, David Sansome <me@davidsansome.com>
-   Copyright 2011, 2014, John Maguire <john.maguire@gmail.com>
-   Copyright 2012, Arnaud Bienner <arnaud.bienner@gmail.com>
-   Copyright 2014, Krzysztof Sobiecki <sobkas@gmail.com>
-
-   Clementine is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Clementine is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "amazoncoverprovider.h"
-
-#include <QDateTime>
-#include <QNetworkReply>
-#include <QStringList>
-#include <QUrlQuery>
-#include <QXmlStreamReader>
-
-#include "core/closure.h"
-#include "core/logging.h"
-#include "core/network.h"
-#include "core/utilities.h"
-
-// Amazon has a web crawler that looks for access keys in public source code,
-// so we apply some sophisticated encryption to these keys.
-const char* AmazonCoverProvider::kAccessKeyB64 = "QUtJQUlRSDI2UlZNNlVaNFdBNlE=";
-const char* AmazonCoverProvider::kSecretAccessKeyB64 =
-    "ZTQ2UGczM0JRNytDajd4MWR6eFNvODVFd2tpdi9FbGVCcUZjMkVmMQ==";
-const char* AmazonCoverProvider::kUrl = "http://ecs.amazonaws.com/onca/xml";
-const char* AmazonCoverProvider::kAssociateTag = "clemmusiplay-20";
-
-AmazonCoverProvider::AmazonCoverProvider(QObject* parent)
-    : CoverProvider("Amazon", true, parent),
-      network_(new NetworkAccessManager(this)) {}
-
-bool AmazonCoverProvider::StartSearch(const QString& artist,
-                                      const QString& album, int id) {
-  typedef QPair<QString, QString> Arg;
-  typedef QList<Arg> ArgList;
-
-  typedef QPair<QByteArray, QByteArray> EncodedArg;
-  typedef QList<EncodedArg> EncodedArgList;
-
-  // Must be sorted by parameter name
-  ArgList args =
-      ArgList() << Arg("AWSAccessKeyId", QByteArray::fromBase64(kAccessKeyB64))
-                << Arg("AssociateTag", kAssociateTag)
-                << Arg("Keywords", artist + " " + album)
-                << Arg("Operation", "ItemSearch")
-                << Arg("ResponseGroup", "Images") << Arg("SearchIndex", "All")
-                << Arg("Service", "AWSECommerceService")
-                << Arg("Timestamp", QDateTime::currentDateTime().toString(
-                                        "yyyy-MM-ddThh:mm:ss.zzzZ"))
-                << Arg("Version", "2009-11-01");
-
-  QUrlQuery url_query;
-  QUrl url(kUrl);
-  QStringList query_items;
-
-  // Encode the arguments
-  for (const Arg& arg : args) {
-    EncodedArg encoded_arg(QUrl::toPercentEncoding(arg.first),
-                           QUrl::toPercentEncoding(arg.second));
-    query_items << QString(encoded_arg.first + "=" + encoded_arg.second);
-    url_query.addQueryItem(encoded_arg.first, encoded_arg.second);
-  }
-
-  // Sign the request
-
-  const QByteArray data_to_sign =
-      QString("GET\n%1\n%2\n%3")
-          .arg(url.host(), url.path(), query_items.join("&"))
-          .toLatin1();
-  const QByteArray signature(Utilities::HmacSha256(
-      QByteArray::fromBase64(kSecretAccessKeyB64), data_to_sign));
-
-  // Add the signature to the request
-
-  url_query.addQueryItem("Signature",
-                         QUrl::toPercentEncoding(signature.toBase64()));
-  url.setQuery(url_query);
-
-  QNetworkReply* reply = network_->get(QNetworkRequest(url));
-  NewClosure(reply, SIGNAL(finished()), this,
-             SLOT(QueryFinished(QNetworkReply*, int)), reply, id);
-
-  return true;
-}
-
-void AmazonCoverProvider::QueryFinished(QNetworkReply* reply, int id) {
-  reply->deleteLater();
-
-  CoverSearchResults results;
-
-  QXmlStreamReader reader(reply);
-  while (!reader.atEnd()) {
-    reader.readNext();
-    if (reader.tokenType() == QXmlStreamReader::StartElement &&
-        reader.name() == "Item") {
-      ReadItem(&reader, &results);
-    }
-  }
-
-  emit SearchFinished(id, results);
-}
-
-void AmazonCoverProvider::ReadItem(QXmlStreamReader* reader,
-                                   CoverSearchResults* results) {
-  while (!reader->atEnd()) {
-    switch (reader->readNext()) {
-      case QXmlStreamReader::StartElement:
-        if (reader->name() == "LargeImage") {
-          ReadLargeImage(reader, results);
-        } else {
-          reader->skipCurrentElement();
-        }
-        break;
-
-      case QXmlStreamReader::EndElement:
-        return;
-
-      default:
-        break;
-    }
-  }
-}
-
-void AmazonCoverProvider::ReadLargeImage(QXmlStreamReader* reader,
-                                         CoverSearchResults* results) {
-  while (!reader->atEnd()) {
-    switch (reader->readNext()) {
-      case QXmlStreamReader::StartElement:
-        if (reader->name() == "URL") {
-          CoverSearchResult result;
-          result.image_url = QUrl(reader->readElementText());
-          results->append(result);
-        } else {
-          reader->skipCurrentElement();
-        }
-        break;
-
-      case QXmlStreamReader::EndElement:
-        return;
-
-      default:
-        break;
-    }
-  }
-}
diff --git a/src/covers/amazoncoverprovider.h b/src/covers/amazoncoverprovider.h
deleted file mode 100644
index 7044eb60b..000000000
--- a/src/covers/amazoncoverprovider.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This file is part of Clementine.
-   Copyright 2011-2012, David Sansome <me@davidsansome.com>
-   Copyright 2011, 2014, John Maguire <john.maguire@gmail.com>
-   Copyright 2014, Krzysztof Sobiecki <sobkas@gmail.com>
-
-   Clementine is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Clementine is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef COVERS_AMAZONCOVERPROVIDER_H_
-#define COVERS_AMAZONCOVERPROVIDER_H_
-
-#include "coverprovider.h"
-
-#include <QXmlStreamReader>
-
-class QNetworkAccessManager;
-
-class AmazonCoverProvider : public CoverProvider {
-  Q_OBJECT
-
- public:
-  explicit AmazonCoverProvider(QObject* parent = nullptr);
-
-  static const char* kAccessKeyB64;
-  static const char* kSecretAccessKeyB64;
-  static const char* kUrl;
-  static const char* kAssociateTag;
-
-  bool StartSearch(const QString& artist, const QString& album, int id);
-
- private slots:
-  void QueryFinished(QNetworkReply* reply, int id);
-
- private:
-  void ReadItem(QXmlStreamReader* reader, CoverSearchResults* results);
-  void ReadLargeImage(QXmlStreamReader* reader, CoverSearchResults* results);
-
- private:
-  QNetworkAccessManager* network_;
-};
-
-#endif  // COVERS_AMAZONCOVERPROVIDER_H_
diff --git a/src/devices/connecteddevice.cpp b/src/devices/connecteddevice.cpp
index 59e23e0e7..c99803c06 100644
--- a/src/devices/connecteddevice.cpp
+++ b/src/devices/connecteddevice.cpp
@@ -91,7 +91,11 @@ void ConnectedDevice::InitBackendDirectory(const QString& mount_point,
 void ConnectedDevice::ConnectAsync() { emit ConnectFinished(unique_id_, true); }
 
 void ConnectedDevice::Eject() {
-  manager_->UnmountAsync(manager_->FindDeviceById(unique_id_));
+  DeviceInfo* info = manager_->FindDeviceById(unique_id_);
+  if (!info) return;
+  QModelIndex idx = manager_->ItemToIndex(info);
+  if (!idx.isValid()) return;
+  manager_->UnmountAsync(idx);
 }
 
 void ConnectedDevice::FinishCopy(bool) {
@@ -103,15 +107,24 @@ void ConnectedDevice::FinishDelete(bool) {
 }
 
 MusicStorage::TranscodeMode ConnectedDevice::GetTranscodeMode() const {
-  int index = manager_->FindDeviceById(unique_id_);
+  DeviceInfo* info = manager_->FindDeviceById(unique_id_);
+  if (!info) return MusicStorage::TranscodeMode();
+
+  QModelIndex idx = manager_->ItemToIndex(info);
+  if (!idx.isValid()) return MusicStorage::TranscodeMode();
+
   return MusicStorage::TranscodeMode(
-      manager_->index(index).data(DeviceManager::Role_TranscodeMode).toInt());
+      idx.data(DeviceManager::Role_TranscodeMode).toInt());
 }
 
 Song::FileType ConnectedDevice::GetTranscodeFormat() const {
-  int index = manager_->FindDeviceById(unique_id_);
-  return Song::FileType(
-      manager_->index(index).data(DeviceManager::Role_TranscodeFormat).toInt());
+  DeviceInfo* info = manager_->FindDeviceById(unique_id_);
+  if (!info) return Song::Type_Unknown;
+
+  QModelIndex idx = manager_->ItemToIndex(info);
+  if (!idx.isValid()) return Song::Type_Unknown;
+
+  return Song::FileType(idx.data(DeviceManager::Role_TranscodeFormat).toInt());
 }
 
 void ConnectedDevice::BackendTotalSongCountUpdated(int count) {
diff --git a/src/devices/deviceinfo.cpp b/src/devices/deviceinfo.cpp
new file mode 100644
index 000000000..9c1d83dac
--- /dev/null
+++ b/src/devices/deviceinfo.cpp
@@ -0,0 +1,124 @@
+/* This file is part of Clementine.
+   Copyright 2010, David Sansome <me@davidsansome.com>
+
+   Clementine is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   Clementine is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "devicemanager.h"
+
+#include <memory>
+
+#include <QIcon>
+#include <QPixmap>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
+
+#include "config.h"
+#include "core/logging.h"
+#include "core/simpletreemodel.h"
+#include "ui/iconloader.h"
+
+#include "devicedatabasebackend.h"
+#include "deviceinfo.h"
+#include "devicelister.h"
+
+DeviceDatabaseBackend::Device DeviceInfo::SaveToDb() const {
+  DeviceDatabaseBackend::Device ret;
+  ret.friendly_name_ = friendly_name_;
+  ret.size_ = size_;
+  ret.id_ = database_id_;
+  ret.icon_name_ = icon_name_;
+  ret.transcode_mode_ = transcode_mode_;
+  ret.transcode_format_ = transcode_format_;
+
+  QStringList unique_ids;
+  for (const Backend& backend : backends_) {
+    unique_ids << backend.unique_id_;
+  }
+  ret.unique_id_ = unique_ids.join(",");
+
+  return ret;
+}
+
+void DeviceInfo::InitFromDb(const DeviceDatabaseBackend::Device& dev) {
+  database_id_ = dev.id_;
+  friendly_name_ = dev.friendly_name_;
+  size_ = dev.size_;
+  transcode_mode_ = dev.transcode_mode_;
+  transcode_format_ = dev.transcode_format_;
+
+  QStringList icon_names = dev.icon_name_.split(',');
+  QVariantList icons;
+  for (const QString& icon_name : icon_names) {
+    icons << icon_name;
+  }
+
+  LoadIcon(icons, friendly_name_);
+
+  QStringList unique_ids = dev.unique_id_.split(',');
+  for (const QString& id : unique_ids) {
+    backends_ << Backend(nullptr, id);
+  }
+}
+
+const DeviceInfo::Backend* DeviceInfo::BestBackend() const {
+  int best_priority = -1;
+  const Backend* ret = nullptr;
+
+  for (int i = 0; i < backends_.count(); ++i) {
+    if (backends_[i].lister_ &&
+        backends_[i].lister_->priority() > best_priority) {
+      best_priority = backends_[i].lister_->priority();
+      ret = &(backends_[i]);
+    }
+  }
+
+  if (!ret && !backends_.isEmpty()) return &(backends_[0]);
+  return ret;
+}
+
+void DeviceInfo::LoadIcon(const QVariantList& icons, const QString& name_hint) {
+  if (icons.isEmpty()) {
+    icon_name_ = "drive-removable-media-usb-pendrive";
+    icon_ = IconLoader::Load(icon_name_, IconLoader::Base);
+    return;
+  }
+
+  // Try to load the icon with that exact name first
+  for (const QVariant& icon : icons) {
+    if (!icon.value<QPixmap>().isNull()) {
+      icon_ = QIcon(icon.value<QPixmap>());
+      return;
+    } else {
+      icon_ = IconLoader::Load(icon.toString(), IconLoader::Base);
+      if (!icon_.isNull()) {
+        icon_name_ = icon.toString();
+        return;
+      }
+    }
+  }
+
+  QString hint = QString(icons.first().toString() + name_hint).toLower();
+
+  // If that failed than try to guess if it's a phone or ipod.  Fall back on
+  // a usb memory stick icon.
+  if (hint.contains("phone"))
+    icon_name_ = "phone";
+  else if (hint.contains("ipod") || hint.contains("apple"))
+    icon_name_ = "multimedia-player-ipod-standard-monochrome";
+  else
+    icon_name_ = "drive-removable-media-usb-pendrive";
+  icon_ = IconLoader::Load(icon_name_, IconLoader::Base);
+}
diff --git a/src/devices/deviceinfo.h b/src/devices/deviceinfo.h
new file mode 100644
index 000000000..e7e4a4a56
--- /dev/null
+++ b/src/devices/deviceinfo.h
@@ -0,0 +1,108 @@
+/* This file is part of Clementine.
+   Copyright 2010, David Sansome <me@davidsansome.com>
+
+   Clementine is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   Clementine is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef DEVICEINFO_H
+#define DEVICEINFO_H
+
+#include <memory>
+
+#include <QIcon>
+#include <QList>
+#include <QString>
+#include <QVariant>
+
+#include "core/musicstorage.h"
+#include "core/simpletreeitem.h"
+#include "core/simpletreemodel.h"
+#include "core/song.h"
+#include "devicedatabasebackend.h"
+#include "library/librarymodel.h"
+
+class ConnectedDevice;
+class DeviceLister;
+
+// Devices can be in three different states:
+//  1) Remembered in the database but not physically connected at the moment.
+//     database_id valid, lister null, device null
+//  2) Physically connected but the user hasn't "connected" it to Clementine
+//     yet.
+//     database_id == -1, lister valid, device null
+//  3) Physically connected and connected to Clementine
+//     database_id valid, lister valid, device valid
+// Devices in all states will have a unique_id.
+class DeviceInfo : public SimpleTreeItem<DeviceInfo> {
+ public:
+  enum Type {
+    Type_Root,
+    Type_Device,
+  };
+
+  DeviceInfo(SimpleTreeModel<DeviceInfo>* model)
+      : SimpleTreeItem<DeviceInfo>(Type_Root, model),
+        database_id_(-1),
+        size_(0),
+        transcode_mode_(MusicStorage::Transcode_Unsupported),
+        transcode_format_(Song::Type_Unknown),
+        task_percentage_(-1) {}
+
+  DeviceInfo(Type type, DeviceInfo* parent = nullptr)
+      : SimpleTreeItem<DeviceInfo>(type, parent),
+        database_id_(-1),
+        size_(0),
+        transcode_mode_(MusicStorage::Transcode_Unsupported),
+        transcode_format_(Song::Type_Unknown),
+        task_percentage_(-1) {}
+
+  // A device can be discovered in different ways (devicekit, gio, etc.)
+  // Sometimes the same device is discovered more than once.  In this case
+  // the device will have multiple "backends".
+  struct Backend {
+    Backend(DeviceLister* lister = nullptr, const QString& id = QString())
+        : lister_(lister), unique_id_(id) {}
+
+    DeviceLister* lister_;  // nullptr if not physically connected
+    QString unique_id_;
+  };
+
+  // Serialising to the database
+  void InitFromDb(const DeviceDatabaseBackend::Device& dev);
+  DeviceDatabaseBackend::Device SaveToDb() const;
+
+  // Tries to load a good icon for the device.  Sets icon_name_ and icon_.
+  void LoadIcon(const QVariantList& icons, const QString& name_hint);
+
+  // Gets the best backend available (the one with the highest priority)
+  const Backend* BestBackend() const;
+
+  int database_id_;  // -1 if not remembered in the database
+  std::shared_ptr<ConnectedDevice>
+      device_;  // nullptr if not connected to clementine
+  QList<Backend> backends_;
+
+  QString friendly_name_;
+  quint64 size_;
+
+  QString icon_name_;
+  QIcon icon_;
+
+  MusicStorage::TranscodeMode transcode_mode_;
+  Song::FileType transcode_format_;
+
+  int task_percentage_;
+};
+
+#endif  // DEVICEINFO_H
diff --git a/src/devices/devicemanager.cpp b/src/devices/devicemanager.cpp
index 06bf93393..6e911d23e 100644
--- a/src/devices/devicemanager.cpp
+++ b/src/devices/devicemanager.cpp
@@ -34,9 +34,11 @@
 #include "core/database.h"
 #include "core/logging.h"
 #include "core/musicstorage.h"
+#include "core/simpletreemodel.h"
 #include "core/taskmanager.h"
 #include "core/utilities.h"
 #include "devicedatabasebackend.h"
+#include "deviceinfo.h"
 #include "devicekitlister.h"
 #include "devicestatefiltermodel.h"
 #include "filesystemdevice.h"
@@ -68,106 +70,8 @@ using std::bind;
 const int DeviceManager::kDeviceIconSize = 32;
 const int DeviceManager::kDeviceIconOverlaySize = 16;
 
-DeviceManager::DeviceInfo::DeviceInfo()
-    : database_id_(-1),
-      transcode_mode_(MusicStorage::Transcode_Unsupported),
-      transcode_format_(Song::Type_Unknown),
-      task_percentage_(-1) {}
-
-DeviceDatabaseBackend::Device DeviceManager::DeviceInfo::SaveToDb() const {
-  DeviceDatabaseBackend::Device ret;
-  ret.friendly_name_ = friendly_name_;
-  ret.size_ = size_;
-  ret.id_ = database_id_;
-  ret.icon_name_ = icon_name_;
-  ret.transcode_mode_ = transcode_mode_;
-  ret.transcode_format_ = transcode_format_;
-
-  QStringList unique_ids;
-  for (const Backend& backend : backends_) {
-    unique_ids << backend.unique_id_;
-  }
-  ret.unique_id_ = unique_ids.join(",");
-
-  return ret;
-}
-
-void DeviceManager::DeviceInfo::InitFromDb(
-    const DeviceDatabaseBackend::Device& dev) {
-  database_id_ = dev.id_;
-  friendly_name_ = dev.friendly_name_;
-  size_ = dev.size_;
-  transcode_mode_ = dev.transcode_mode_;
-  transcode_format_ = dev.transcode_format_;
-
-  QStringList icon_names = dev.icon_name_.split(',');
-  QVariantList icons;
-  for (const QString& icon_name : icon_names) {
-    icons << icon_name;
-  }
-
-  LoadIcon(icons, friendly_name_);
-
-  QStringList unique_ids = dev.unique_id_.split(',');
-  for (const QString& id : unique_ids) {
-    backends_ << Backend(nullptr, id);
-  }
-}
-
-void DeviceManager::DeviceInfo::LoadIcon(const QVariantList& icons,
-                                         const QString& name_hint) {
-  if (icons.isEmpty()) {
-    icon_name_ = "drive-removable-media-usb-pendrive";
-    icon_ = IconLoader::Load(icon_name_, IconLoader::Base);
-    return;
-  }
-
-  // Try to load the icon with that exact name first
-  for (const QVariant& icon : icons) {
-    if (!icon.value<QPixmap>().isNull()) {
-      icon_ = QIcon(icon.value<QPixmap>());
-      return;
-    } else {
-      icon_ = IconLoader::Load(icon.toString(), IconLoader::Base);
-      if (!icon_.isNull()) {
-        icon_name_ = icon.toString();
-        return;
-      }
-    }
-  }
-
-  QString hint = QString(icons.first().toString() + name_hint).toLower();
-
-  // If that failed than try to guess if it's a phone or ipod.  Fall back on
-  // a usb memory stick icon.
-  if (hint.contains("phone"))
-    icon_name_ = "phone";
-  else if (hint.contains("ipod") || hint.contains("apple"))
-    icon_name_ = "multimedia-player-ipod-standard-monochrome";
-  else
-    icon_name_ = "drive-removable-media-usb-pendrive";
-  icon_ = IconLoader::Load(icon_name_, IconLoader::Base);
-}
-
-const DeviceManager::DeviceInfo::Backend*
-DeviceManager::DeviceInfo::BestBackend() const {
-  int best_priority = -1;
-  const Backend* ret = nullptr;
-
-  for (int i = 0; i < backends_.count(); ++i) {
-    if (backends_[i].lister_ &&
-        backends_[i].lister_->priority() > best_priority) {
-      best_priority = backends_[i].lister_->priority();
-      ret = &(backends_[i]);
-    }
-  }
-
-  if (!ret && !backends_.isEmpty()) return &(backends_[0]);
-  return ret;
-}
-
 DeviceManager::DeviceManager(Application* app, QObject* parent)
-    : QAbstractListModel(parent),
+    : SimpleTreeModel<DeviceInfo>(new DeviceInfo(this), parent),
       app_(app),
       not_connected_overlay_(
           IconLoader::Load("edit-delete", IconLoader::Base)) {
@@ -227,48 +131,46 @@ DeviceManager::~DeviceManager() {
   }
 
   backend_->deleteLater();
+  delete root_;
 }
 
 void DeviceManager::LoadAllDevices() {
   Q_ASSERT(QThread::currentThread() != qApp->thread());
   DeviceDatabaseBackend::DeviceList devices = backend_->GetAllDevices();
   for (const DeviceDatabaseBackend::Device& device : devices) {
-    DeviceInfo info;
-    info.InitFromDb(device);
+    DeviceInfo* info = new DeviceInfo(DeviceInfo::Type_Device, root_);
+    info->InitFromDb(device);
 
-    beginInsertRows(QModelIndex(), devices_.count(), devices_.count());
+    beginInsertRows(ItemToIndex(root_), devices_.count(), devices_.count());
     devices_ << info;
     endInsertRows();
   }
 }
 
-int DeviceManager::rowCount(const QModelIndex&) const {
-  return devices_.count();
-}
+QVariant DeviceManager::data(const QModelIndex& idx, int role) const {
+  if (!idx.isValid() || idx.column() != 0) return QVariant();
 
-QVariant DeviceManager::data(const QModelIndex& index, int role) const {
-  if (!index.isValid() || index.column() != 0) return QVariant();
-
-  const DeviceInfo& info = devices_[index.row()];
+  DeviceInfo* info = IndexToItem(idx);
+  if (!info) return QVariant();
 
   switch (role) {
     case Qt::DisplayRole: {
       QString text;
-      if (!info.friendly_name_.isEmpty())
-        text = info.friendly_name_;
-      else
-        text = info.BestBackend()->unique_id_;
+      if (!info->friendly_name_.isEmpty())
+        text = info->friendly_name_;
+      else if (info->BestBackend())
+        text = info->BestBackend()->unique_id_;
 
-      if (info.size_)
-        text = text + QString(" (%1)").arg(Utilities::PrettySize(info.size_));
-      if (info.device_.get()) info.device_->Refresh();
+      if (info->size_)
+        text = text + QString(" (%1)").arg(Utilities::PrettySize(info->size_));
+      if (info->device_.get()) info->device_->Refresh();
       return text;
     }
 
     case Qt::DecorationRole: {
-      QPixmap pixmap = info.icon_.pixmap(kDeviceIconSize);
+      QPixmap pixmap = info->icon_.pixmap(kDeviceIconSize);
 
-      if (info.backends_.isEmpty() || !info.BestBackend()->lister_) {
+      if (info->backends_.isEmpty() || !info->BestBackend()->lister_) {
         // Disconnected but remembered
         QPainter p(&pixmap);
         p.drawPixmap(kDeviceIconSize - kDeviceIconOverlaySize,
@@ -280,52 +182,54 @@ QVariant DeviceManager::data(const QModelIndex& index, int role) const {
     }
 
     case Role_FriendlyName:
-      return info.friendly_name_;
+      return info->friendly_name_;
 
     case Role_UniqueId:
-      return info.BestBackend()->unique_id_;
+      if (!info->BestBackend()) return QString();
+      return info->BestBackend()->unique_id_;
 
     case Role_IconName:
-      return info.icon_name_;
+      return info->icon_name_;
 
     case Role_Capacity:
     case MusicStorage::Role_Capacity:
-      return info.size_;
+      return info->size_;
 
     case Role_FreeSpace:
     case MusicStorage::Role_FreeSpace:
-      return info.BestBackend()->lister_
-                 ? info.BestBackend()->lister_->DeviceFreeSpace(
-                       info.BestBackend()->unique_id_)
+      return info->BestBackend() && info->BestBackend()->lister_
+                 ? info->BestBackend()->lister_->DeviceFreeSpace(
+                       info->BestBackend()->unique_id_)
                  : QVariant();
 
     case Role_State:
-      if (info.device_) return State_Connected;
-      if (info.BestBackend()->lister_) {
-        if (info.BestBackend()->lister_->DeviceNeedsMount(
-                info.BestBackend()->unique_id_))
+      if (info->device_) return State_Connected;
+      if (info->BestBackend() && info->BestBackend()->lister_) {
+        if (info->BestBackend()->lister_->DeviceNeedsMount(
+                info->BestBackend()->unique_id_))
           return State_NotMounted;
         return State_NotConnected;
       }
       return State_Remembered;
 
     case Role_UpdatingPercentage:
-      if (info.task_percentage_ == -1) return QVariant();
-      return info.task_percentage_;
+      if (info->task_percentage_ == -1) return QVariant();
+      return info->task_percentage_;
 
     case MusicStorage::Role_Storage:
-      if (!info.device_ && info.database_id_ != -1)
-        const_cast<DeviceManager*>(this)->Connect(index.row());
-      if (!info.device_) return QVariant();
-      return QVariant::fromValue<std::shared_ptr<MusicStorage>>(info.device_);
+      if (!info->device_ && info->database_id_ != -1)
+        const_cast<DeviceManager*>(this)->Connect(info);
+      if (!info->device_) return QVariant();
+      return QVariant::fromValue<std::shared_ptr<MusicStorage>>(info->device_);
 
     case MusicStorage::Role_StorageForceConnect:
-      if (!info.device_) {
-        if (info.database_id_ == -1 &&
-            !info.BestBackend()->lister_->DeviceNeedsMount(
-                info.BestBackend()->unique_id_)) {
-          if (info.BestBackend()->lister_->AskForScan(
-                  info.BestBackend()->unique_id_)) {
+      if (!info->BestBackend()) return QVariant();
+      if (!info->device_) {
+        if (info->database_id_ == -1 &&
+            !info->BestBackend()->lister_->DeviceNeedsMount(
+                info->BestBackend()->unique_id_)) {
+          if (info->BestBackend()->lister_->AskForScan(
+                  info->BestBackend()->unique_id_)) {
             std::unique_ptr<QMessageBox> dialog(new QMessageBox(
                 QMessageBox::Information, tr("Connect device"),
                 tr("This is the first time you have connected this device.  "
@@ -340,15 +244,15 @@ QVariant DeviceManager::data(const QModelIndex& index, int role) const {
           }
         }
 
-        const_cast<DeviceManager*>(this)->Connect(index.row());
+        const_cast<DeviceManager*>(this)->Connect(info);
       }
-      if (!info.device_) return QVariant();
-      return QVariant::fromValue<std::shared_ptr<MusicStorage>>(info.device_);
+      if (!info->device_) return QVariant();
+      return QVariant::fromValue<std::shared_ptr<MusicStorage>>(info->device_);
 
     case Role_MountPath: {
-      if (!info.device_) return QVariant();
+      if (!info->device_) return QVariant();
 
-      QString ret = info.device_->url().path();
+      QString ret = info->device_->url().path();
 #ifdef Q_OS_WIN32
       if (ret.startsWith('/')) ret.remove(0, 1);
 #endif
@@ -356,14 +260,14 @@ QVariant DeviceManager::data(const QModelIndex& index, int role) const {
     }
 
     case Role_TranscodeMode:
-      return info.transcode_mode_;
+      return info->transcode_mode_;
 
     case Role_TranscodeFormat:
-      return info.transcode_format_;
+      return info->transcode_format_;
 
     case Role_SongCount:
-      if (!info.device_) return QVariant();
-      return info.device_->song_count();
+      if (!info->device_) return QVariant();
+      return info->device_->song_count();
 
     default:
       return QVariant();
@@ -382,30 +286,30 @@ void DeviceManager::AddLister(DeviceLister* lister) {
   lister->Start();
 }
 
-int DeviceManager::FindDeviceById(const QString& id) const {
+DeviceInfo* DeviceManager::FindDeviceById(const QString& id) const {
   for (int i = 0; i < devices_.count(); ++i) {
-    for (const DeviceInfo::Backend& backend : devices_[i].backends_) {
-      if (backend.unique_id_ == id) return i;
+    for (const DeviceInfo::Backend& backend : devices_[i]->backends_) {
+      if (backend.unique_id_ == id) return devices_[i];
     }
   }
-  return -1;
+  return nullptr;
 }
 
-int DeviceManager::FindDeviceByUrl(const QList<QUrl>& urls) const {
-  if (urls.isEmpty()) return -1;
+DeviceInfo* DeviceManager::FindDeviceByUrl(const QList<QUrl>& urls) const {
+  if (urls.isEmpty()) return nullptr;
 
   for (int i = 0; i < devices_.count(); ++i) {
-    for (const DeviceInfo::Backend& backend : devices_[i].backends_) {
+    for (const DeviceInfo::Backend& backend : devices_[i]->backends_) {
       if (!backend.lister_) continue;
 
       QList<QUrl> device_urls =
           backend.lister_->MakeDeviceUrls(backend.unique_id_);
       for (const QUrl& url : device_urls) {
-        if (urls.contains(url)) return i;
+        if (urls.contains(url)) return devices_[i];
       }
     }
   }
-  return -1;
+  return nullptr;
 }
 
 void DeviceManager::PhysicalDeviceAdded(const QString& id) {
@@ -414,44 +318,43 @@ void DeviceManager::PhysicalDeviceAdded(const QString& id) {
   qLog(Info) << "Device added:" << id;
 
   // Do we have this device already?
-  int i = FindDeviceById(id);
-  if (i != -1) {
-    DeviceInfo& info = devices_[i];
-    for (int backend_index = 0; backend_index < info.backends_.count();
+  DeviceInfo* info = FindDeviceById(id);
+  if (info) {
+    for (int backend_index = 0; backend_index < info->backends_.count();
          ++backend_index) {
-      if (info.backends_[backend_index].unique_id_ == id) {
-        info.backends_[backend_index].lister_ = lister;
+      if (info->backends_[backend_index].unique_id_ == id) {
+        info->backends_[backend_index].lister_ = lister;
         break;
       }
     }
-
-    emit dataChanged(index(i, 0), index(i, 0));
+    QModelIndex idx = ItemToIndex(info);
+    if (idx.isValid()) emit dataChanged(idx, idx);
   } else {
     // Check if we have another device with the same URL
-    i = FindDeviceByUrl(lister->MakeDeviceUrls(id));
-    if (i != -1) {
+    info = FindDeviceByUrl(lister->MakeDeviceUrls(id));
+    if (info) {
       // Add this device's lister to the existing device
-      DeviceInfo& info = devices_[i];
-      info.backends_ << DeviceInfo::Backend(lister, id);
+      info->backends_ << DeviceInfo::Backend(lister, id);
 
       // If the user hasn't saved the device in the DB yet then overwrite the
       // device's name and icon etc.
-      if (info.database_id_ == -1 && info.BestBackend()->lister_ == lister) {
-        info.friendly_name_ = lister->MakeFriendlyName(id);
-        info.size_ = lister->DeviceCapacity(id);
-        info.LoadIcon(lister->DeviceIcons(id), info.friendly_name_);
+      if (info->database_id_ == -1 && info->BestBackend()->lister_ == lister) {
+        info->friendly_name_ = lister->MakeFriendlyName(id);
+        info->size_ = lister->DeviceCapacity(id);
+        info->LoadIcon(lister->DeviceIcons(id), info->friendly_name_);
       }
 
-      emit dataChanged(index(i, 0), index(i, 0));
+      QModelIndex idx = ItemToIndex(info);
+      if (idx.isValid()) emit dataChanged(idx, idx);
     } else {
       // It's a completely new device
-      DeviceInfo info;
-      info.backends_ << DeviceInfo::Backend(lister, id);
-      info.friendly_name_ = lister->MakeFriendlyName(id);
-      info.size_ = lister->DeviceCapacity(id);
-      info.LoadIcon(lister->DeviceIcons(id), info.friendly_name_);
+      DeviceInfo* info = new DeviceInfo(DeviceInfo::Type_Device, root_);
+      info->backends_ << DeviceInfo::Backend(lister, id);
+      info->friendly_name_ = lister->MakeFriendlyName(id);
+      info->size_ = lister->DeviceCapacity(id);
+      info->LoadIcon(lister->DeviceIcons(id), info->friendly_name_);
 
-      beginInsertRows(QModelIndex(), devices_.count(), devices_.count());
+      beginInsertRows(ItemToIndex(root_), devices_.count(), devices_.count());
       devices_ << info;
       endInsertRows();
     }
@@ -463,50 +366,45 @@ void DeviceManager::PhysicalDeviceRemoved(const QString& id) {
 
   qLog(Info) << "Device removed:" << id;
 
-  int i = FindDeviceById(id);
-  if (i == -1) {
+  DeviceInfo* info = FindDeviceById(id);
+  if (!info) {
     // Shouldn't happen
     return;
   }
 
-  DeviceInfo& info = devices_[i];
+  QModelIndex idx = ItemToIndex(info);
+  if (!idx.isValid()) return;
 
-  if (info.database_id_ != -1) {
+  if (info->database_id_ != -1) {
     // Keep the structure around, but just "disconnect" it
-    for (int backend_index = 0; backend_index < info.backends_.count();
+    for (int backend_index = 0; backend_index < info->backends_.count();
          ++backend_index) {
-      if (info.backends_[backend_index].unique_id_ == id) {
-        info.backends_[backend_index].lister_ = nullptr;
+      if (info->backends_[backend_index].unique_id_ == id) {
+        info->backends_[backend_index].lister_ = nullptr;
         break;
       }
     }
 
-    if (info.device_ && info.device_->lister() == lister) info.device_.reset();
+    if (info->device_ && info->device_->lister() == lister)
+      info->device_.reset();
 
-    if (!info.device_) emit DeviceDisconnected(i);
+    if (!info->device_) emit DeviceDisconnected(idx);
 
-    emit dataChanged(index(i, 0), index(i, 0));
+    emit dataChanged(idx, idx);
   } else {
     // If this was the last lister for the device then remove it from the model
-    for (int backend_index = 0; backend_index < info.backends_.count();
+    for (int backend_index = 0; backend_index < info->backends_.count();
          ++backend_index) {
-      if (info.backends_[backend_index].unique_id_ == id) {
-        info.backends_.removeAt(backend_index);
+      if (info->backends_[backend_index].unique_id_ == id) {
+        info->backends_.removeAt(backend_index);
         break;
       }
     }
 
-    if (info.backends_.isEmpty()) {
-      beginRemoveRows(QModelIndex(), i, i);
-      devices_.removeAt(i);
-
-      for (const QModelIndex& idx : persistentIndexList()) {
-        if (idx.row() == i)
-          changePersistentIndex(idx, QModelIndex());
-        else if (idx.row() > i)
-          changePersistentIndex(idx, index(idx.row() - 1, idx.column()));
-      }
-
+    if (info->backends_.isEmpty()) {
+      beginRemoveRows(ItemToIndex(root_), idx.row(), idx.row());
+      devices_.removeAll(info);
+      root_->Delete(info->row);
       endRemoveRows();
     }
   }
@@ -516,8 +414,8 @@ void DeviceManager::PhysicalDeviceChanged(const QString& id) {
   DeviceLister* lister = qobject_cast<DeviceLister*>(sender());
   Q_UNUSED(lister);
 
-  int i = FindDeviceById(id);
-  if (i == -1) {
+  DeviceInfo* info = FindDeviceById(id);
+  if (!info) {
     // Shouldn't happen
     return;
   }
@@ -525,32 +423,40 @@ void DeviceManager::PhysicalDeviceChanged(const QString& id) {
   // TODO
 }
 
-std::shared_ptr<ConnectedDevice> DeviceManager::Connect(int row) {
-  DeviceInfo& info = devices_[row];
-  if (info.device_)  // Already connected
-    return info.device_;
+std::shared_ptr<ConnectedDevice> DeviceManager::Connect(QModelIndex idx) {
+  DeviceInfo* info = IndexToItem(idx);
+  if (!info) return std::shared_ptr<ConnectedDevice>();
 
+  return Connect(info);
+}
+
+std::shared_ptr<ConnectedDevice> DeviceManager::Connect(DeviceInfo* info) {
   std::shared_ptr<ConnectedDevice> ret;
 
-  if (!info.BestBackend()->lister_)  // Not physically connected
+  if (!info) return ret;
+  if (info->device_)  // Already connected
+    return info->device_;
+
+  if (!info->BestBackend() ||
+      !info->BestBackend()->lister_)  // Not physically connected
     return ret;
 
-  if (info.BestBackend()->lister_->DeviceNeedsMount(
-          info.BestBackend()->unique_id_)) {
+  if (info->BestBackend()->lister_->DeviceNeedsMount(
+          info->BestBackend()->unique_id_)) {
     // Mount the device
-    info.BestBackend()->lister_->MountDevice(info.BestBackend()->unique_id_);
+    info->BestBackend()->lister_->MountDevice(info->BestBackend()->unique_id_);
     return ret;
   }
 
-  bool first_time = (info.database_id_ == -1);
+  bool first_time = (info->database_id_ == -1);
   if (first_time) {
     // We haven't stored this device in the database before
-    info.database_id_ = backend_->AddDevice(info.SaveToDb());
+    info->database_id_ = backend_->AddDevice(info->SaveToDb());
   }
 
   // Get the device URLs
-  QList<QUrl> urls = info.BestBackend()->lister_->MakeDeviceUrls(
-      info.BestBackend()->unique_id_);
+  QList<QUrl> urls = info->BestBackend()->lister_->MakeDeviceUrls(
+      info->BestBackend()->unique_id_);
   if (urls.isEmpty()) return ret;
 
   // Take the first URL that we have a handler for
@@ -605,10 +511,10 @@ std::shared_ptr<ConnectedDevice> DeviceManager::Connect(int row) {
   QMetaObject meta_object = device_classes_.value(device_url.scheme());
   QObject* instance = meta_object.newInstance(
       Q_ARG(QUrl, device_url),
-      Q_ARG(DeviceLister*, info.BestBackend()->lister_),
-      Q_ARG(QString, info.BestBackend()->unique_id_),
+      Q_ARG(DeviceLister*, info->BestBackend()->lister_),
+      Q_ARG(QString, info->BestBackend()->unique_id_),
       Q_ARG(DeviceManager*, this), Q_ARG(Application*, app_),
-      Q_ARG(int, info.database_id_), Q_ARG(bool, first_time));
+      Q_ARG(int, info->database_id_), Q_ARG(bool, first_time));
   ret.reset(static_cast<ConnectedDevice*>(instance));
 
   if (!ret) {
@@ -616,13 +522,15 @@ std::shared_ptr<ConnectedDevice> DeviceManager::Connect(int row) {
   } else {
     ret->Init();
 
-    info.device_ = ret;
-    emit dataChanged(index(row), index(row));
-    connect(info.device_.get(), SIGNAL(TaskStarted(int)),
+    info->device_ = ret;
+    QModelIndex idx = ItemToIndex(info);
+    if (!idx.isValid()) return ret;
+    emit dataChanged(idx, idx);
+    connect(info->device_.get(), SIGNAL(TaskStarted(int)),
             SLOT(DeviceTaskStarted(int)));
-    connect(info.device_.get(), SIGNAL(SongCountUpdated(int)),
+    connect(info->device_.get(), SIGNAL(SongCountUpdated(int)),
             SLOT(DeviceSongCountUpdated(int)));
-    connect(info.device_.get(), SIGNAL(ConnectFinished(const QString&, bool)),
+    connect(info->device_.get(), SIGNAL(ConnectFinished(const QString&, bool)),
             SLOT(DeviceConnectFinished(const QString&, bool)));
     ret->ConnectAsync();
   }
@@ -631,88 +539,106 @@ std::shared_ptr<ConnectedDevice> DeviceManager::Connect(int row) {
 }
 
 void DeviceManager::DeviceConnectFinished(const QString& id, bool success) {
-  int row = FindDeviceById(id);
-  if (row != -1) {
-    if (success) {
-      emit DeviceConnected(row);
-    } else {
-      devices_[row].device_.reset();
-    }
+  DeviceInfo* info = FindDeviceById(id);
+  if (!info) return;
+
+  QModelIndex idx = ItemToIndex(info);
+  if (!idx.isValid()) return;
+
+  if (success) {
+    emit DeviceConnected(idx);
+  } else {
+    info->device_.reset();
   }
 }
 
 std::shared_ptr<ConnectedDevice> DeviceManager::GetConnectedDevice(
-    int row) const {
-  return devices_[row].device_;
+    QModelIndex idx) const {
+  DeviceInfo* info = IndexToItem(idx);
+  if (!info) return std::shared_ptr<ConnectedDevice>();
+  return info->device_;
 }
 
-int DeviceManager::GetDatabaseId(int row) const {
-  return devices_[row].database_id_;
+std::shared_ptr<ConnectedDevice> DeviceManager::GetConnectedDevice(
+    DeviceInfo* info) const {
+  if (!info) return std::shared_ptr<ConnectedDevice>();
+  return info->device_;
 }
 
-DeviceLister* DeviceManager::GetLister(int row) const {
-  return devices_[row].BestBackend()->lister_;
+int DeviceManager::GetDatabaseId(const QModelIndex& idx) const {
+  if (!idx.isValid()) return -1;
+  DeviceInfo* info = IndexToItem(idx);
+  if (!info) return -1;
+  return info->database_id_;
 }
 
-void DeviceManager::Disconnect(int row) {
-  DeviceInfo& info = devices_[row];
-  if (!info.device_)  // Already disconnected
+DeviceLister* DeviceManager::GetLister(QModelIndex idx) const {
+  if (!idx.isValid()) return nullptr;
+
+  DeviceInfo* info = IndexToItem(idx);
+  if (!info || !info->BestBackend()) return nullptr;
+  return info->BestBackend()->lister_;
+}
+
+void DeviceManager::Disconnect(QModelIndex idx) {
+  if (!idx.isValid()) return;
+  DeviceInfo* info = IndexToItem(idx);
+  if (!info || !info->device_)  // Already disconnected
     return;
 
-  info.device_.reset();
-  emit DeviceDisconnected(row);
-  emit dataChanged(index(row), index(row));
+  info->device_.reset();
+  emit DeviceDisconnected(idx);
+  emit dataChanged(idx, idx);
 }
 
-void DeviceManager::Forget(int row) {
-  DeviceInfo& info = devices_[row];
-  if (info.database_id_ == -1) return;
+void DeviceManager::Forget(QModelIndex idx) {
+  if (!idx.isValid()) return;
+  DeviceInfo* info = IndexToItem(idx);
+  if (!info) return;
+  if (info->database_id_ == -1) return;
 
-  if (info.device_) Disconnect(row);
+  if (info->device_) Disconnect(idx);
 
-  backend_->RemoveDevice(info.database_id_);
-  info.database_id_ = -1;
+  backend_->RemoveDevice(info->database_id_);
+  info->database_id_ = -1;
 
-  if (!info.BestBackend()->lister_) {
+  if (!info->BestBackend() ||
+      (info->BestBackend() && !info->BestBackend()->lister_)) {
     // It's not attached any more so remove it from the list
-    beginRemoveRows(QModelIndex(), row, row);
-    devices_.removeAt(row);
-
-    for (const QModelIndex& idx : persistentIndexList()) {
-      if (idx.row() == row)
-        changePersistentIndex(idx, QModelIndex());
-      else if (idx.row() > row)
-        changePersistentIndex(idx, index(idx.row() - 1, idx.column()));
-    }
-
+    beginRemoveRows(ItemToIndex(root_), idx.row(), idx.row());
+    devices_.removeAll(info);
+    root_->Delete(info->row);
     endRemoveRows();
   } else {
     // It's still attached, set the name and icon back to what they were
     // originally
-    const QString id = info.BestBackend()->unique_id_;
+    const QString id = info->BestBackend()->unique_id_;
 
-    info.friendly_name_ = info.BestBackend()->lister_->MakeFriendlyName(id);
-    info.LoadIcon(info.BestBackend()->lister_->DeviceIcons(id),
-                  info.friendly_name_);
+    info->friendly_name_ = info->BestBackend()->lister_->MakeFriendlyName(id);
+    info->LoadIcon(info->BestBackend()->lister_->DeviceIcons(id),
+                   info->friendly_name_);
 
-    dataChanged(index(row, 0), index(row, 0));
+    dataChanged(idx, idx);
   }
 }
 
-void DeviceManager::SetDeviceOptions(int row, const QString& friendly_name,
+void DeviceManager::SetDeviceOptions(QModelIndex idx,
+                                     const QString& friendly_name,
                                      const QString& icon_name,
                                      MusicStorage::TranscodeMode mode,
                                      Song::FileType format) {
-  DeviceInfo& info = devices_[row];
-  info.friendly_name_ = friendly_name;
-  info.LoadIcon(QVariantList() << icon_name, friendly_name);
-  info.transcode_mode_ = mode;
-  info.transcode_format_ = format;
+  if (!idx.isValid()) return;
+  DeviceInfo* info = IndexToItem(idx);
+  if (!info) return;
+  info->friendly_name_ = friendly_name;
+  info->LoadIcon(QVariantList() << icon_name, friendly_name);
+  info->transcode_mode_ = mode;
+  info->transcode_format_ = format;
 
-  emit dataChanged(index(row, 0), index(row, 0));
+  emit dataChanged(idx, idx);
 
-  if (info.database_id_ != -1)
-    backend_->SetDeviceOptions(info.database_id_, friendly_name, icon_name,
+  if (info->database_id_ != -1)
+    backend_->SetDeviceOptions(info->database_id_, friendly_name, icon_name,
                                mode, format);
 }
 
@@ -721,11 +647,13 @@ void DeviceManager::DeviceTaskStarted(int id) {
   if (!device) return;
 
   for (int i = 0; i < devices_.count(); ++i) {
-    DeviceInfo& info = devices_[i];
-    if (info.device_.get() == device) {
-      active_tasks_[id] = index(i);
-      info.task_percentage_ = 0;
-      emit dataChanged(index(i), index(i));
+    DeviceInfo* info = devices_[i];
+    if (info->device_.get() == device) {
+      QModelIndex index = ItemToIndex(info);
+      if (!index.isValid()) continue;
+      active_tasks_[id] = index;
+      info->task_percentage_ = 0;
+      emit dataChanged(index, index);
       return;
     }
   }
@@ -738,49 +666,61 @@ void DeviceManager::TasksChanged() {
   for (const TaskManager::Task& task : tasks) {
     if (!active_tasks_.contains(task.id)) continue;
 
-    QPersistentModelIndex index = active_tasks_[task.id];
-    if (!index.isValid()) continue;
+    QPersistentModelIndex idx = active_tasks_[task.id];
+    if (!idx.isValid()) continue;
 
-    DeviceInfo& info = devices_[index.row()];
+    DeviceInfo* info = IndexToItem(idx);
     if (task.progress_max)
-      info.task_percentage_ = float(task.progress) / task.progress_max * 100;
+      info->task_percentage_ = float(task.progress) / task.progress_max * 100;
     else
-      info.task_percentage_ = 0;
-    emit dataChanged(index, index);
-    finished_tasks.removeAll(index);
+      info->task_percentage_ = 0;
+    emit dataChanged(idx, idx);
+    finished_tasks.removeAll(idx);
   }
 
-  for (const QPersistentModelIndex& index : finished_tasks) {
-    if (!index.isValid()) continue;
+  for (const QPersistentModelIndex& idx : finished_tasks) {
+    if (!idx.isValid()) continue;
 
-    DeviceInfo& info = devices_[index.row()];
-    info.task_percentage_ = -1;
-    emit dataChanged(index, index);
+    DeviceInfo* info = IndexToItem(idx);
+    if (!info) continue;
+    info->task_percentage_ = -1;
+    emit dataChanged(idx, idx);
 
-    active_tasks_.remove(active_tasks_.key(index));
+    active_tasks_.remove(active_tasks_.key(idx));
   }
 }
 
-void DeviceManager::UnmountAsync(int row) {
-  Q_ASSERT(QMetaObject::invokeMethod(this, "Unmount", Q_ARG(int, row)));
+void DeviceManager::UnmountAsync(QModelIndex idx) {
+  Q_ASSERT(QMetaObject::invokeMethod(this, "Unmount", Q_ARG(QModelIndex, idx)));
 }
 
-void DeviceManager::Unmount(int row) {
-  DeviceInfo& info = devices_[row];
-  if (info.database_id_ != -1 && !info.device_) return;
+void DeviceManager::Unmount(QModelIndex idx) {
+  if (!idx.isValid()) return;
+  DeviceInfo* info = IndexToItem(idx);
+  if (!info) return;
+  if (info->database_id_ != -1 && !info->device_) return;
 
-  if (info.device_) Disconnect(row);
+  if (info->device_) Disconnect(idx);
 
-  if (info.BestBackend()->lister_)
-    info.BestBackend()->lister_->UnmountDevice(info.BestBackend()->unique_id_);
+  if (info->BestBackend()->lister_)
+    info->BestBackend()->lister_->UnmountDevice(
+        info->BestBackend()->unique_id_);
 }
 
 void DeviceManager::DeviceSongCountUpdated(int count) {
   ConnectedDevice* device = qobject_cast<ConnectedDevice*>(sender());
   if (!device) return;
 
-  int row = FindDeviceById(device->unique_id());
-  if (row == -1) return;
+  DeviceInfo* info = FindDeviceById(device->unique_id());
+  if (!info) return;
 
-  emit dataChanged(index(row), index(row));
+  QModelIndex idx = ItemToIndex(info);
+  if (!idx.isValid()) return;
+
+  emit dataChanged(idx, idx);
+}
+
+void DeviceManager::LazyPopulate(DeviceInfo* parent, bool signal) {
+  if (parent->lazy_loaded) return;
+  parent->lazy_loaded = true;
 }
diff --git a/src/devices/devicemanager.h b/src/devices/devicemanager.h
index 3138831d5..595a5d5c7 100644
--- a/src/devices/devicemanager.h
+++ b/src/devices/devicemanager.h
@@ -22,20 +22,20 @@
 
 #include <memory>
 
-#include <QAbstractListModel>
+#include <QAbstractItemModel>
 #include <QIcon>
 #include <QThreadPool>
 
+#include "core/simpletreemodel.h"
+#include "deviceinfo.h"
 #include "library/librarymodel.h"
 
 class Application;
 class ConnectedDevice;
-class Database;
 class DeviceLister;
 class DeviceStateFilterModel;
-class TaskManager;
 
-class DeviceManager : public QAbstractListModel {
+class DeviceManager : public SimpleTreeModel<DeviceInfo> {
   Q_OBJECT
 
  public:
@@ -72,34 +72,35 @@ class DeviceManager : public QAbstractListModel {
   }
 
   // Get info about devices
-  int GetDatabaseId(int row) const;
-  DeviceLister* GetLister(int row) const;
-  std::shared_ptr<ConnectedDevice> GetConnectedDevice(int row) const;
+  int GetDatabaseId(const QModelIndex& idx) const;
+  DeviceLister* GetLister(QModelIndex idx) const;
+  std::shared_ptr<ConnectedDevice> GetConnectedDevice(QModelIndex idx) const;
+  std::shared_ptr<ConnectedDevice> GetConnectedDevice(DeviceInfo* info) const;
 
-  int FindDeviceById(const QString& id) const;
-  int FindDeviceByUrl(const QList<QUrl>& url) const;
+  DeviceInfo* FindDeviceById(const QString& id) const;
+  DeviceInfo* FindDeviceByUrl(const QList<QUrl>& url) const;
 
   // Actions on devices
-  std::shared_ptr<ConnectedDevice> Connect(int row);
-  void Disconnect(int row);
-  void Forget(int row);
-  void UnmountAsync(int row);
+  std::shared_ptr<ConnectedDevice> Connect(DeviceInfo* info);
+  std::shared_ptr<ConnectedDevice> Connect(QModelIndex idx);
+  void Disconnect(QModelIndex idx);
+  void Forget(QModelIndex idx);
+  void UnmountAsync(QModelIndex idx);
 
-  void SetDeviceOptions(int row, const QString& friendly_name,
+  void SetDeviceOptions(QModelIndex idx, const QString& friendly_name,
                         const QString& icon_name,
                         MusicStorage::TranscodeMode mode,
                         Song::FileType format);
 
-  // QAbstractListModel
-  int rowCount(const QModelIndex& parent) const;
-  QVariant data(const QModelIndex& index, int role) const;
+  // QAbstractItemModel
+  QVariant data(const QModelIndex& idx, int role = Qt::DisplayRole) const;
 
  public slots:
-  void Unmount(int row);
+  void Unmount(QModelIndex idx);
 
-signals:
-  void DeviceConnected(int row);
-  void DeviceDisconnected(int row);
+ signals:
+  void DeviceConnected(QModelIndex idx);
+  void DeviceDisconnected(QModelIndex idx);
 
  private slots:
   void PhysicalDeviceAdded(const QString& id);
@@ -111,56 +112,11 @@ signals:
   void LoadAllDevices();
   void DeviceConnectFinished(const QString& id, bool success);
 
+ protected:
+  void LazyPopulate(DeviceInfo* item) { LazyPopulate(item, true); }
+  void LazyPopulate(DeviceInfo* item, bool signal);
+
  private:
-  // Devices can be in three different states:
-  //  1) Remembered in the database but not physically connected at the moment.
-  //     database_id valid, lister null, device null
-  //  2) Physically connected but the user hasn't "connected" it to Clementine
-  //     yet.
-  //     database_id == -1, lister valid, device null
-  //  3) Physically connected and connected to Clementine
-  //     database_id valid, lister valid, device valid
-  // Devices in all states will have a unique_id.
-  struct DeviceInfo {
-    DeviceInfo();
-
-    // A device can be discovered in different ways (devicekit, gio, etc.)
-    // Sometimes the same device is discovered more than once.  In this case
-    // the device will have multiple "backends".
-    struct Backend {
-      Backend(DeviceLister* lister = nullptr, const QString& id = QString())
-          : lister_(lister), unique_id_(id) {}
-
-      DeviceLister* lister_;  // nullptr if not physically connected
-      QString unique_id_;
-    };
-
-    // Serialising to the database
-    void InitFromDb(const DeviceDatabaseBackend::Device& dev);
-    DeviceDatabaseBackend::Device SaveToDb() const;
-
-    // Tries to load a good icon for the device.  Sets icon_name_ and icon_.
-    void LoadIcon(const QVariantList& icons, const QString& name_hint);
-
-    // Gets the best backend available (the one with the highest priority)
-    const Backend* BestBackend() const;
-
-    int database_id_;  // -1 if not remembered in the database
-    std::shared_ptr<ConnectedDevice>
-        device_;  // nullptr if not connected to clementine
-    QList<Backend> backends_;
-
-    QString friendly_name_;
-    quint64 size_;
-
-    QString icon_name_;
-    QIcon icon_;
-
-    MusicStorage::TranscodeMode transcode_mode_;
-    Song::FileType transcode_format_;
-
-    int task_percentage_;
-  };
 
   void AddLister(DeviceLister* lister);
   template <typename T>
@@ -178,7 +134,7 @@ signals:
   QIcon not_connected_overlay_;
 
   QList<DeviceLister*> listers_;
-  QList<DeviceInfo> devices_;
+  QList<DeviceInfo*> devices_;
 
   QMultiMap<QString, QMetaObject> device_classes_;
 
diff --git a/src/devices/deviceproperties.cpp b/src/devices/deviceproperties.cpp
index c9e937e66..a886f0f7f 100644
--- a/src/devices/deviceproperties.cpp
+++ b/src/devices/deviceproperties.cpp
@@ -59,7 +59,7 @@ void DeviceProperties::SetDeviceManager(DeviceManager* manager) {
           SLOT(ModelChanged()));
 }
 
-void DeviceProperties::ShowDevice(int row) {
+void DeviceProperties::ShowDevice(QModelIndex idx) {
   if (ui_->icon->count() == 0) {
     // Only load the icons the first time the dialog is shown
     QStringList icon_names = QStringList()
@@ -97,7 +97,7 @@ void DeviceProperties::ShowDevice(int row) {
     ui_->transcode_format->model()->sort(0);
   }
 
-  index_ = manager_->index(row);
+  index_ = idx;
 
   // Basic information
   ui_->name->setText(index_.data(DeviceManager::Role_FriendlyName).toString());
@@ -137,7 +137,7 @@ void DeviceProperties::ModelChanged() {
 void DeviceProperties::UpdateHardwareInfo() {
   // Hardware information
   QString id = index_.data(DeviceManager::Role_UniqueId).toString();
-  if (DeviceLister* lister = manager_->GetLister(index_.row())) {
+  if (DeviceLister* lister = manager_->GetLister(index_)) {
     QVariantMap info = lister->DeviceHardwareInfo(id);
 
     // Remove empty items
@@ -180,9 +180,9 @@ void DeviceProperties::UpdateHardwareInfo() {
 
 void DeviceProperties::UpdateFormats() {
   QString id = index_.data(DeviceManager::Role_UniqueId).toString();
-  DeviceLister* lister = manager_->GetLister(index_.row());
+  DeviceLister* lister = manager_->GetLister(index_);
   std::shared_ptr<ConnectedDevice> device =
-      manager_->GetConnectedDevice(index_.row());
+      manager_->GetConnectedDevice(index_);
 
   // Transcode mode
   MusicStorage::TranscodeMode mode = MusicStorage::TranscodeMode(
@@ -255,11 +255,11 @@ void DeviceProperties::accept() {
     icon_name = ui_->icon->currentItem()->data(Qt::UserRole).toString();
   }
 
-  manager_->SetDeviceOptions(index_.row(), ui_->name->text(), icon_name, mode,
+  manager_->SetDeviceOptions(index_, ui_->name->text(), icon_name, mode,
                              format);
 }
 
-void DeviceProperties::OpenDevice() { manager_->Connect(index_.row()); }
+void DeviceProperties::OpenDevice() { manager_->Connect(index_); }
 
 void DeviceProperties::UpdateFormatsFinished(QFuture<bool> future) {
   updating_formats_ = false;
diff --git a/src/devices/deviceproperties.h b/src/devices/deviceproperties.h
index 11f8419c8..cf470cda6 100644
--- a/src/devices/deviceproperties.h
+++ b/src/devices/deviceproperties.h
@@ -35,7 +35,7 @@ class DeviceProperties : public QDialog {
   ~DeviceProperties();
 
   void SetDeviceManager(DeviceManager* manager);
-  void ShowDevice(int row);
+  void ShowDevice(QModelIndex idx);
 
  public slots:
   void accept();
diff --git a/src/devices/deviceview.cpp b/src/devices/deviceview.cpp
index 35300dd6b..f4d45420f 100644
--- a/src/devices/deviceview.cpp
+++ b/src/devices/deviceview.cpp
@@ -165,10 +165,10 @@ void DeviceView::SetApplication(Application* app) {
   Q_ASSERT(app_ == nullptr);
   app_ = app;
 
-  connect(app_->device_manager(), SIGNAL(DeviceConnected(int)),
-          SLOT(DeviceConnected(int)));
-  connect(app_->device_manager(), SIGNAL(DeviceDisconnected(int)),
-          SLOT(DeviceDisconnected(int)));
+  connect(app_->device_manager(), SIGNAL(DeviceConnected(QModelIndex)),
+          SLOT(DeviceConnected(QModelIndex)));
+  connect(app_->device_manager(), SIGNAL(DeviceDisconnected(QModelIndex)),
+          SLOT(DeviceDisconnected(QModelIndex)));
 
   sort_model_ = new QSortFilterProxyModel(this);
   sort_model_->setSourceModel(app_->device_manager());
@@ -237,10 +237,9 @@ void DeviceView::contextMenuEvent(QContextMenuEvent* e) {
   const QModelIndex library_index = MapToLibrary(menu_index_);
 
   if (device_index.isValid()) {
-    const bool is_plugged_in =
-        app_->device_manager()->GetLister(device_index.row());
+    const bool is_plugged_in = app_->device_manager()->GetLister(device_index);
     const bool is_remembered =
-        app_->device_manager()->GetDatabaseId(device_index.row()) != -1;
+        app_->device_manager()->GetDatabaseId(device_index) != -1;
 
     forget_action_->setEnabled(is_remembered);
     eject_action_->setEnabled(is_plugged_in);
@@ -252,7 +251,7 @@ void DeviceView::contextMenuEvent(QContextMenuEvent* e) {
     bool is_filesystem_device = false;
     if (parent_device_index.isValid()) {
       std::shared_ptr<ConnectedDevice> device =
-          app_->device_manager()->GetConnectedDevice(parent_device_index.row());
+          app_->device_manager()->GetConnectedDevice(parent_device_index);
       if (device && !device->LocalPath().isEmpty()) is_filesystem_device = true;
     }
 
@@ -296,13 +295,12 @@ void DeviceView::Connect() {
                                MusicStorage::Role_StorageForceConnect);
 }
 
-void DeviceView::DeviceConnected(int row) {
+void DeviceView::DeviceConnected(QModelIndex idx) {
   std::shared_ptr<ConnectedDevice> device =
-      app_->device_manager()->GetConnectedDevice(row);
+      app_->device_manager()->GetConnectedDevice(idx);
   if (!device) return;
 
-  QModelIndex sort_idx =
-      sort_model_->mapFromSource(app_->device_manager()->index(row));
+  QModelIndex sort_idx = sort_model_->mapFromSource(idx);
 
   QSortFilterProxyModel* sort_model =
       new QSortFilterProxyModel(device->model());
@@ -315,9 +313,8 @@ void DeviceView::DeviceConnected(int row) {
   expand(menu_index_);
 }
 
-void DeviceView::DeviceDisconnected(int row) {
-  merged_model_->RemoveSubModel(
-      sort_model_->mapFromSource(app_->device_manager()->index(row)));
+void DeviceView::DeviceDisconnected(QModelIndex idx) {
+  merged_model_->RemoveSubModel(sort_model_->mapFromSource(idx));
 }
 
 void DeviceView::Forget() {
@@ -325,9 +322,8 @@ void DeviceView::Forget() {
   QString unique_id = app_->device_manager()
                           ->data(device_idx, DeviceManager::Role_UniqueId)
                           .toString();
-  if (app_->device_manager()->GetLister(device_idx.row()) &&
-      app_->device_manager()->GetLister(device_idx.row())->AskForScan(
-          unique_id)) {
+  if (app_->device_manager()->GetLister(device_idx) &&
+      app_->device_manager()->GetLister(device_idx)->AskForScan(unique_id)) {
     std::unique_ptr<QMessageBox> dialog(new QMessageBox(
         QMessageBox::Question, tr("Forget device"),
         tr("Forgetting a device will remove it from this list and Clementine "
@@ -340,11 +336,11 @@ void DeviceView::Forget() {
     if (dialog->clickedButton() != forget) return;
   }
 
-  app_->device_manager()->Forget(device_idx.row());
+  app_->device_manager()->Forget(device_idx);
 }
 
 void DeviceView::Properties() {
-  properties_dialog_->ShowDevice(MapToDevice(menu_index_).row());
+  properties_dialog_->ShowDevice(MapToDevice(menu_index_));
 }
 
 void DeviceView::mouseDoubleClickEvent(QMouseEvent* event) {
@@ -353,7 +349,7 @@ void DeviceView::mouseDoubleClickEvent(QMouseEvent* event) {
   QModelIndex merged_index = indexAt(event->pos());
   QModelIndex device_index = MapToDevice(merged_index);
   if (device_index.isValid()) {
-    if (!app_->device_manager()->GetConnectedDevice(device_index.row())) {
+    if (!app_->device_manager()->GetConnectedDevice(device_index)) {
       menu_index_ = merged_index;
       Connect();
     }
@@ -434,7 +430,7 @@ void DeviceView::Organise() {
 
 void DeviceView::Unmount() {
   QModelIndex device_idx = MapToDevice(menu_index_);
-  app_->device_manager()->Unmount(device_idx.row());
+  app_->device_manager()->Unmount(device_idx);
 }
 
 void DeviceView::DeleteFinished(const SongList& songs_with_errors) {
diff --git a/src/devices/deviceview.h b/src/devices/deviceview.h
index 92858c787..1647e8284 100644
--- a/src/devices/deviceview.h
+++ b/src/devices/deviceview.h
@@ -71,8 +71,8 @@ class DeviceView : public AutoExpandingTreeView {
   void Organise();
   void Delete();
 
-  void DeviceConnected(int row);
-  void DeviceDisconnected(int row);
+  void DeviceConnected(QModelIndex idx);
+  void DeviceDisconnected(QModelIndex idx);
 
   void DeleteFinished(const SongList& songs_with_errors);
 
diff --git a/src/devices/filesystemdevice.cpp b/src/devices/filesystemdevice.cpp
index 4805cab86..3b1bd3ec0 100644
--- a/src/devices/filesystemdevice.cpp
+++ b/src/devices/filesystemdevice.cpp
@@ -39,8 +39,10 @@ FilesystemDevice::FilesystemDevice(const QUrl& url, DeviceLister* lister,
   watcher_thread_->start(QThread::IdlePriority);
 
   watcher_->set_device_name(
-      manager->data(manager->index(manager->FindDeviceById(unique_id)),
-                    DeviceManager::Role_FriendlyName).toString());
+      manager
+          ->data(manager->ItemToIndex(manager->FindDeviceById(unique_id)),
+                 DeviceManager::Role_FriendlyName)
+          .toString());
   watcher_->set_backend(backend_);
   watcher_->set_task_manager(app_->task_manager());
 
diff --git a/src/library/libraryfilterwidget.cpp b/src/library/libraryfilterwidget.cpp
index 82380d3be..c6aa9e5ee 100644
--- a/src/library/libraryfilterwidget.cpp
+++ b/src/library/libraryfilterwidget.cpp
@@ -258,7 +258,8 @@ void LibraryFilterWidget::SetLibraryModel(LibraryModel* model) {
     s.beginGroup(settings_group_);
     model_->SetGroupBy(LibraryModel::Grouping(
         LibraryModel::GroupBy(
-            s.value("group_by1", int(LibraryModel::GroupBy_Artist)).toInt()),
+            s.value("group_by1", int(LibraryModel::GroupBy_AlbumArtist))
+                .toInt()),
         LibraryModel::GroupBy(
             s.value("group_by2", int(LibraryModel::GroupBy_Album)).toInt()),
         LibraryModel::GroupBy(
diff --git a/src/translations/af.po b/src/translations/af.po
index 931644837..8b2dc7fd8 100644
--- a/src/translations/af.po
+++ b/src/translations/af.po
@@ -1374,7 +1374,7 @@ msgstr "Stel op"
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Verbind Wii-afstandbehere met aktiveer/deaktiveer aksie"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Verbind toestel"
 
@@ -1639,7 +1639,7 @@ msgstr "Skrap"
 msgid "Delete downloaded data"
 msgstr "Vee afgelaaide data uit"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Skrap lêers"
@@ -2384,12 +2384,12 @@ msgstr "Vir lisensiëringsredes word 'n aparte uitbreing vir Spotify ondersteuni
 msgid "Force mono encoding"
 msgstr "Dwing mono-enkodering"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Vergeet van toestel"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2652,7 +2652,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Indien aangeskakel, sal die kliek van 'n liedjie in die speellys direkte redigering van die etiket toelaat."
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5080,7 +5080,7 @@ msgid ""
 "deleted:"
 msgstr "Daar was 'n probleem met die verwydering van sommige liedjies.  Die volgende lêers kan nie verwyder word nie:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5134,20 +5134,20 @@ msgstr "Hierdie toestel moet eers gekoppel en oopgemaak word voordat Clememntine
 msgid "This device supports the following file formats:"
 msgstr "Die toestel ondersteun die volgende lêer formate:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Hierdie toestel sal nie goed werk nie"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Hierdie is 'n MTP toestel, maar jy het Clementine sonder libmtp ondersteuning gekompileer."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Hierdie is 'n iPos, maar jy het Clementine sonder libgpod ondersteuning gekompileer."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5161,7 +5161,7 @@ msgstr "Die opsie kan in die \"Gedrag\" opstellinge verander word"
 msgid "This stream is for paid subscribers only"
 msgstr "Hierdie stroom is slegs vir betalende lede."
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Hierdie tipe toestel word nie ondersteun nie: %1"
diff --git a/src/translations/ar.po b/src/translations/ar.po
index ea2e72f8d..b9cfdbd56 100644
--- a/src/translations/ar.po
+++ b/src/translations/ar.po
@@ -1378,7 +1378,7 @@ msgstr "إعدادات..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "أوصل بأداة التحكم عن بعد لـ Wii بواسطة عملية التفعيل/إلغاء التفعيل"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "وصل الجهاز"
 
@@ -1643,7 +1643,7 @@ msgstr "احذف"
 msgid "Delete downloaded data"
 msgstr "حذف البيانات المحملة"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "احذف الملفات"
@@ -2388,12 +2388,12 @@ msgstr "لدواعي تتعلق بالرخصة، دعم Spotify متوفر في
 msgid "Force mono encoding"
 msgstr "أجبر ترميز مونو"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "انسى الجهاز"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2656,7 +2656,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5084,7 +5084,7 @@ msgid ""
 "deleted:"
 msgstr "واجه كلمنتاين مشاكل عند حذف بعض المقاطع. تعذر حذف المقاطع التالية:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5138,20 +5138,20 @@ msgstr "يجب وصل هذا الجهاز وفتحه قبل أن يتمكن كل
 msgid "This device supports the following file formats:"
 msgstr "يدعم هذا الجهاز الصيغ التالية:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "لن يشتغل هذا الجهاز بصفة سليمة"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "هذا جهاز MTP، لكنك ثبت كلمنتاين دون دعم مكتبة libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "هذا جهاز آيبود، لكنك ثبت كلمنتاين دون دعم مكتبة libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5165,7 +5165,7 @@ msgstr "يمكن تغيير هذه الخاصية من إعدادات \"السل
 msgid "This stream is for paid subscribers only"
 msgstr "هذا التيار للاشتراكات المدفوعة فقط"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "هذا النوع من الأجهزة غير مدعوم: %1"
diff --git a/src/translations/be.po b/src/translations/be.po
index 191818674..a5df051a9 100644
--- a/src/translations/be.po
+++ b/src/translations/be.po
@@ -1373,7 +1373,7 @@ msgstr "Наладзіць..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Падключыць пульт Wii, выкарыстоўваючы актывацыю/дэактывацыю"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Падлучыць прыладу"
 
@@ -1638,7 +1638,7 @@ msgstr "Выдаліць"
 msgid "Delete downloaded data"
 msgstr "Выдаліць спампаваныя дадзеныя"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Выдаліць файлы"
@@ -2383,12 +2383,12 @@ msgstr "Праз ліцэнзыйныя згаджэньні падтрымка
 msgid "Force mono encoding"
 msgstr "Прымусовае кадаваньне ў мона"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Забыць прыладу"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2651,7 +2651,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5079,7 +5079,7 @@ msgid ""
 "deleted:"
 msgstr "Падчас выдаленьня некаторых кампазыцый узьніклі праблемы. Наступныя файлы ня могуць быць выдаленыя:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5133,20 +5133,20 @@ msgstr "Прылада павінна быць падключаная і адч
 msgid "This device supports the following file formats:"
 msgstr "Гэтая прылада падтрымлівае наступныя фарматы:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Гэтая прылада ня будзе працаваць правільна"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Гэта MTP прылада, а вашая вэрсія Clementine скампіляваная без падтрымкі libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Гэта iPod, а вашая вэрсія Clementine скампіляваная без падтрымкі libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5160,7 +5160,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr "Гэты струмень толькі для платных падпісантаў"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Гэты тып прылады не падтрымліваецца: %1"
diff --git a/src/translations/bg.po b/src/translations/bg.po
index 6e62a4df0..7d0228785 100644
--- a/src/translations/bg.po
+++ b/src/translations/bg.po
@@ -1377,7 +1377,7 @@ msgstr "Настройване..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Свържете Wii дистанционни чрез действието активиране/деактивиране"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Свързване на устройство"
 
@@ -1642,7 +1642,7 @@ msgstr "Изтрий"
 msgid "Delete downloaded data"
 msgstr "Изтрий свалените данни"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Изтриване на файлове"
@@ -2387,12 +2387,12 @@ msgstr "Поради причини, свързани с лицензиране
 msgid "Force mono encoding"
 msgstr "Принудително кодиране в моно"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Забравяне на устройство"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2655,7 +2655,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Ако е активирано, щракането върху селектирана песен от плейлиста ще позволява директно модифициране на тага"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5083,7 +5083,7 @@ msgid ""
 "deleted:"
 msgstr "Имаше проблем с изтриването на някои песни.Следните не можаха да бъдат изтрити:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5137,20 +5137,20 @@ msgstr "Това устройство трябва да бъде свързан
 msgid "This device supports the following file formats:"
 msgstr "Това устройство подържа следните формати:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Това устройство няма да работи както трябва."
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Това е MTP устройство,но вие сте компилирали Clementine без подръжка за libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Това е iPod, но вие сте компилирали Clementine без подръжка за libgpod"
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5164,7 +5164,7 @@ msgstr "Тази опция може да се промени от предпо
 msgid "This stream is for paid subscribers only"
 msgstr "Този поток е само за платени регистрации."
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Този тип устройство не е подържано:%1"
diff --git a/src/translations/bn.po b/src/translations/bn.po
index 224ccf4d8..c31857c71 100644
--- a/src/translations/bn.po
+++ b/src/translations/bn.po
@@ -1371,7 +1371,7 @@ msgstr ""
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1636,7 +1636,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr ""
@@ -2381,12 +2381,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2649,7 +2649,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5077,7 +5077,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5131,20 +5131,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5158,7 +5158,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/br.po b/src/translations/br.po
index a5ffdd307..4be01c7aa 100644
--- a/src/translations/br.po
+++ b/src/translations/br.po
@@ -1376,7 +1376,7 @@ msgstr "Kefluniañ..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Kennaskañ Wii Remote en ur implij an oberenn gweredekaat/diweredekaat"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "An drobarzhell a zo o kennaskañ"
 
@@ -1641,7 +1641,7 @@ msgstr "Diverkañ"
 msgid "Delete downloaded data"
 msgstr "Diverkañ ar roadennoù pellgarget"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Diverkañ restroù"
@@ -2386,12 +2386,12 @@ msgstr "Dre abegoù lañvaz ez eo meret Spotify gant un enlugellad distag."
 msgid "Force mono encoding"
 msgstr "Forsiñ an enkodiñ mono"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Disonjal an drobarzhell"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2654,7 +2654,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "M'eo gweredekaet e vo tu deoc'h embann klavioù an tonioù er roll-seniñ war-eeun"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5082,7 +5082,7 @@ msgid ""
 "deleted:"
 msgstr "Ur gudenn a zo evit diverkan tonioù 'zo. Ar restroù-mañ n'int ket bet diverket :"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5136,20 +5136,20 @@ msgstr "An drobarzhell-mañ a rank bezañ liammet ha digoret a-raok ma c'hallfe
 msgid "This device supports the following file formats:"
 msgstr "An drobarzhell a c'hell lenn ar mentrezhoù restroù mañ :"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "An drobarzhell ne ze ket en-dro evel ma zere"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Un drobarzhell MTP eo, met komplet eo bet Clementine hep al levraoueg libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Un iPod eo, met komplet eo bet Clementine hep al levraoueg libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5163,7 +5163,7 @@ msgstr "Ar arventenn-mañ a c'hell bezañ kemmet e rann \"Emzalc'h\" ar gwellvez
 msgid "This stream is for paid subscribers only"
 msgstr "Al lanv-mañ a zo evit an izili o deus paet."
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "An doare trobarzhell-mañ n'eo ket meret :%1"
diff --git a/src/translations/bs.po b/src/translations/bs.po
index 9d3a30202..07a3cdb24 100644
--- a/src/translations/bs.po
+++ b/src/translations/bs.po
@@ -1369,7 +1369,7 @@ msgstr ""
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Spoji Wii daljinski koristeći akciju aktivacija/de-aktivacija"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Spoji uređaj"
 
@@ -1634,7 +1634,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Obriši datoteke"
@@ -2379,12 +2379,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2647,7 +2647,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5075,7 +5075,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5129,20 +5129,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5156,7 +5156,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/ca.po b/src/translations/ca.po
index 5ef7f935e..e865ee36d 100644
--- a/src/translations/ca.po
+++ b/src/translations/ca.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the Clementine package.
 # 
 # Translators:
-# Adolfo Jayme-Barrientos, 2014-2015
-# Adolfo Jayme-Barrientos, 2012-2013,2018
-# Adolfo Jayme-Barrientos, 2016,2018
-# Adolfo Jayme-Barrientos, 2015-2016
-# Adolfo Jayme-Barrientos, 2013
-# Adolfo Jayme-Barrientos, 2014
+# Adolfo Jayme Barrientos, 2014-2015
+# Adolfo Jayme Barrientos, 2012-2013,2018
+# Adolfo Jayme Barrientos, 2016,2018
+# Adolfo Jayme Barrientos, 2015-2016
+# Adolfo Jayme Barrientos, 2013
+# Adolfo Jayme Barrientos, 2014
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 # Juanjo, 2016-2018
 # davidsansome <me@davidsansome.com>, 2013
@@ -1378,7 +1378,7 @@ msgstr "Configura…"
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Connecteu els comandaments del Wii amb el botó d’habilita/inhabilita"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Connecta el dispositiu"
 
@@ -1643,7 +1643,7 @@ msgstr "Eliminar"
 msgid "Delete downloaded data"
 msgstr "Suprimeix les dades baixades"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Suprimeix els fitxers"
@@ -2388,12 +2388,12 @@ msgstr "A causa de la seva llicència, el suport per a Spotify es troba en un co
 msgid "Force mono encoding"
 msgstr "Força la codificació mono"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Oblida el dispositiu"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2656,7 +2656,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "En habilitar aquesta opció, podreu fer clic en la cançó seleccionada de la llista de reproducció i editar els valors directament"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5084,7 +5084,7 @@ msgid ""
 "deleted:"
 msgstr "S’han produït problemes en suprimir algunes cançons. No s’han pogut suprimir els fitxers següents:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5138,20 +5138,20 @@ msgstr "Aquest dispositiu ha de connectar-se i obrir-se abans que el Clementine
 msgid "This device supports the following file formats:"
 msgstr "Aquest dispositiu és compatible amb els següents formats de fitxers:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Aquest dispositiu no funcionarà correctament"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Aquest és un dispositiu MTP, però s’ha compilat el Clementine sense compatibilitat amb libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Aquest dispositiu és un iPod, però heu compilat el Clementine sense compatibilitat libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5165,7 +5165,7 @@ msgstr "Podeu modificar aquesta opció a la pestanya «Comportament» a Preferè
 msgid "This stream is for paid subscribers only"
 msgstr "Aquest flux es sol per als subscriptors que paguen"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Aquest tipus de dispositiu no és compatible: %1"
diff --git a/src/translations/cs.po b/src/translations/cs.po
index 1f8738d02..b3a39ab94 100644
--- a/src/translations/cs.po
+++ b/src/translations/cs.po
@@ -1383,7 +1383,7 @@ msgstr "Nastavit..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Připojit dálkový ovladač Wii pomocí činnosti zapnout/vypnout"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Připojit zařízení"
 
@@ -1648,7 +1648,7 @@ msgstr "Smazat"
 msgid "Delete downloaded data"
 msgstr "Smazat stažená data"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Smazat soubory"
@@ -2393,12 +2393,12 @@ msgstr "Z licenčních důvodů je podpora pro Spotify v odděleném přídavné
 msgid "Force mono encoding"
 msgstr "Vynutit jednokanálové kódování"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Zapomenout zařízení"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2661,7 +2661,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Pokud je zapnuto, po klepnutí na vybranou píseň v seznamu skladeb můžete upravit hodnotu značky přímo"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5089,7 +5089,7 @@ msgid ""
 "deleted:"
 msgstr "Při mazání některých písní nastaly potíže. Nepodařilo se smazat následující soubory:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5143,20 +5143,20 @@ msgstr "Pro zjištění podporovaných formátů souborů je zařízení nejdř
 msgid "This device supports the following file formats:"
 msgstr "Toto zařízení podporuje následující formáty souborů:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Toto zařízení nebude pracovat správně"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Toto je zařízení MTP, ale Clementine byl sestaven bez podpory pro libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Toto je zařízení iPod, ale Clementine byl sestaven bez podpory pro libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5170,7 +5170,7 @@ msgstr "Tuto volbu lze změnit v nastavení Chování"
 msgid "This stream is for paid subscribers only"
 msgstr "Tento proud je pouze pro předplatitele"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Tento typ zařízení není podporován: %1"
diff --git a/src/translations/cy.po b/src/translations/cy.po
index 0896419d2..063625be0 100644
--- a/src/translations/cy.po
+++ b/src/translations/cy.po
@@ -1369,7 +1369,7 @@ msgstr ""
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1634,7 +1634,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr ""
@@ -2379,12 +2379,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2647,7 +2647,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5075,7 +5075,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5129,20 +5129,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5156,7 +5156,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/da.po b/src/translations/da.po
index e571e4588..3717e22fe 100644
--- a/src/translations/da.po
+++ b/src/translations/da.po
@@ -1387,7 +1387,7 @@ msgstr "Konfigurer ..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Forbind til Wii Remotes med aktiver/deaktiver handling"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Forbind til enhed"
 
@@ -1652,7 +1652,7 @@ msgstr "Slet"
 msgid "Delete downloaded data"
 msgstr "Sletter hentet data"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Slet filer"
@@ -2397,12 +2397,12 @@ msgstr "På grund af licenshensyn er Spotify-understøttelsen en separat plugin.
 msgid "Force mono encoding"
 msgstr "Gennemtving monolyd-indkodning"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Glem enhed"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2665,7 +2665,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Hvis aktiveret, så vil et klik på en valgt sang i afspilningsvisningen lade dig redigere mærkeværdien direkte"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5093,7 +5093,7 @@ msgid ""
 "deleted:"
 msgstr "Der var et problem ved at kopiere nogle sange. Følgende filer kunne ikke slettes:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5147,20 +5147,20 @@ msgstr "Enheden må sluttes til og åbnes før Clementine kan se hvilke filforma
 msgid "This device supports the following file formats:"
 msgstr "Enheden understøtter følgende filformater:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Enheden vil ikke fungere korrekt"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Dette er en MTP-enhed, men Clementine blev kompileret uden libmtp-understøttelse."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Dette er en iPod, men Clementine blev kompileret uden libgpod-understøttelse."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5174,7 +5174,7 @@ msgstr "Denne indstilling kan ændres præferencerne for »Opførsel«"
 msgid "This stream is for paid subscribers only"
 msgstr "Denne udsendelse er kun for betalende abonnenter"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Enhedstypen understøttes ikke: %1"
diff --git a/src/translations/de.po b/src/translations/de.po
index ec2ee1422..e0aed03fc 100644
--- a/src/translations/de.po
+++ b/src/translations/de.po
@@ -1424,7 +1424,7 @@ msgstr "Einrichten …"
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Wii-Fernbedienungen mittels Aktivieren/deaktivieren-Aktion verbinden"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Gerät verbinden"
 
@@ -1689,7 +1689,7 @@ msgstr "Löschen"
 msgid "Delete downloaded data"
 msgstr "Heruntergeladene Dateien löschen"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Dateien löschen"
@@ -2434,12 +2434,12 @@ msgstr "Aus lizenzrechtlichen Gründen ist die Spotify-Unterstützung in einer s
 msgid "Force mono encoding"
 msgstr "Monokodierung erzwingen"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Gerät vergessen"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2702,7 +2702,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Wenn aktiviert, können Sie mit einem Klick auf einen Titel in der Wiedergabeliste, die Schlagwortwerte direkt bearbeiten"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5130,7 +5130,7 @@ msgid ""
 "deleted:"
 msgstr "Beim Löschen einiger Titel ist ein Fehler aufgetreten. Die folgenden Dateien konnten nicht gelöscht werden:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5184,20 +5184,20 @@ msgstr "Dieses Gerät muss verbunden und geöffnet sein, bevor Clementine festst
 msgid "This device supports the following file formats:"
 msgstr "Dieses Gerät unterstützt die folgenden Dateiformate:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Dieses Gerät wird nicht ordnungsgemäß funktionieren"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Dies ist ein MTP-Gerät, aber Clementine wurde ohne Unterstützung für libmtp kompiliert."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Dies ist ein iPod, aber Clementine wurde ohne Unterstützung für libgpod kompiliert."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5211,7 +5211,7 @@ msgstr "Diese Einstellung kann in den »Verhalten«-Einstellungen geändert werd
 msgid "This stream is for paid subscribers only"
 msgstr "Dieser Datenstrom ist nur für zahlende Kunden verfügbar"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Diese Geräteart wird nicht unterstützt: %1"
diff --git a/src/translations/el.po b/src/translations/el.po
index bae533198..dabc6c64e 100644
--- a/src/translations/el.po
+++ b/src/translations/el.po
@@ -1386,7 +1386,7 @@ msgstr "Παραμετροποίηση..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Σύνδεση των χειριστηρίων Wii χρησιμοποιώντας την ενέργεια ενεργοποίηση/απενεργοποίηση"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Σύνδεση συσκευής"
 
@@ -1651,7 +1651,7 @@ msgstr "Διαγραφή"
 msgid "Delete downloaded data"
 msgstr "Διαγραφή ληφθέντων δεδομένων"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Διαγραφή αρχείων"
@@ -2396,12 +2396,12 @@ msgstr "Για λόγους αδειοδότησης η υποστήριξη γ
 msgid "Force mono encoding"
 msgstr "Επιβολή κωδικοποίησης mono"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Λήθη της συσκευής"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2664,7 +2664,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Αν ενεργοποιηθεί, κάνοντας κλικ σε ένα επιλεγμένο τραγούδι στην όψη λίστα αναπαραγωγής θα σας επιτρέψει να επεξεργαστείτε άμεσα την τιμή της ετικέτας"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5092,7 +5092,7 @@ msgid ""
 "deleted:"
 msgstr "Υπήρξαν προβλήματα κατά την διαγραφή κάποιων τραγουδιών. Τα ακόλουθα αρχεία δεν μπόρεσαν να διαγραφούν:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5146,20 +5146,20 @@ msgstr "Η συσκευή αυτή πρέπει να συνδεθεί και ν
 msgid "This device supports the following file formats:"
 msgstr "Η συσκευή αυτή υποστηρίζει τις ακόλουθες μορφές:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Η συσκευή αυτή δεν θα λειτουργήσει σωστά"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Αυτή είναι μία συσκευή MTP, αλλά φτιάξατε τον Clementine χωρίς υποστήριξη της libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Αυτό είναι iPod, αλλά φτιάξατε τον Clementine χωρίς υποστήριξη της libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5173,7 +5173,7 @@ msgstr "Η επιλογή αυτή μπορεί να αλλάξει από τι
 msgid "This stream is for paid subscribers only"
 msgstr "Η ροή αυτή είναι μόνο για συνδρομητές"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Αυτού του τύπου η συσκευή δεν υποστηρίζετε %1"
diff --git a/src/translations/en_CA.po b/src/translations/en_CA.po
index 675970455..e298f9606 100644
--- a/src/translations/en_CA.po
+++ b/src/translations/en_CA.po
@@ -1371,7 +1371,7 @@ msgstr "Configure..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Connect Wii Remotes using activate/de-activate action"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Connect device"
 
@@ -1636,7 +1636,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr ""
@@ -2381,12 +2381,12 @@ msgstr "For licensing reasons Spotify support is in a separate plugin."
 msgid "Force mono encoding"
 msgstr "Force mono encoding"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Forget device"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2649,7 +2649,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5077,7 +5077,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5131,20 +5131,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5158,7 +5158,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr "This stream is for paid subscribers only"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/en_GB.po b/src/translations/en_GB.po
index 78bc14df0..0db401b38 100644
--- a/src/translations/en_GB.po
+++ b/src/translations/en_GB.po
@@ -1372,7 +1372,7 @@ msgstr "Configure..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Connect Wii Remotes using activate/deactivate action"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Connect device"
 
@@ -1637,7 +1637,7 @@ msgstr "Delete"
 msgid "Delete downloaded data"
 msgstr "Delete downloaded data"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Delete files"
@@ -2382,12 +2382,12 @@ msgstr "For licensing reasons Spotify support is in a separate plugin."
 msgid "Force mono encoding"
 msgstr "Force mono encoding"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Forget device"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2650,7 +2650,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "If activated, clicking a selected song in the playlist view will let you edit the tag value directly"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5078,7 +5078,7 @@ msgid ""
 "deleted:"
 msgstr "There were problems deleting some songs.  The following files could not be deleted:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5132,20 +5132,20 @@ msgstr "This device must be connected and opened before Clementine can see what
 msgid "This device supports the following file formats:"
 msgstr "This device supports the following file formats:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "This device will not work properly"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "This is an MTP device, but you compiled Clementine without libmtp support."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "This is an iPod, but you compiled Clementine without libgpod support."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5159,7 +5159,7 @@ msgstr "This option can be changed in the \"Behaviour\" preferences"
 msgid "This stream is for paid subscribers only"
 msgstr "This stream is for paid subscribers only"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "This type of device is not supported: %1"
diff --git a/src/translations/eo.po b/src/translations/eo.po
index 0ad7f965e..b119456e1 100644
--- a/src/translations/eo.po
+++ b/src/translations/eo.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the Clementine package.
 # 
 # Translators:
-# Adolfo Jayme-Barrientos, 2014
-# Adolfo Jayme-Barrientos, 2018
-# Adolfo Jayme-Barrientos, 2015-2016
-# Adolfo Jayme-Barrientos, 2014
+# Adolfo Jayme Barrientos, 2014
+# Adolfo Jayme Barrientos, 2018
+# Adolfo Jayme Barrientos, 2015-2016
+# Adolfo Jayme Barrientos, 2014
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: Clementine Music Player\n"
 "PO-Revision-Date: 2018-11-18 11:42+0000\n"
-"Last-Translator: Adolfo Jayme-Barrientos\n"
+"Last-Translator: Adolfo Jayme Barrientos\n"
 "Language-Team: Esperanto (http://www.transifex.com/davidsansome/clementine/language/eo/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1373,7 +1373,7 @@ msgstr ""
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1638,7 +1638,7 @@ msgstr "Forigi"
 msgid "Delete downloaded data"
 msgstr "Forigi elŝutintajn datumojn"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Forigi dosierojn"
@@ -2383,12 +2383,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2651,7 +2651,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5079,7 +5079,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5133,20 +5133,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5160,7 +5160,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/es.po b/src/translations/es.po
index e1f368dea..3d8986533 100644
--- a/src/translations/es.po
+++ b/src/translations/es.po
@@ -4,12 +4,12 @@
 # 
 # Translators:
 # Coroccotta <adiazubierna@gmail.com>, 2012
-# Adolfo Jayme-Barrientos, 2014
-# Adolfo Jayme-Barrientos, 2012-2013,2018
-# Adolfo Jayme-Barrientos, 2016-2018
-# Adolfo Jayme-Barrientos, 2015-2016
-# Adolfo Jayme-Barrientos, 2013
-# Adolfo Jayme-Barrientos, 2014
+# Adolfo Jayme Barrientos, 2014
+# Adolfo Jayme Barrientos, 2012-2013,2018
+# Adolfo Jayme Barrientos, 2016-2018
+# Adolfo Jayme Barrientos, 2015-2016
+# Adolfo Jayme Barrientos, 2013
+# Adolfo Jayme Barrientos, 2014
 # Adrián Prado Castro <adrian.prado@gmail.com>, 2013
 # Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012
 # Amaury Ortega <amauryocortega@gmail.com>, 2018
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Clementine Music Player\n"
 "PO-Revision-Date: 2018-11-18 11:34+0000\n"
-"Last-Translator: Adolfo Jayme-Barrientos\n"
+"Last-Translator: Adolfo Jayme Barrientos\n"
 "Language-Team: Spanish (http://www.transifex.com/davidsansome/clementine/language/es/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1404,7 +1404,7 @@ msgstr "Configurar…"
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Conectar Wii Remotes mediante acción de activar/desactivar"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Conectar dispositivo"
 
@@ -1669,7 +1669,7 @@ msgstr "Eliminar"
 msgid "Delete downloaded data"
 msgstr "Eliminar datos descargados"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Eliminar archivos"
@@ -2414,12 +2414,12 @@ msgstr "Por motivos de la licencia, para usar Spotify se necesita un complemento
 msgid "Force mono encoding"
 msgstr "Forzar la codificación monoaural"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Olvidar dispositivo"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2682,7 +2682,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Al activar esta opción, podrá pulsar en la canción seleccionada de la lista de reproducción y editar los valores directamente"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5110,7 +5110,7 @@ msgid ""
 "deleted:"
 msgstr "Hubo problemas al eliminar algunas canciones.  No se pudieron eliminar los siguientes archivos:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5164,20 +5164,20 @@ msgstr "Este dispositivo debe conectarse y abrirse antes de que Clementine pueda
 msgid "This device supports the following file formats:"
 msgstr "Este dispositivo admite los formatos de archivo siguientes:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Este dispositivo no funcionará correctamente"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Este es un dispositivo MTP, pero se compiló Clementine sin la compatibilidad con libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Este es un iPod, pero se compiló Clementine sin la compatibilidad con libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5191,7 +5191,7 @@ msgstr "Puede modificar esta opción en la pestaña «Comportamiento» en Prefer
 msgid "This stream is for paid subscribers only"
 msgstr "Este flujo es solo para los suscriptores de pago"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "No se admite este tipo de dispositivo: %1"
diff --git a/src/translations/et.po b/src/translations/et.po
index 1cc972c4e..9600440f2 100644
--- a/src/translations/et.po
+++ b/src/translations/et.po
@@ -1372,7 +1372,7 @@ msgstr "Seadista..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Ühenda seade"
 
@@ -1637,7 +1637,7 @@ msgstr "Kustuta"
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Kustuta failid"
@@ -2382,12 +2382,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Unusta seade"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2650,7 +2650,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5078,7 +5078,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5132,20 +5132,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5159,7 +5159,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/eu.po b/src/translations/eu.po
index b6216faa0..dcba17d26 100644
--- a/src/translations/eu.po
+++ b/src/translations/eu.po
@@ -1373,7 +1373,7 @@ msgstr "Konfiguratu..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Konektatu Wii urruneko kontrola aktibatu/desaktibatu botoia erabiliz"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Konektatu gailua"
 
@@ -1638,7 +1638,7 @@ msgstr "Ezabatu"
 msgid "Delete downloaded data"
 msgstr "Ezabatu deskargatutako datuak"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Ezabatu fitxategiak"
@@ -2383,12 +2383,12 @@ msgstr "Lizentzia arrazoiengatik Spotify-ren euskarria aparteko plugin batean da
 msgid "Force mono encoding"
 msgstr "Mono kodeketa behartu"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Gailua ahaztu"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2651,7 +2651,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5079,7 +5079,7 @@ msgid ""
 "deleted:"
 msgstr "Arazoak egon dira abesti batzuk ezabatzean. Hurrengo fitxategiak ezin izan dira ezabatu:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5133,20 +5133,20 @@ msgstr "Gailu hau konektatu eta ireki behar da zein fitxategi-formatu onartzen d
 msgid "This device supports the following file formats:"
 msgstr "Gailu honek hurrengo fitxategi-formatuak onartzen ditu:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Gailu hau ez da era egokian ibiliko"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Hau MTP gailua da, baina Clementine libmtp euskarri gabe konpilatua dago."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Hau iPod bat da, baina Clementine libgpod euskarri gabe konpilatua dago."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5160,7 +5160,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr "Jario hau ordainpeko harpidedunentzat da bakarrik"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Gailu mota hau ez da onartzen :%1"
diff --git a/src/translations/fa.po b/src/translations/fa.po
index 63ef83f6a..d109f8db7 100644
--- a/src/translations/fa.po
+++ b/src/translations/fa.po
@@ -1375,7 +1375,7 @@ msgstr "پیکربندی..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "کنترل Wii را با استفاده از کنش پویا/ناپویا وصل کنید"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "اتصال دستگاه"
 
@@ -1640,7 +1640,7 @@ msgstr "پاک‌کردن"
 msgid "Delete downloaded data"
 msgstr "پاک‌کردن دانستنی‌های بارگیری شده"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "پاک کردن پرونده‌ها"
@@ -2385,12 +2385,12 @@ msgstr "به دلایل اجازه‌نامه، پشتیبانی اسپاتیف
 msgid "Force mono encoding"
 msgstr "واداشتن به رمزینه‌ی مونو"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "فراموشیدن دستگاه"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2653,7 +2653,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5081,7 +5081,7 @@ msgid ""
 "deleted:"
 msgstr "مشکلی در پاک کردن تعدادی از آهنگ‌ها وجود داشت. پرونده‌های زیر پاک نشدند:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5135,20 +5135,20 @@ msgstr "این دستگاه باید متصل و باز شده باشد پیش 
 msgid "This device supports the following file formats:"
 msgstr "این دستگاه از فرمت‌های زیر پشتیبانی می‌کند:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "این دستگاه درست کار نخواهد کرد"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "این یک دستگاه MTP است، اما شما کلمنتاین را بدون پشتیبانی libmtp پردازش کرده‌اید."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "این یک آی‌پاد است، اما شما کلمنتاین را بدون پشتیبانی libgpod پردازش کرده‌اید."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5162,7 +5162,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr "این جریان تنها برای مشترکان پولی است"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "این گونه از دستگاه پشتیبانی نمی‌شود: %1"
diff --git a/src/translations/fi.po b/src/translations/fi.po
index a9092615d..5762634f4 100644
--- a/src/translations/fi.po
+++ b/src/translations/fi.po
@@ -1374,7 +1374,7 @@ msgstr "Asetukset..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Yhdistä Wii Remote käyttämällä aktivoi/deaktivoi toimintoa"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Yhdistä laite"
 
@@ -1639,7 +1639,7 @@ msgstr "Poista"
 msgid "Delete downloaded data"
 msgstr "Poista ladattu data"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Poista tiedostot"
@@ -2384,12 +2384,12 @@ msgstr "Lisenssisyistä Spotify-tuki on erillinen liitännäinen."
 msgid "Force mono encoding"
 msgstr "Pakota monokoodaus"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Unohda laite"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2652,7 +2652,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Jos käytössä, kappaleen napsauttaminen soittolistanäkymässä sallii tunnistearvon muokkauksen suoraan."
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5080,7 +5080,7 @@ msgid ""
 "deleted:"
 msgstr "Kappaleita poistaessa ilmeni virheitä. Seuraavien kappaleiden poisto epäonnistui:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5134,20 +5134,20 @@ msgstr "Laitteen tulee olla yhdistettynä ja avattuna, jotta Clementine voi tark
 msgid "This device supports the following file formats:"
 msgstr "Laite tukee seuraavia tiedostomuotoja:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Laite ei tule toimimaan kunnolla"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Kyseessä on MTP-laite, mutta Clementine on käännetty ilman libmtp-tukea."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Kyseessä on iPod, mutta Clementine on käännetty ilman libgpod-tukea."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5161,7 +5161,7 @@ msgstr "Tämän valinnan voi vaihtaa asetuksien kohdasta \"Toiminta\"."
 msgid "This stream is for paid subscribers only"
 msgstr "Suoratoisto on tarjolla vain maksaville asiakkaille"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Tämän tyyppinen laite ei ole tuettu: %1"
diff --git a/src/translations/fr.po b/src/translations/fr.po
index bba3d6680..77492a1a4 100644
--- a/src/translations/fr.po
+++ b/src/translations/fr.po
@@ -1414,7 +1414,7 @@ msgstr "Configurer..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Connecter Wii Remote en utilisant l'action activer/désactiver"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Connexion du périphérique"
 
@@ -1679,7 +1679,7 @@ msgstr "Supprimer"
 msgid "Delete downloaded data"
 msgstr "Effacer les données téléchargées"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Supprimer les fichiers"
@@ -2424,12 +2424,12 @@ msgstr "Pour des raisons de licence, le support de Spotify est dans un module s
 msgid "Force mono encoding"
 msgstr "Forcer l’encodage en mono"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Oublier ce périphérique"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2692,7 +2692,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Si cette option est activée, cliquer sur un morceau sélectionné dans la liste de lecture vous permettra d'éditer directement la valeur du tag"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5120,7 +5120,7 @@ msgid ""
 "deleted:"
 msgstr "Il y a eu un problème pour supprimer certains morceaux. Les fichiers suivant n'ont pas pu être supprimés :"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5174,20 +5174,20 @@ msgstr "Ce périphérique doit être connecté et ouvert pour que Clementine pui
 msgid "This device supports the following file formats:"
 msgstr "Ce périphérique supporte les formats suivant :"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Ce périphérique ne fonctionne pas correctement"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Ceci est un périphérique MTP, mais vous avez compilé Clementine sans le support libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Ceci est un iPod, mais vous avez compilé Clementine sans le support libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5201,7 +5201,7 @@ msgstr "Cette option peut être modifiée dans les préférences de « Comportem
 msgid "This stream is for paid subscribers only"
 msgstr "Ce flux n'est accessible qu'aux abonnés ayant payé"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Ce type de périphérique n'est pas supporté : %1"
diff --git a/src/translations/ga.po b/src/translations/ga.po
index 1a8c232a8..4bdfb14e9 100644
--- a/src/translations/ga.po
+++ b/src/translations/ga.po
@@ -1370,7 +1370,7 @@ msgstr "Cumraigh..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Nasc gléas"
 
@@ -1635,7 +1635,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr "Scrios sonraí íosluchtaithe"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Scrios comhaid"
@@ -2380,12 +2380,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Déan dearmad faoin ngléas"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2648,7 +2648,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5076,7 +5076,7 @@ msgid ""
 "deleted:"
 msgstr "Tharla fadhbanna ag scriosadh cuid de na hamhráin. Níorbh fhéidir na comhaid a leanas a scriosadh:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5130,20 +5130,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Níl an gléas  ag feidhmiú i gceart"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5157,7 +5157,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/gl.po b/src/translations/gl.po
index 2ab2e1513..a1b27fc39 100644
--- a/src/translations/gl.po
+++ b/src/translations/gl.po
@@ -1373,7 +1373,7 @@ msgstr "Configurar..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Conecte controis de Wii mediante as accións de activar e desactivar."
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Conectar dispositivo"
 
@@ -1638,7 +1638,7 @@ msgstr "Eliminar"
 msgid "Delete downloaded data"
 msgstr "Eliminar os datos descargados"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Eliminar arquivos "
@@ -2383,12 +2383,12 @@ msgstr "Por cuestións legais, para a compatibilidade con Spotify debe instalar
 msgid "Force mono encoding"
 msgstr "Forzar a codificación dunha canle."
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Esquecer o dispositivo"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2651,7 +2651,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5079,7 +5079,7 @@ msgid ""
 "deleted:"
 msgstr "Houbo problemas eliminando algunhas cancións. Os seguintes arquivos non puderon ser eliminados:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5133,20 +5133,20 @@ msgstr "O dispositivo debe conectarse e abrirse para que Clementine poida saber
 msgid "This device supports the following file formats:"
 msgstr "O ficheiro é compatíbel cos seguintes formatos de ficheiro:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "O dispositivo non vai funcionar correctamente."
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Trátase dun dispositivo MTP. A súa copia de Clementine construíuse sen compatibilidade con este tipo de dispositivos."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Trátase dun iPod. A súa copia de Clementine construíuse sen compatibilidade con este tipo de dispositivos."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5160,7 +5160,7 @@ msgstr "Esta opción pode ser cambiada nas preferencias de \"Comportamento\""
 msgid "This stream is for paid subscribers only"
 msgstr "O fluxo só está dispoñíbel para subscritores de pago."
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Clementine non é compatíbel con este tipo de dispositivo: %1."
diff --git a/src/translations/he.po b/src/translations/he.po
index d8cbde470..2d8d5295e 100644
--- a/src/translations/he.po
+++ b/src/translations/he.po
@@ -1376,7 +1376,7 @@ msgstr "הגדרה..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "חיבור Wii Remotes בעזרת פעולת הפעלה/כיבוי"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "חיבור התקן"
 
@@ -1641,7 +1641,7 @@ msgstr "מחיקה"
 msgid "Delete downloaded data"
 msgstr "מחיקת מידע שהתקבל"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "מחיקת קבצים"
@@ -2386,12 +2386,12 @@ msgstr "עקב בעיות רישוי, התמיכה ב־Spotify נמצאת בתו
 msgid "Force mono encoding"
 msgstr "אילוץ קידוד mono"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "התעלמות מההתקן"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2654,7 +2654,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5082,7 +5082,7 @@ msgid ""
 "deleted:"
 msgstr "אירעה תקלה במחיקת חלק מהשירים. הקבצים הבאים לא נמחקו:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5136,20 +5136,20 @@ msgstr "ההתקן הזה חייב להיות מחובר ופתוח על מנת
 msgid "This device supports the following file formats:"
 msgstr "ההתקן הזה תומך בפורמטים הבאים:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "ההתקן הזה לא יעבוד כראוי"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "התקן זה הוא התקן מסוג MTP, אולם Clementine לא קומפל עם תמיכה ב-libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "זהו iPod, אולם Clementine לא קומפל עם תמיכה ב-libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5163,7 +5163,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr "המדיה הזורמת הזו היא עבור חברות בתשלום בלבד"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "סוג התקן זה לא נתמך: %1"
diff --git a/src/translations/he_IL.po b/src/translations/he_IL.po
index e72371bb1..fc1123b8c 100644
--- a/src/translations/he_IL.po
+++ b/src/translations/he_IL.po
@@ -1368,7 +1368,7 @@ msgstr ""
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1633,7 +1633,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr ""
@@ -2378,12 +2378,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2646,7 +2646,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5074,7 +5074,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5128,20 +5128,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5155,7 +5155,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/hi.po b/src/translations/hi.po
index 8f84e073c..80f8872c1 100644
--- a/src/translations/hi.po
+++ b/src/translations/hi.po
@@ -1371,7 +1371,7 @@ msgstr ""
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1636,7 +1636,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr ""
@@ -2381,12 +2381,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2649,7 +2649,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5077,7 +5077,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5131,20 +5131,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5158,7 +5158,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/hr.po b/src/translations/hr.po
index bb25d59a1..189bd0185 100644
--- a/src/translations/hr.po
+++ b/src/translations/hr.po
@@ -1373,7 +1373,7 @@ msgstr "Podesi..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Spoji Wii Daljinski upravljač koristeći aktiviraj/deaktiviraj naredbu"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Spoji uređaj"
 
@@ -1638,7 +1638,7 @@ msgstr "Obriši"
 msgid "Delete downloaded data"
 msgstr "Obriši preuzete podatke"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Obrišite datoteku"
@@ -2383,12 +2383,12 @@ msgstr "Zbog razloga licenciranja Spotify-a podrška je u posebnom dodatku."
 msgid "Force mono encoding"
 msgstr "Forsiraj mono enkôdiranje"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Zaboravi uređaj"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2651,7 +2651,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Ako je aktivirano, klikom na odabranu pjesmu u popisu izvođenja dopustit će vam izravno uređivanje oznake"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5079,7 +5079,7 @@ msgid ""
 "deleted:"
 msgstr "Dogodio se problem u brisanju  nekih pjesama. Sljedeće datoteke ne mogu biti obrisane:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5133,20 +5133,20 @@ msgstr "Ovaj uređaj mora biti spojen i otvoren prije nego što Clementine vidi
 msgid "This device supports the following file formats:"
 msgstr "Uređaj podržava sljedeće formate datoteka:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Uređaj neće raditi ispravno"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Ovo je MTP uređaj, kompajlirali ste Clementine bez libmtp potpore."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Ovo je iPod uređaj, kompajlirali ste Clementine bez libgpod potpore."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5160,7 +5160,7 @@ msgstr "Ova mogućnost se može promijeniti u \"Ponašanje\" osobitostima"
 msgid "This stream is for paid subscribers only"
 msgstr "Ovaj stream je samo za pretplaćene korisnike"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Ova vrst uređaja nije podržana: %1"
diff --git a/src/translations/hu.po b/src/translations/hu.po
index c91f59c77..175d67c17 100644
--- a/src/translations/hu.po
+++ b/src/translations/hu.po
@@ -1379,7 +1379,7 @@ msgstr "Beállítás..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Wii távvezérlő csatlakoztatása az aktiválás/deaktiválás esemény használatával"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Eszköz csatlakoztatása"
 
@@ -1644,7 +1644,7 @@ msgstr "Törlés"
 msgid "Delete downloaded data"
 msgstr "Letöltött adatok törlése"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Fájlok törlése"
@@ -2389,12 +2389,12 @@ msgstr "Licencelési okok miatt a Spotify támogatást külön beépülőben kel
 msgid "Force mono encoding"
 msgstr "Mono kódolás kényszerítése"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Eszköz elfelejtése"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2657,7 +2657,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Aktiválásakor a kiválasztott szám címkéje szerkeszthető lesz kiválasztáskor"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5085,7 +5085,7 @@ msgid ""
 "deleted:"
 msgstr "Néhány szám törlése közben hiba lépett fel. Az alábbi fájlokat nem sikerült törölni:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5139,20 +5139,20 @@ msgstr "A Clementine csak az eszköz csatlakoztatása és megnyitása után kép
 msgid "This device supports the following file formats:"
 msgstr "Ez az eszköz az alábbi fájlformátumokat támogatja:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Az eszköz nem fog megfelelően működni"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Ez egy MTP eszköz, de a Clementine libmtp támogatás nélkül lett fordítva."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Ez az eszköz egy iPod, de a Clementine libgpod támogatás nélkül lett fordítva."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5166,7 +5166,7 @@ msgstr "Ez a beállítás változtatható a \"Viselkedés\" menüben"
 msgid "This stream is for paid subscribers only"
 msgstr "Ez az adatfolyam csak előfizetőknek érhető el"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "A %1 eszköztípus nem támogatott"
diff --git a/src/translations/hy.po b/src/translations/hy.po
index df3056e71..1f3a46a1f 100644
--- a/src/translations/hy.po
+++ b/src/translations/hy.po
@@ -1369,7 +1369,7 @@ msgstr ""
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1634,7 +1634,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr ""
@@ -2379,12 +2379,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2647,7 +2647,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5075,7 +5075,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5129,20 +5129,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5156,7 +5156,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/ia.po b/src/translations/ia.po
index 7125c94a7..d3bcdbcc2 100644
--- a/src/translations/ia.po
+++ b/src/translations/ia.po
@@ -1371,7 +1371,7 @@ msgstr ""
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1636,7 +1636,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr ""
@@ -2381,12 +2381,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2649,7 +2649,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5077,7 +5077,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5131,20 +5131,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5158,7 +5158,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/id.po b/src/translations/id.po
index 6f82c912f..4485025cb 100644
--- a/src/translations/id.po
+++ b/src/translations/id.po
@@ -1390,7 +1390,7 @@ msgstr "Konfigurasi..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Sambungkan Wii Remote menggunakan tindakan aktif/nonaktif"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Sambungkan perangkat"
 
@@ -1655,7 +1655,7 @@ msgstr "Hapus"
 msgid "Delete downloaded data"
 msgstr "Hapus data yang sudah diunduh"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Hapus berkas"
@@ -2400,12 +2400,12 @@ msgstr "Karena alasan lisensi, dukungan Spotify tersedia dalam plugin terpisah."
 msgid "Force mono encoding"
 msgstr "Paksa enkode mono"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Lupakan perangkat"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2668,7 +2668,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Jika diaktifkan, mengklik lagu yang dipilih di dalam tampilan daftar-putar memperbolehkan Anda menyunting nilai tag secara langsung"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5096,7 +5096,7 @@ msgid ""
 "deleted:"
 msgstr "Ada masalah dalam menghapus beberapa lagu.  Berkas-berkas berikut tidak dapat dihapus:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5150,20 +5150,20 @@ msgstr "Perangkat ini harus tersambung dan dibuka sebelum Clementine dapat melih
 msgid "This device supports the following file formats:"
 msgstr "Perangkat ini mendukung format berkas berikut:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Perangkat ini tidak akan bekerja dengan baik"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Ini adalah perangkat MTP, tetapi Anda mengompilasi Clementine tanpa dukungan libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Ini adalah iPod, tetapi Anda mengompilasi Clementine tanpa dukungan libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5177,7 +5177,7 @@ msgstr "Opsi ini dapat diubah di pengaturan \"Perilaku\""
 msgid "This stream is for paid subscribers only"
 msgstr "Strim ini hanya untuk pelanggan berbayar"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Tipe perangkat ini tidak didukung: %1"
diff --git a/src/translations/is.po b/src/translations/is.po
index b7c9dfb20..a9740b954 100644
--- a/src/translations/is.po
+++ b/src/translations/is.po
@@ -1375,7 +1375,7 @@ msgstr "Stilla..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Tengdu Wii-remote fjarstýringar með virkja/afvirkja aðgerð"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Tengja tæki"
 
@@ -1640,7 +1640,7 @@ msgstr "Eyða"
 msgid "Delete downloaded data"
 msgstr "Eyða sóttum gögnum"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Eyða skrám"
@@ -2385,12 +2385,12 @@ msgstr "Vegna vandamála með notkunarleyfi er stuðningur við Spotify hafður
 msgid "Force mono encoding"
 msgstr "Þvinga einóma-kóðun"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Gleyma tæki"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2653,7 +2653,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5081,7 +5081,7 @@ msgid ""
 "deleted:"
 msgstr "Vandamál kom upp við að eyða einhverjum lögum. Eftirfarandi skrám var ekki hægt að eyða:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5135,20 +5135,20 @@ msgstr "Þetta tæki verður að vera tengt og opnað áður en Clementine getur
 msgid "This device supports the following file formats:"
 msgstr "Þetta tæki styður eftirfarandi skráasnið:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Þetta tæki mun ekki virka eðlilega"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Þetta er MTP-tæki, en þú vistþýddir Clementine án stuðnings við libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Þetta er iPod, en þú vistþýddir Clementine án stuðnings við libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5162,7 +5162,7 @@ msgstr "Þessum valkosti er hægt að breyta í \"Hegðun\" kjörstillingunum"
 msgid "This stream is for paid subscribers only"
 msgstr "Þetta streymi er einungis fyrir borgandi áskrifendur"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Þessi gerð tækis er ekki studd: %1"
diff --git a/src/translations/it.po b/src/translations/it.po
index c682baf6a..d51fb05e6 100644
--- a/src/translations/it.po
+++ b/src/translations/it.po
@@ -1374,7 +1374,7 @@ msgstr "Configura..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Connetti i Wii Remote utilizzando l'azione attiva/disattiva"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Connetti dispositivo"
 
@@ -1639,7 +1639,7 @@ msgstr "Elimina"
 msgid "Delete downloaded data"
 msgstr "Elimina i dati scaricati"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Elimina i file"
@@ -2384,12 +2384,12 @@ msgstr "Per motivi di licenza, il supporto di Spotify è in un plugin separato."
 msgid "Force mono encoding"
 msgstr "Forza codifica mono"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Elimina dispositivo"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2652,7 +2652,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Se attivata, il clic su un brano selezionato nella vista della scaletta ti consentirà di modificare direttamente il valore di un tag"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5080,7 +5080,7 @@ msgid ""
 "deleted:"
 msgstr "Si sono verificati dei problemi durante l'eliminazione di alcuni brani. I seguenti file potrebbero non essere eliminati:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5134,20 +5134,20 @@ msgstr "Il dispositivo deve essere collegato e aperto prima che Clementine possa
 msgid "This device supports the following file formats:"
 msgstr "Questo dispositivo utilizza i seguenti formati file:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Il dispositivo non funzionerà correttamente"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Questo è un dispositivo MTP, ma hai compilato Clementine senza il supporto a libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Questo è un iPod, ma hai compilato Clementine senza il supporto a libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5161,7 +5161,7 @@ msgstr "Questa opzione può essere modificata nelle preferenze di \"Comportament
 msgid "This stream is for paid subscribers only"
 msgstr "Questo flusso è riservato ai soli abbonati"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Questi tipo di dispositivo non è supportato: %1"
diff --git a/src/translations/ja.po b/src/translations/ja.po
index 801a29fe7..19f422590 100644
--- a/src/translations/ja.po
+++ b/src/translations/ja.po
@@ -1383,7 +1383,7 @@ msgstr "設定..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "アクティブ・非アクティブの切り替えアクションを使用して Wii リモコンを接続する"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "デバイスの接続"
 
@@ -1648,7 +1648,7 @@ msgstr "削除"
 msgid "Delete downloaded data"
 msgstr "ダウンロード済みデータを削除"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "ファイルの削除"
@@ -2393,12 +2393,12 @@ msgstr "ライセンス上の理由で Spotify サポートは別プラグイン
 msgid "Force mono encoding"
 msgstr "モノラルエンコーディングを強制する"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "デバイスを忘れる"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2661,7 +2661,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "有効にすると、プレイリストの選択された曲をクリックすることでタグの値を直接編集できるようになります"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5089,7 +5089,7 @@ msgid ""
 "deleted:"
 msgstr "曲の削除に問題がありました。次のファイルは削除できませんでした:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5143,20 +5143,20 @@ msgstr "Clementine がこのデバイスのサポートするファイル形式
 msgid "This device supports the following file formats:"
 msgstr "このデバイスは次のファイル形式をサポートしています:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "このデバイスは適切に動作しません"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "これは MTP デバイスですが、Clementine は libmtp サポートなしでコンパイルされています。"
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "これは iPod ですが、Clementine は libgpod サポートなしでコンパイルされています。"
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5170,7 +5170,7 @@ msgstr "このオプションは設定の「動作」で変更できます。"
 msgid "This stream is for paid subscribers only"
 msgstr "このストリームは有料会員専用です"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "この種類のデバイスはサポートされていません: %1"
diff --git a/src/translations/ka.po b/src/translations/ka.po
index a663e1456..39e60ea77 100644
--- a/src/translations/ka.po
+++ b/src/translations/ka.po
@@ -1371,7 +1371,7 @@ msgstr "გამართვა..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1636,7 +1636,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "ფაილების წაშლა"
@@ -2381,12 +2381,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2649,7 +2649,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5077,7 +5077,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5131,20 +5131,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5158,7 +5158,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/kk.po b/src/translations/kk.po
index 6c6fb42b5..d410d3cbd 100644
--- a/src/translations/kk.po
+++ b/src/translations/kk.po
@@ -1369,7 +1369,7 @@ msgstr "Баптау..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1634,7 +1634,7 @@ msgstr "Өшіру"
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Файлдарды өшіру"
@@ -2379,12 +2379,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2647,7 +2647,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5075,7 +5075,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5129,20 +5129,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5156,7 +5156,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/ko.po b/src/translations/ko.po
index 91073f3d1..daaf78597 100644
--- a/src/translations/ko.po
+++ b/src/translations/ko.po
@@ -1384,7 +1384,7 @@ msgstr "설정..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "사용/중지 실행으로 Wii 리모컨 연결"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "장치 연결"
 
@@ -1649,7 +1649,7 @@ msgstr "삭제"
 msgid "Delete downloaded data"
 msgstr "다운로드된 데이터 삭제"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "파일 삭제"
@@ -2394,12 +2394,12 @@ msgstr "라이선스 문제로 인하여 Spotify 는 별도의 플러그인에
 msgid "Force mono encoding"
 msgstr "강제 모노 인코딩"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "장치를 잃어버림"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2662,7 +2662,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "이 기능을 활성화 하면 재생목록에서 음악을 선택하는 것으로 음악정보를 직접 수정할 수 있습니다."
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5090,7 +5090,7 @@ msgid ""
 "deleted:"
 msgstr "음악을 삭제하는 도중 문제가 발생하였습니다. 삭제에 실패한 파일 :"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5144,20 +5144,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr "이 장치는 다음의 파일 형식을 지원합니다:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "이 기기는 완벽하게 작동하지 않을 수 있음."
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "MTP 장치이지만 libmtp 지원을 하지 않도록 Clementine이 컴파일 되었습니다."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "iPod 장치이지만 libgpod 지원을 하지 않도록 Clementine이 컴파일 되었습니다."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5171,7 +5171,7 @@ msgstr "이 옵션은 환경설정의 \"행동\" 에서 변경할 수 있습니
 msgid "This stream is for paid subscribers only"
 msgstr "이 스트림은 유료 subscribers만 사용할 수 있습니다"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "이 장치의 형태는 지원되지 않습니다: %1"
diff --git a/src/translations/lt.po b/src/translations/lt.po
index ba125e449..5d84d2b57 100644
--- a/src/translations/lt.po
+++ b/src/translations/lt.po
@@ -1374,7 +1374,7 @@ msgstr "Konfigūruoti..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Prijungti Wii pultą naudojant aktyvuoti/deaktyvuoti veiksmą"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Prijungti įrenginį"
 
@@ -1639,7 +1639,7 @@ msgstr "Trinti"
 msgid "Delete downloaded data"
 msgstr "Naikinti atsiųstus duomenis"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Ištrinti failus"
@@ -2384,12 +2384,12 @@ msgstr "Dėl licencijavimo priežasčių Spotify palaikymas yra įjungiamas per
 msgid "Force mono encoding"
 msgstr "Įjungti tik mono kodavimą"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Pamiršti įrenginį"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2652,7 +2652,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Jei aktyvuota, spustelėjimas ant dainos grojarašyje, leis jums tiesiogiai redaguoti žymių reikšmes"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5080,7 +5080,7 @@ msgid ""
 "deleted:"
 msgstr "Iškilo problemų trinant dainas. Šie failai negalėjo būti ištrinti:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5134,20 +5134,20 @@ msgstr "Įrenginys privalo būti prijungtas ir atvertas, kad Clementine matytų
 msgid "This device supports the following file formats:"
 msgstr "Šis įrenginys palaiko šiuos formatus:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Šis įrenginys neveiks tinkamai"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Tai yra MTP įrenginys, bet jūs sukompiliavę Clementine be libmtp palaikymo."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Tai yra iPod įrenginys, bet jūs sukompiliavę Clementine be libgpod palaikymo."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5161,7 +5161,7 @@ msgstr "Ši parinktis gali būti pakeista „Elgsenos“ nuostatose"
 msgid "This stream is for paid subscribers only"
 msgstr "Šis srautas yra tik apmokamiems prenumeratoriams"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Šio tipo įrenginys yra nepalaikomas: %1"
diff --git a/src/translations/lv.po b/src/translations/lv.po
index f85f98aa6..354b1361b 100644
--- a/src/translations/lv.po
+++ b/src/translations/lv.po
@@ -1374,7 +1374,7 @@ msgstr "Konfigurēt"
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Pieslēdziet Wii tālvadību izmantojot aktivizēt/deaktivizēt"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Pieslēgt ierīci"
 
@@ -1639,7 +1639,7 @@ msgstr "Dzēst"
 msgid "Delete downloaded data"
 msgstr "Dzēst lejuplādētos datus"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Dzēst failus"
@@ -2384,12 +2384,12 @@ msgstr "Licencēšanas nolūkā Spotify atbalsts pieejams kā atsevišķs spraud
 msgid "Force mono encoding"
 msgstr "Forsēt mono kodēšanu"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Aizmirst ierīci"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2652,7 +2652,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5080,7 +5080,7 @@ msgid ""
 "deleted:"
 msgstr "Kļuda dzēšot dažas dziesmas. Nevar izdzēst sekojošos failus:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5134,20 +5134,20 @@ msgstr "Šai ierīcei jābūt pieslēgtai un atvērtai pirms Clementine var note
 msgid "This device supports the following file formats:"
 msgstr "Ierīce atbalsta šādus failu formātus:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Šī ierīce nedarbosies pareizi"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Šī ir MTP ierīce, bet jūs esat nokompilējis Clementine bez libmtp atbalsta."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Šis ir iPods, bet jūs esat nokompilējis Clementine bez libgpod atbalsta."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5161,7 +5161,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr "Šī straume ir pieejama tikai maksas lietotājiem"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Šī tipa ierīce netiek atbalstīta: %1"
diff --git a/src/translations/mk_MK.po b/src/translations/mk_MK.po
index 141aa39a5..fee528a08 100644
--- a/src/translations/mk_MK.po
+++ b/src/translations/mk_MK.po
@@ -1372,7 +1372,7 @@ msgstr "Конфигурирај..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Конектирај Wii далечински управувачи со активирај/деактивирај акција"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Конектирај уред"
 
@@ -1637,7 +1637,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr ""
@@ -2382,12 +2382,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2650,7 +2650,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5078,7 +5078,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5132,20 +5132,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5159,7 +5159,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/mr.po b/src/translations/mr.po
index 9f7eb887c..449bbf02d 100644
--- a/src/translations/mr.po
+++ b/src/translations/mr.po
@@ -1369,7 +1369,7 @@ msgstr ""
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1634,7 +1634,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr ""
@@ -2379,12 +2379,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2647,7 +2647,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5075,7 +5075,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5129,20 +5129,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5156,7 +5156,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/ms.po b/src/translations/ms.po
index 653d8cd40..5298e0a71 100644
--- a/src/translations/ms.po
+++ b/src/translations/ms.po
@@ -1372,7 +1372,7 @@ msgstr "Konfigur..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Sambung Wii Remotes melalui tindakan aktif/nyahaktif"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Sambung peranti"
 
@@ -1637,7 +1637,7 @@ msgstr "Padam"
 msgid "Delete downloaded data"
 msgstr "Padam data dimuat turun"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Padam fail"
@@ -2382,12 +2382,12 @@ msgstr "Atas sebab-sebab perlesenan sokongan Spotify berada dalam pemalam berasi
 msgid "Force mono encoding"
 msgstr "Paksa pengekodan mono"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Lupakan peranti"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2650,7 +2650,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Jika diaktifkan, mengklik lagu terpilih dalam paparan senarai main akan benarkan anda sunting nilai tag secara langsung"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5078,7 +5078,7 @@ msgid ""
 "deleted:"
 msgstr "Terdapat masalah memadam beberapa lagu. Fail berikut tidak boleh dipadam:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5132,20 +5132,20 @@ msgstr "Peranti ini mesti disambung dan dibuka sebelum Clementine boleh lihat fo
 msgid "This device supports the following file formats:"
 msgstr "Peranti ini menyokong format fail berikut:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Peranti ini tidak akan berfungsi dengan baik"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Ini ialah peranti MTP, tapi anda telah mengkompil Clementine tanpa sokongan libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Ini ialah iPod, tapi anda telah mengkompil Clementine tanpa sokongan libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5159,7 +5159,7 @@ msgstr "Pilihan ini boleh diubah dalam keutamaan \"Kelakuan\""
 msgid "This stream is for paid subscribers only"
 msgstr "Strim ini untuk pelanggan berbayar sahaja"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Peranti jenis ini tidak disokong: %1"
diff --git a/src/translations/my.po b/src/translations/my.po
index ea8b84144..9a120e721 100644
--- a/src/translations/my.po
+++ b/src/translations/my.po
@@ -1369,7 +1369,7 @@ msgstr "ပုံစံပြင်..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "သက်ဝင်လှုပ်ရှား/သက်ဝင်မလှုပ်ရှားလုပ်ဆောင်ချက်သံုး၍ဝီအဝေးထိန်းကိုချိတ်ဆက်"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "ပစ္စည်းချိတ်ဆက်"
 
@@ -1634,7 +1634,7 @@ msgstr "ပယ်ဖျက်"
 msgid "Delete downloaded data"
 msgstr "ကူးဆွဲပြီးအချက်အလက်ပယ်ဖျက်"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "ဖိုင်များပယ်ဖျက်"
@@ -2379,12 +2379,12 @@ msgstr "လိုင်စင်အကြောင်းများကြော
 msgid "Force mono encoding"
 msgstr "အတင်းမိုနိကုဒ်ပြောင်း"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "ပစ္စည်းမေ့ပြစ်"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2647,7 +2647,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5075,7 +5075,7 @@ msgid ""
 "deleted:"
 msgstr "တစ်ချို့သီချင်းများပယ်ဖျက်ရန်ပြသနာတွေ့။ အောက်ဖော်ပြပါဖိုင်များမပယ်ဖျက်နိုင်: "
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5129,20 +5129,20 @@ msgstr "မည်သည့်ပံုစံလက်ခံကြောင်း
 msgid "This device supports the following file formats:"
 msgstr "အောက်ဖော်ပြပါဖိုင်ပံုစံများကိုယခုပစ္စည်းလက်ခံ:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "ဒီပစ္စည်းသေချာစွာအလုပ်လုပ်မည်မဟုတ်"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "ယခုသည်အမ်တီပီပစ္စည်း၊ ကလီမန်တိုင်းကိုအယ်အိုင်ဘီအမ်တီပီအထောက်အကူမပါဘဲသင်အသုံးပြုထား။"
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "ယခုသည်အိုင်ပေါ့ပစ္စည်း၊ ကလီမန်တိုင်းကိုအယ်အိုင်ဘီဂျီပီအိုဒီအထောက်အကူမပါဘဲသင်အသုံးပြုထား။"
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5156,7 +5156,7 @@ msgstr "ယခုရွေးပိုင်ခွင့်ကိုလုပ်
 msgid "This stream is for paid subscribers only"
 msgstr "ယခုသီချင်းစီးကြောင်းသည်အခကြေးပေးမှာယူသူများအတွက်သာ"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "ယခုပစ္စည်းအမျိုးအစားမလက်ခံ: %1"
diff --git a/src/translations/nb.po b/src/translations/nb.po
index d54bdb64f..a6da4af92 100644
--- a/src/translations/nb.po
+++ b/src/translations/nb.po
@@ -1374,7 +1374,7 @@ msgstr "Innstillinger…"
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Koble til Wii-kontrollere med slå på/av-handlingen"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Koble til enhet"
 
@@ -1639,7 +1639,7 @@ msgstr "Slett"
 msgid "Delete downloaded data"
 msgstr "Slett nedlastet data"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Slett filer"
@@ -2384,12 +2384,12 @@ msgstr "Av lisenshensyn er Spotify-støtte et eget programtillegg."
 msgid "Force mono encoding"
 msgstr "Tving monolyd-koding"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Glem enhet"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2652,7 +2652,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Skrur på direkte redigering ved å klikke på en sang i spillelisten"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5080,7 +5080,7 @@ msgid ""
 "deleted:"
 msgstr "Fikk problemer med å slette enkelte sanger.  Følgende filer kunne ikke slettes:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5134,20 +5134,20 @@ msgstr "Enheten må kobles til og åpnes før Clementine kan se hvilke filformat
 msgid "This device supports the following file formats:"
 msgstr "Denne enheten støtter følgende filformat:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Enheten vil ikke fungere ordentlig"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Dette er en MTP-enhet, men Clementine ble kompilert uten libmtp-støtte."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Dette er en iPod, men Clementine ble kompilert uten libgpod-støtte."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5161,7 +5161,7 @@ msgstr "Dette valget kan endres under innstillinger for \"Oppførsel\""
 msgid "This stream is for paid subscribers only"
 msgstr "Denne strømmen er kun for betalende kunder"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Denne enhetstypen (%1) støttes ikke."
diff --git a/src/translations/nl.po b/src/translations/nl.po
index dcd558dca..dc48957a1 100644
--- a/src/translations/nl.po
+++ b/src/translations/nl.po
@@ -1378,7 +1378,7 @@ msgstr "Configureer..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Wii Remotes met activeer/deactiveer-actie verbinden"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Apparaat verbinden"
 
@@ -1643,7 +1643,7 @@ msgstr "Verwijderen"
 msgid "Delete downloaded data"
 msgstr "Verwijder gedownloadde gegevens"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Bestanden verwijderen"
@@ -2388,12 +2388,12 @@ msgstr "Vanwege licenties is Spotify-ondersteuning alleen via een plug-in beschi
 msgid "Force mono encoding"
 msgstr "Mono-encodering forceren"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Apparaat vergeten"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2656,7 +2656,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Indien geactiveerd, zal door het aanklikken van een geselecteerd nummer in de afspeellijst je de labelwaarde direct kunnen bewerken."
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5084,7 +5084,7 @@ msgid ""
 "deleted:"
 msgstr "Er waren problemen tijdens het verwijderen van bepaalde nummers. De volgende bestanden konden niet verwijderd worden:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5138,20 +5138,20 @@ msgstr "Dit apparaat dient verbonden te zijn en geopend vooraleer Clementine kan
 msgid "This device supports the following file formats:"
 msgstr "Dit apparaat ondsteunt de volgende bestandsformaten:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Dit apparaat zal niet correct werken"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Dit is een MTP apparaat maar u hebt Clementine gecompileerd zonder libmtp ondersteuning."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Dit is een iPod maar u hebt Clementine gecompileerd zonder libgpod ondersteuning."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5165,7 +5165,7 @@ msgstr "Deze optie kan aangepast worden bij de \"Gedrag\" instellingen"
 msgid "This stream is for paid subscribers only"
 msgstr "Deze stream is alleen voor betalende abonnees"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Dit type apparaat wordt niet ondersteund: %1"
diff --git a/src/translations/oc.po b/src/translations/oc.po
index 618c0ddae..9fd0893b1 100644
--- a/src/translations/oc.po
+++ b/src/translations/oc.po
@@ -1369,7 +1369,7 @@ msgstr ""
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1634,7 +1634,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr ""
@@ -2379,12 +2379,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2647,7 +2647,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5075,7 +5075,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5129,20 +5129,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5156,7 +5156,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/pa.po b/src/translations/pa.po
index 6c9649266..8cdf96998 100644
--- a/src/translations/pa.po
+++ b/src/translations/pa.po
@@ -1369,7 +1369,7 @@ msgstr ""
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1634,7 +1634,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr ""
@@ -2379,12 +2379,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2647,7 +2647,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5075,7 +5075,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5129,20 +5129,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5156,7 +5156,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/pl.po b/src/translations/pl.po
index ab1bf8608..cca69a478 100644
--- a/src/translations/pl.po
+++ b/src/translations/pl.po
@@ -1388,7 +1388,7 @@ msgstr "Konfiguruj..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Podłącz urządzenia Wii Remote używając akcji aktywuj/deaktywuj"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Podłącz urządzenie"
 
@@ -1653,7 +1653,7 @@ msgstr "Usuń"
 msgid "Delete downloaded data"
 msgstr "Usuń pobrane dane"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Usuń pliki"
@@ -2398,12 +2398,12 @@ msgstr "Ze względów licencyjnych Spotify obsługiwany jest przez oddzielny plu
 msgid "Force mono encoding"
 msgstr "Wymuś kodowanie mono"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Zapomnij o urządzeniu"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2666,7 +2666,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Jeżeli zaznaczone, kliknięcie zaznaczonej piosenki na liście odtwarzania pozwoli na bezpośrednią edycje znaczników"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5094,7 +5094,7 @@ msgid ""
 "deleted:"
 msgstr "Wystąpiły problemy podczas kasowania utworów. Nie można było skasować następujących plików:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5148,20 +5148,20 @@ msgstr "To urządzenie musi być podłączone i otwarte zanim Clementine zobaczy
 msgid "This device supports the following file formats:"
 msgstr "To urządzenie obsługuje następujące formaty plików:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "To urządzenie nie będzie działać prawidłowo"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "To jest urządzenie MTP, ale skompilowałeś Clementine bez obsługi libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "To jest urządzenie iPod, ale skompilowałeś Clementine bez obsługi libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5175,7 +5175,7 @@ msgstr "Opcja ta może zostać zmieniona w preferencjach \"Trybu\""
 msgid "This stream is for paid subscribers only"
 msgstr "Strumień wyłącznie dla płacących subskrybentów"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Ten typ urządzenia nie jest obsługiwany: %1"
diff --git a/src/translations/pt.po b/src/translations/pt.po
index 71549feb6..12ba0854a 100644
--- a/src/translations/pt.po
+++ b/src/translations/pt.po
@@ -1376,7 +1376,7 @@ msgstr "Configurar..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Ligar a Wii Remotes utilizando a ação ativar/desativar"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Ligar dispositivo"
 
@@ -1641,7 +1641,7 @@ msgstr "Apagar"
 msgid "Delete downloaded data"
 msgstr "Apagar dados descarregados"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Apagar ficheiros"
@@ -2386,12 +2386,12 @@ msgstr "Devido à sua licença, o suplemento do Spotify é disponibilizado separ
 msgid "Force mono encoding"
 msgstr "Forçar codificação mono"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Ignorar dispositivo"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2654,7 +2654,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Se ativar esta opção, ao clicar numa faixa da lista de reprodução, pode editar as etiquetas diretamente"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5082,7 +5082,7 @@ msgid ""
 "deleted:"
 msgstr "Ocorreram alguns problemas ao apagar as faixas. Os seguintes ficheiros não foram apagados:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5136,20 +5136,20 @@ msgstr "Este dispositivo deve estar ligado e aberto, para que o Clementine verif
 msgid "This device supports the following file formats:"
 msgstr "Este dispositivo tem suporte aos seguintes formatos:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "O dispositivo não vai funcionar corretamente"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Este é um dispositivo MTP, mas o Clementine foi compilado sem suporte a libmtp"
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Este é um dispositivo iPod, mas o Clementine foi compilado sem suporte a libgpod"
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5163,7 +5163,7 @@ msgstr "Esta opção pode ser alterada nas preferências"
 msgid "This stream is for paid subscribers only"
 msgstr "Só os assinantes têm acesso a esta emissão"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Este tipo de dispositivo não é suportado: %1"
diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po
index 92af88e8a..518887003 100644
--- a/src/translations/pt_BR.po
+++ b/src/translations/pt_BR.po
@@ -1381,7 +1381,7 @@ msgstr "Configurar..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Conectar controles remotos do Wii usando ação de ativar/desativar"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Conectar dispositivo"
 
@@ -1646,7 +1646,7 @@ msgstr "Apagar"
 msgid "Delete downloaded data"
 msgstr "Apagar dados baixados"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Excluir arquivos"
@@ -2391,12 +2391,12 @@ msgstr "Por motivos de licenciamento, o suporte ao Spotify está em um plugin se
 msgid "Force mono encoding"
 msgstr "Forçar codificação em mono"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Esquecer dispositivo"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2659,7 +2659,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Caso ativado, ao clicar numa música na lista de reprodução, você poderá editar diretamente os valores de sua etiqueta."
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5087,7 +5087,7 @@ msgid ""
 "deleted:"
 msgstr "Houve problemas ao deletar algumas músicas. Os seguintes arquivos não puderam ser deletados:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5141,20 +5141,20 @@ msgstr "O dispositivo deve estar conectado e aberto antes que o Clementine possa
 msgid "This device supports the following file formats:"
 msgstr "Este dispositivo suporta os seguintes formatos de arquivo:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Este dispositivo não funcionará corretamente"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Este é um dispositivo MTP, mas você compilou o Clementine sem suporte a libmtp"
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Este é um iPod, mas você compilou o Clementine sem suporte a libgpod"
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5168,7 +5168,7 @@ msgstr "Essa opção pode ser alterada nas preferências de \"Comportamento\""
 msgid "This stream is for paid subscribers only"
 msgstr "Este canal é apenas para assinantes"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Este tipo de dispositivo não é suportado: %1"
diff --git a/src/translations/ro.po b/src/translations/ro.po
index 071342f44..9266f0255 100644
--- a/src/translations/ro.po
+++ b/src/translations/ro.po
@@ -1381,7 +1381,7 @@ msgstr "Configurați..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Conectează Wii Remote folosind acțiunea activ/inactiv"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Conectează dispozitiv"
 
@@ -1646,7 +1646,7 @@ msgstr "Șterge"
 msgid "Delete downloaded data"
 msgstr "Șterge datele descărcate"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Șterge fișiere"
@@ -2391,12 +2391,12 @@ msgstr "Din motive de licență, suportul pentru Spotify este într-un modul sep
 msgid "Force mono encoding"
 msgstr "Forțează codarea mono"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Uită dispozitivul"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2659,7 +2659,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Dacă această opțiune este activă, un clic pe melodia selectată în lista de redare va permite editarea directă a valorii etichetei"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5087,7 +5087,7 @@ msgid ""
 "deleted:"
 msgstr "A fost o problemă la ștergerea unor melodii. Următoarele fișiere nu pot fi șterse:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5141,20 +5141,20 @@ msgstr "Dispozitivul trebuie conectat și deschis înainte ca Clementine să poa
 msgid "This device supports the following file formats:"
 msgstr "Dispozitivul suportă următoarele formate de fișiere:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Acest dispozitiv nu funcționează corespunzător"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Acesta este un dispozitiv MTP, dar ați compilat Clementine fără suport libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Acesta este un iPod, dar ați compilat Clementine fără suport libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5168,7 +5168,7 @@ msgstr "Această opțiune poate fi modificată în „Comportament”"
 msgid "This stream is for paid subscribers only"
 msgstr "Acest flux este numai pentru abonații cu plată"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Acest tip de dispozitiv nu este suportat: %1"
diff --git a/src/translations/ru.po b/src/translations/ru.po
index 6279d5e37..e01481f38 100644
--- a/src/translations/ru.po
+++ b/src/translations/ru.po
@@ -1398,7 +1398,7 @@ msgstr "Настроить…"
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Подключать пульт Wii при активации/деактивации"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Подключить носитель"
 
@@ -1663,7 +1663,7 @@ msgstr "Удалить"
 msgid "Delete downloaded data"
 msgstr "Удалить загруженные данные"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Удалить файлы"
@@ -2408,12 +2408,12 @@ msgstr "По лицензионным соображениям поддержк
 msgid "Force mono encoding"
 msgstr "Принудительное кодирование в моно"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "«Забыть» носитель"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2676,7 +2676,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Если включить, то клик по выбранной песне в плейлисте позволит редактировать тег напрямую"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5104,7 +5104,7 @@ msgid ""
 "deleted:"
 msgstr "В процессе удаления некоторых композиций возникли проблемы. Следующие файлы не могут быть удалены:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5158,20 +5158,20 @@ msgstr "Устройство должно быть подключено и от
 msgid "This device supports the following file formats:"
 msgstr "Это устройство поддерживает следующие форматы:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Это устройство не будет работать правильно"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Это MTP устройство, а ваша версия Clementine скомпилирована без поддержки libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Это iPod, а вы скомпилировали Clementine без поддержки libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5185,7 +5185,7 @@ msgstr "Эта опция может быть изменена в настрой
 msgid "This stream is for paid subscribers only"
 msgstr "Поток только для платных подписчиков"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Не поддерживаемый тип устройства: %1"
diff --git a/src/translations/si_LK.po b/src/translations/si_LK.po
index e87e28c40..374ac0b68 100644
--- a/src/translations/si_LK.po
+++ b/src/translations/si_LK.po
@@ -1368,7 +1368,7 @@ msgstr ""
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1633,7 +1633,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr ""
@@ -2378,12 +2378,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2646,7 +2646,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5074,7 +5074,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5128,20 +5128,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5155,7 +5155,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/sk.po b/src/translations/sk.po
index d040c3a34..87793dabc 100644
--- a/src/translations/sk.po
+++ b/src/translations/sk.po
@@ -1375,7 +1375,7 @@ msgstr "Nastaviť..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Pripojiť Wii diaľkové použitím činnosti aktivovať/deaktivovať"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Pripojiť zariadenie"
 
@@ -1640,7 +1640,7 @@ msgstr "Vymazať"
 msgid "Delete downloaded data"
 msgstr "Vymazať stiahnuté dáta"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Vymazať súbory"
@@ -2385,12 +2385,12 @@ msgstr "Kvôli licenčným dôvodom je podpora Spotify v oddelenom plugine."
 msgid "Force mono encoding"
 msgstr "Vynútiť mono enkódovanie"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Zabudnúť na zariadenie"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2653,7 +2653,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Ak je aktivované, kliknutím na vybratú pieseň v playliste priamo upravíte tagy"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5081,7 +5081,7 @@ msgid ""
 "deleted:"
 msgstr "Nastal problém pri vymazávaní niektorých piesní. Nasledujúce súbory sa nedali vymazať:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5135,20 +5135,20 @@ msgstr "Toto zariadenie musí byť najprv pripojené a otvorené, až potom mô
 msgid "This device supports the following file formats:"
 msgstr "Toto zariadenie podporuje nasledujúce formáty súborov:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Toto zariadenie nebude pracovať správne"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Toto síce je MTP zariadenie, ale skompilovali ste Clementine bez podpory libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Toto síce je iPod, ale skompilovali ste Clementine bez podpory libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5162,7 +5162,7 @@ msgstr "Táto možnosť sa dá zmeniť v nastaveniach, v časti Správanie"
 msgid "This stream is for paid subscribers only"
 msgstr "Tento stream je len pre platiacich predplatiteľov"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Tento typ zariadení nieje podporovaný: %1"
diff --git a/src/translations/sl.po b/src/translations/sl.po
index c08aa78e1..3688cb703 100644
--- a/src/translations/sl.po
+++ b/src/translations/sl.po
@@ -1375,7 +1375,7 @@ msgstr "Nastavi ..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Povežite Wii Remotes z uporabo dejanja omogoči/onemogoči"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Povežite napravo"
 
@@ -1640,7 +1640,7 @@ msgstr "Izbriši"
 msgid "Delete downloaded data"
 msgstr "Izbriši prejete podatke"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Izbriši datoteke"
@@ -2385,12 +2385,12 @@ msgstr "Zaradi licence je podpora Spotify v ločenem vstavku."
 msgid "Force mono encoding"
 msgstr "Vsili mono kodiranje"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Pozabi napravo"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2653,7 +2653,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Če je omogočeno, bo klik na izbrano skladbo v pogledu seznama predvajanja omogočil neposredno urejanje vrednosti oznake"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5081,7 +5081,7 @@ msgid ""
 "deleted:"
 msgstr "Med brisanjem nekaterih skladb so nastopile težave. Naslednjih datotek ni bilo mogoče izbrisati:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5135,20 +5135,20 @@ msgstr "Ta naprava mora biti povezana in odprta, preden lahko Clementine ugotovi
 msgid "This device supports the following file formats:"
 msgstr "Ta naprava podpira naslednje vrste datotek:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Ta naprava ne bo delovala pravilno"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "To je naprava MTP, Clementine pa je preveden brez podpore libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "To je naprava iPod, Clementine pa je preveden brez podpore libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5162,7 +5162,7 @@ msgstr "To možnost lahko spremenite v \"Obnašanje\""
 msgid "This stream is for paid subscribers only"
 msgstr "Ta pretok je le za plačane naročnike"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Ta vrsta naprave ni podprta: %1"
diff --git a/src/translations/sr.po b/src/translations/sr.po
index 1b696b035..56a1376ae 100644
--- a/src/translations/sr.po
+++ b/src/translations/sr.po
@@ -1372,7 +1372,7 @@ msgstr "Подеси..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Повежи Wii даљинске користећи радње укључено/искључено"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Повежи уређај"
 
@@ -1637,7 +1637,7 @@ msgstr "Обриши"
 msgid "Delete downloaded data"
 msgstr "Обриши преузете податке"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Брисање фајлова"
@@ -2382,12 +2382,12 @@ msgstr "Из разлога лиценцирања подршка за Спот
 msgid "Force mono encoding"
 msgstr "Присили моно кодирање"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Заборави уређај"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2650,7 +2650,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Дозвољава уређивање ознаке директно у приказу листе нумера кликом на песму"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5078,7 +5078,7 @@ msgid ""
 "deleted:"
 msgstr "Било је проблема при брисању неких песама.  Следећи фајлови нису обрисани:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5132,20 +5132,20 @@ msgstr "Овај уређај мора бити повезан и отворен
 msgid "This device supports the following file formats:"
 msgstr "Овај уређај подржава следеће формате фајлова:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Овај уређај неће радити исправно"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Ово је МТП уређај, али ви сте компиловали Клементину без libmtp подршке."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Ово је Ајпод, али ви сте компиловали Клементину без libgpod подршке."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5159,7 +5159,7 @@ msgstr "Ову опцију можете изменити у поставкам
 msgid "This stream is for paid subscribers only"
 msgstr "Овај ток је само за претплатнике"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Овај тип уређаја није подржан: %1"
diff --git a/src/translations/sr@latin.po b/src/translations/sr@latin.po
index 8f877d094..7aaedd6b6 100644
--- a/src/translations/sr@latin.po
+++ b/src/translations/sr@latin.po
@@ -1372,7 +1372,7 @@ msgstr "Podesi..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Poveži Wii daljinske koristeći radnje uključeno/isključeno"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Poveži uređaj"
 
@@ -1637,7 +1637,7 @@ msgstr "Obriši"
 msgid "Delete downloaded data"
 msgstr "Obriši preuzete podatke"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Brisanje fajlova"
@@ -2382,12 +2382,12 @@ msgstr "Iz razloga licenciranja podrška za Spotifaj je u odvojenom priključku.
 msgid "Force mono encoding"
 msgstr "Prisili mono kodiranje"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Zaboravi uređaj"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2650,7 +2650,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Dozvoljava uređivanje oznake direktno u prikazu liste numera klikom na pesmu"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5078,7 +5078,7 @@ msgid ""
 "deleted:"
 msgstr "Bilo je problema pri brisanju nekih pesama.  Sledeći fajlovi nisu obrisani:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5132,20 +5132,20 @@ msgstr "Ovaj uređaj mora biti povezan i otvoren pre nego što Klementina može
 msgid "This device supports the following file formats:"
 msgstr "Ovaj uređaj podržava sledeće formate fajlova:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Ovaj uređaj neće raditi ispravno"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Ovo je MTP uređaj, ali vi ste kompilovali Klementinu bez libmtp podrške."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Ovo je Ajpod, ali vi ste kompilovali Klementinu bez libgpod podrške."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5159,7 +5159,7 @@ msgstr "Ovu opciju možete izmeniti u postavkama „Ponašanja“"
 msgid "This stream is for paid subscribers only"
 msgstr "Ovaj tok je samo za pretplatnike"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Ovaj tip uređaja nije podržan: %1"
diff --git a/src/translations/sv.po b/src/translations/sv.po
index 4a254af8a..c10500b51 100644
--- a/src/translations/sv.po
+++ b/src/translations/sv.po
@@ -1392,7 +1392,7 @@ msgstr "Konfigurera..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Anslut Wii-kontroller med åtgärden aktivera/inaktivera"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Anslut enhet"
 
@@ -1657,7 +1657,7 @@ msgstr "Ta bort"
 msgid "Delete downloaded data"
 msgstr "Ta bort nedladdad data"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Ta bort filer"
@@ -2402,12 +2402,12 @@ msgstr "Av licensskäl finns Spotify-stöd i ett separat insticksprogram."
 msgid "Force mono encoding"
 msgstr "Tvinga enkanalskodning"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Glöm enhet"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2670,7 +2670,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Om aktiverad så kan du klicka på en markerad sång i spellistan för att ändra taggvärdet direkt"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5098,7 +5098,7 @@ msgid ""
 "deleted:"
 msgstr "Fel uppstod vid borttagning av några låtar. Följande filer kunde inte kopieras:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5152,20 +5152,20 @@ msgstr "Denna enhet måste vara ansluten och öppnad före Clementine kan se vil
 msgid "This device supports the following file formats:"
 msgstr "Denna enhet stöder följande filformat:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Denna enhet kommer inte att fungera ordentligt"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Detta är en MTP-enhet, men du kompilerade Clementine utan stöd av libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Detta är en iPod, men du kompilerade Clementine utan stöd av libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5179,7 +5179,7 @@ msgstr "Detta alternativ kan ändras i \"Beteende\"  i Inställningar"
 msgid "This stream is for paid subscribers only"
 msgstr "Denna ström är endast för betalkunder"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Denna typ av enhet är inte stödd: %1"
diff --git a/src/translations/te.po b/src/translations/te.po
index 31b527712..a2bfca83a 100644
--- a/src/translations/te.po
+++ b/src/translations/te.po
@@ -1369,7 +1369,7 @@ msgstr ""
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr ""
 
@@ -1634,7 +1634,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr ""
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr ""
@@ -2379,12 +2379,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2647,7 +2647,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5075,7 +5075,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5129,20 +5129,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5156,7 +5156,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/tr.po b/src/translations/tr.po
index e47eb6fd8..50a8ed253 100644
--- a/src/translations/tr.po
+++ b/src/translations/tr.po
@@ -1388,7 +1388,7 @@ msgstr "Yapılandır..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Etkinleştir/devre dışı bırak eylemiyle Wii Kumandalarına bağlan"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Aygıtı bağla"
 
@@ -1653,7 +1653,7 @@ msgstr "Sil"
 msgid "Delete downloaded data"
 msgstr "İndirilmiş veriyi sil"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Dosyaları sil"
@@ -2398,12 +2398,12 @@ msgstr "Lisans sebepleri dolayısıyla Spotify desteği ayrı bir eklentidir."
 msgid "Force mono encoding"
 msgstr "Mono kodlamaya zorla"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Aygıtı unut"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2666,7 +2666,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Etkinleştirildiğinde, çalma listesi içerisinde bir şarkı seçmek doğrudan etiket değerini düzenlemenizi sağlayacak"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5094,7 +5094,7 @@ msgid ""
 "deleted:"
 msgstr "Bazı şarkılar silinirken hata oluştu. Şu dosyalar silinemedi:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5148,20 +5148,20 @@ msgstr "Bu aygıt Clementine başlamadan önce bağlanmalı ve açılmalıdır a
 msgid "This device supports the following file formats:"
 msgstr "Bu aygıt aşağıdaki dosya biçimlerini destekler:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Bu aygıt düzgün çalışmayacak"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Bu bir MTP aygıtı fakat Clementine libmtp desteği olmadan derlenmiş."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Bu bir iPod fakat Clementine libgpod desteği olmadan derlenmiş."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5175,7 +5175,7 @@ msgstr "Bu seçenek \"Davranış\" tercihlerinden değiştirilebilir"
 msgid "This stream is for paid subscribers only"
 msgstr "Bu yayın sadece abone olan kullanıcılar içindir"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Bu tür bir aygıt desteklenmiyor: %1"
diff --git a/src/translations/tr_TR.po b/src/translations/tr_TR.po
index 250b6fabc..3162411ab 100644
--- a/src/translations/tr_TR.po
+++ b/src/translations/tr_TR.po
@@ -1405,7 +1405,7 @@ msgstr "Yapılandır..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Etkinleştir/devre dışı bırak eylemiyle Wii Kumandalarına bağlan"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Aygıtı bağla"
 
@@ -1670,7 +1670,7 @@ msgstr "Sil"
 msgid "Delete downloaded data"
 msgstr "İndirilmiş veriyi sil"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Dosyaları sil"
@@ -2415,12 +2415,12 @@ msgstr "Lisans sebepleri dolayısıyla Spotify desteği ayrı bir eklentidir."
 msgid "Force mono encoding"
 msgstr "Mono kodlamaya zorla"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Aygıtı unut"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2683,7 +2683,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Etkinleştirildiğinde, çalma listesi içerisinde bir şarkı seçmek doğrudan etiket değerini düzenlemenizi sağlayacak"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5111,7 +5111,7 @@ msgid ""
 "deleted:"
 msgstr "Bazı şarkılar silinirken hata oluştu. Şu dosyalar silinemedi:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5165,20 +5165,20 @@ msgstr "Bu aygıt Clementine başlamadan önce bağlanmalı ve açılmalıdır a
 msgid "This device supports the following file formats:"
 msgstr "Bu aygıt aşağıdaki dosya biçimlerini destekler:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Bu aygıt düzgün çalışmayacak"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Bu bir MTP aygıtı fakat Clementine libmtp desteği olmadan derlenmiş."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Bu bir iPod fakat Clementine libgpod desteği olmadan derlenmiş."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5192,7 +5192,7 @@ msgstr "Bu seçenek \"Davranış\" tercihlerinden değiştirilebilir"
 msgid "This stream is for paid subscribers only"
 msgstr "Bu yayın sadece abone olan kullanıcılar içindir"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Bu tür bir aygıt desteklenmiyor: %1"
diff --git a/src/translations/uk.po b/src/translations/uk.po
index 05c215854..1fd26332e 100644
--- a/src/translations/uk.po
+++ b/src/translations/uk.po
@@ -1371,7 +1371,7 @@ msgstr "Налаштувати…"
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Під’єднати Wii Remotes через дію активувати/деактивувати"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "З’єднати пристрій"
 
@@ -1636,7 +1636,7 @@ msgstr "Вилучити"
 msgid "Delete downloaded data"
 msgstr "Видалити завантажені дані"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Вилучити файли"
@@ -2381,12 +2381,12 @@ msgstr "З підстав ліцензування, для підтримки Sp
 msgid "Force mono encoding"
 msgstr "Примусове моно-кодування"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Забути пристрій"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2649,7 +2649,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Якщо буде позначено, ви зможете редагувати значення мітки композиції у списку відтворення простим клацанням на відповідному записі."
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5077,7 +5077,7 @@ msgid ""
 "deleted:"
 msgstr "Виникли проблеми вилучення деяких композицій.  Не вдалось вилучити такі:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5131,20 +5131,20 @@ msgstr "Потрібно під’єднати та відкрити прист
 msgid "This device supports the following file formats:"
 msgstr "Цей пристрій підтримує такі формати файлів:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Цей пристрій не працюватиме як слід"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Це пристрій MTP, але ви скомпілювали Clementine без підтримки libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Це пристрій iPod, але ви скомпілювали Clementine без підтримки libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5158,7 +5158,7 @@ msgstr "Значення цього параметра можна змінити
 msgid "This stream is for paid subscribers only"
 msgstr "Цей потік лише для платних передплатників"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Цей тип пристрою не підтримується: %1"
diff --git a/src/translations/uz.po b/src/translations/uz.po
index d4e30fdb4..8298b3800 100644
--- a/src/translations/uz.po
+++ b/src/translations/uz.po
@@ -1370,7 +1370,7 @@ msgstr "Moslash..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr ""
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Uskunaga ulanish"
 
@@ -1635,7 +1635,7 @@ msgstr "O'chirish"
 msgid "Delete downloaded data"
 msgstr "Yuklab olingan ma'lumotni o'chirish"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Fayllarni o'chirish"
@@ -2380,12 +2380,12 @@ msgstr ""
 msgid "Force mono encoding"
 msgstr ""
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr ""
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2648,7 +2648,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5076,7 +5076,7 @@ msgid ""
 "deleted:"
 msgstr ""
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5130,20 +5130,20 @@ msgstr ""
 msgid "This device supports the following file formats:"
 msgstr ""
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr ""
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr ""
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr ""
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5157,7 +5157,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr ""
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr ""
diff --git a/src/translations/vi.po b/src/translations/vi.po
index c441f9406..1e287578a 100644
--- a/src/translations/vi.po
+++ b/src/translations/vi.po
@@ -1375,7 +1375,7 @@ msgstr "Cấu hình..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "Kết nối tay cầm Wii sử dụng thao tác kích hoạt/vô hiệu"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "Kết nối thiết bị"
 
@@ -1640,7 +1640,7 @@ msgstr "Xóa"
 msgid "Delete downloaded data"
 msgstr "Xóa dữ liệu đã tải về"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "Xóa các tập tin"
@@ -2385,12 +2385,12 @@ msgstr "Vì lí do giấy phép nên Spotify được hỗ trợ thông qua mộ
 msgid "Force mono encoding"
 msgstr "Buộc mã hóa đơn kênh"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "Quên thiết bị"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2653,7 +2653,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "Nếu bật, bạn có thể sửa thông tin bài hát trực tiếp bằng cách nhấn vào bài đã chọn trong danh sách"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5081,7 +5081,7 @@ msgid ""
 "deleted:"
 msgstr "Có vấn đề khi xóa một số bài hát. Không thể xóa các tập tin sau đây:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5135,20 +5135,20 @@ msgstr "Thiết bị này phải được kết nối và mở trước để Cl
 msgid "This device supports the following file formats:"
 msgstr "Thiết bị này hỗ trợ các định dạng sau đây:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "Thiết bị này sẽ không làm việc đúng cách"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "Đây là thiết bị MTP, nhưng bạn đã biên dịch Clementine mà không có hỗ trợ libmtp."
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "Đây là một chiếc iPod, nhưng bạn đã biên dịch Clementine mà không có hỗ trợ libgpod."
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5162,7 +5162,7 @@ msgstr "Tùy chọn này có thể thay đổi trong mục \"Hành vi\""
 msgid "This stream is for paid subscribers only"
 msgstr "Luồng này chỉ dành cho người trả phí"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "Loại thiết bị này không được hỗ trợ: %1"
diff --git a/src/translations/zh_CN.po b/src/translations/zh_CN.po
index d708bbfaa..4a76c6bf3 100644
--- a/src/translations/zh_CN.po
+++ b/src/translations/zh_CN.po
@@ -1382,7 +1382,7 @@ msgstr "配置..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "连接 Wii 遥控器"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "连接设备"
 
@@ -1647,7 +1647,7 @@ msgstr "删除"
 msgid "Delete downloaded data"
 msgstr "删除已下载的数据"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "删除文件"
@@ -2392,12 +2392,12 @@ msgstr "由于许可证原因 Spotify 支持位于单独的插件中。"
 msgid "Force mono encoding"
 msgstr "强制单声道编码"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "忘记设备"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2660,7 +2660,7 @@ msgid ""
 "edit the tag value directly"
 msgstr "如果选择启用，在播放列表中点击一个已选择的歌曲则会直接打开标签编辑"
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5088,7 +5088,7 @@ msgid ""
 "deleted:"
 msgstr "删除歌曲出错。以下歌曲无法删除:"
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5142,20 +5142,20 @@ msgstr "此设备必须在连接并打开之前，Clementine可以检测它支
 msgid "This device supports the following file formats:"
 msgstr "该设备支持以下文件格式:"
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "这个设备将不会正常工作"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "这个一部 MTP 设备，但是您可以通过 Clementine 来编辑而无需 libmtp 的支持。"
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "这是 iPod 设备，但 Clementine 编译时未包含 libgpod 支持。"
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5169,7 +5169,7 @@ msgstr "这些选项可以在“行为”设置中修改"
 msgid "This stream is for paid subscribers only"
 msgstr "该流媒体只有付费用户才能收听"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "这种设备不被支持： %1"
diff --git a/src/translations/zh_TW.po b/src/translations/zh_TW.po
index c8b10adb7..436d4dc48 100644
--- a/src/translations/zh_TW.po
+++ b/src/translations/zh_TW.po
@@ -1372,7 +1372,7 @@ msgstr "設定..."
 msgid "Connect Wii Remotes using active/deactive action"
 msgstr "連結 Wii 遙控器可以使用「作用」/「取消作用」的行動"
 
-#: devices/devicemanager.cpp:330 devices/devicemanager.cpp:335
+#: devices/devicemanager.cpp:234 devices/devicemanager.cpp:239
 msgid "Connect device"
 msgstr "連接裝置"
 
@@ -1637,7 +1637,7 @@ msgstr ""
 msgid "Delete downloaded data"
 msgstr "刪除下載的資料"
 
-#: devices/deviceview.cpp:408 library/libraryview.cpp:678
+#: devices/deviceview.cpp:404 library/libraryview.cpp:678
 #: ui/mainwindow.cpp:2473 widgets/fileview.cpp:188
 msgid "Delete files"
 msgstr "刪除檔案"
@@ -2382,12 +2382,12 @@ msgstr "由於許可證的原因，Spotify 支援是在一個獨立的插件中
 msgid "Force mono encoding"
 msgstr "強制單聲道編碼"
 
-#: devices/deviceview.cpp:208 devices/deviceview.cpp:334
-#: devices/deviceview.cpp:339
+#: devices/deviceview.cpp:208 devices/deviceview.cpp:330
+#: devices/deviceview.cpp:335
 msgid "Forget device"
 msgstr "忘記裝置"
 
-#: devices/deviceview.cpp:335
+#: devices/deviceview.cpp:331
 msgid ""
 "Forgetting a device will remove it from this list and Clementine will have "
 "to rescan all the songs again next time you connect it."
@@ -2650,7 +2650,7 @@ msgid ""
 "edit the tag value directly"
 msgstr ""
 
-#: devices/devicemanager.cpp:575 devices/devicemanager.cpp:586
+#: devices/devicemanager.cpp:481 devices/devicemanager.cpp:492
 msgid ""
 "If you continue, this device will work slowly and songs copied to it may not"
 " work."
@@ -5078,7 +5078,7 @@ msgid ""
 "deleted:"
 msgstr "刪除歌曲時發生問題，以下檔案將無法刪除："
 
-#: devices/deviceview.cpp:409
+#: devices/deviceview.cpp:405
 msgid ""
 "These files will be deleted from the device, are you sure you want to "
 "continue?"
@@ -5132,20 +5132,20 @@ msgstr "裝置必須在 Clementine 發現可支援的檔案格式前連接並開
 msgid "This device supports the following file formats:"
 msgstr "裝置支援以下檔案格式："
 
-#: devices/devicemanager.cpp:572 devices/devicemanager.cpp:583
+#: devices/devicemanager.cpp:478 devices/devicemanager.cpp:489
 msgid "This device will not work properly"
 msgstr "裝置將無法正常運作"
 
-#: devices/devicemanager.cpp:573
+#: devices/devicemanager.cpp:479
 msgid ""
 "This is an MTP device, but you compiled Clementine without libmtp support."
 msgstr "這是一個 MTP 裝置，但您編譯的 Clementine 卻為包含 libmtp 支援。"
 
-#: devices/devicemanager.cpp:584
+#: devices/devicemanager.cpp:490
 msgid "This is an iPod, but you compiled Clementine without libgpod support."
 msgstr "這是一個 iPod，但是您編譯 Clementine 卻未包含 libgpod 支援。"
 
-#: devices/devicemanager.cpp:331
+#: devices/devicemanager.cpp:235
 msgid ""
 "This is the first time you have connected this device.  Clementine will now "
 "scan the device to find music files - this may take some time."
@@ -5159,7 +5159,7 @@ msgstr ""
 msgid "This stream is for paid subscribers only"
 msgstr "此串流音樂是只針對付費用戶"
 
-#: devices/devicemanager.cpp:600
+#: devices/devicemanager.cpp:506
 #, qt-format
 msgid "This type of device is not supported: %1"
 msgstr "這種裝置不被支援： %1"