renamed udisks2 plugin to udisks

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

53 files changed, 195 insertions, 195 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cbcd8ba6..fe0b4cb8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,7 +219,7 @@ PRINT_SUMMARY ("Tray support .........................." USE_STATICON 1)
 PRINT_SUMMARY ("Notifier support ......................" USE_NOTIFIER 1)
 PRINT_SUMMARY ("Lyrics support ........................" USE_LYRICS 1)
 PRINT_SUMMARY ("HAL support ..........................." USE_HAL Qt5DBus_FOUND)
-PRINT_SUMMARY ("UDisks2 support ......................." USE_UDISKS2 Qt5DBus_FOUND)
+PRINT_SUMMARY ("UDisks support ........................" USE_UDISKS Qt5DBus_FOUND)
 PRINT_SUMMARY ("Global hotkey support ................." USE_HOTKEY X11_FOUND AND XCB_H_FOUND AND Qt5X11Extras_FOUND)
 PRINT_SUMMARY ("GNOME/Cinnamon hotkey support ........." USE_GNOMEHOTKEY Qt5DBus_FOUND)
 PRINT_SUMMARY ("File operations ......................." USE_FILEOPS 1)
diff --git a/README b/README
index 45e0248b8..8b615214d 100644
--- a/README
+++ b/README
@@ -143,7 +143,7 @@ Available options:
 - USE_SOXR, USE_BS2B, USE_LADSPA, USE_CROSSFADE, USE_STEREO, USE_FILEWRITER, USE_MONOTOSTEREO (effects);
 - USE_ANALYZER, USE_PROJECTM (visualization);
 - USE_MPRIS, USE_SCROBBLER, USE_LISTENBRAINZ, USE_STATICON, USE_NOTIFIER, USE_LYRICS, USE_HAL, USE_HOTKEY, USE_FILEOPS,
-  USE_COVER, USE_KDENOTIFY, USE_UDISKS2, USE_CONVERTER, USE_SB, USE_RGSCAN, USE_TRACKCHANGE, USE_COPYPASTE,
+  USE_COVER, USE_KDENOTIFY, USE_UDISKS, USE_CONVERTER, USE_SB, USE_RGSCAN, USE_TRACKCHANGE, USE_COPYPASTE,
   USE_GNOMEHOTKEY, USE_LIBRARY (general plugins);
 - USE_QMMP_DIALOG, USE_TWO_PANEL_DIALOG (file dialogs);
 - USE_ENCA (automatic charset detection);
@@ -165,9 +165,9 @@ OSS3 support.
 OSS3 plugin is deprecated and disabled by default.
 To enable it, run 'cmake ./ -DUSE_OSS:BOOL=TRUE' before compilation.
 
-UDisks2 support and FreeBSD.
-Under FreeBSD you are able to use UDisks2 plugin. Also, you should install port sysutils/bsdisks.
-Bsdisks is an implementation of UDisks2 service for FreeBSD.
+UDisks support and FreeBSD.
+Under FreeBSD you are able to use UDisks plugin. Also, you should install port sysutils/bsdisks.
+Bsdisks is an implementation of UDisks service for FreeBSD.
 
 In some cases, you can use qmake for building and installation.
 
diff --git a/README.RUS b/README.RUS
index 0be1b13d7..91988f5c5 100644
--- a/README.RUS
+++ b/README.RUS
@@ -141,7 +141,7 @@ cmake ./ -DUSE_JACK:BOOL=FALSE
 - USE_SOXR, USE_BS2B, USE_LADSPA, USE_CROSSFADE, USE_STEREO, USE_FILEWRITER, USE_MONOTOSTEREO (эффекты);
 - USE_ANALYZER, USE_PROJECTM (визуализация);
 - USE_MPRIS, USE_SCROBBLER, USE_LISTENBRAINZ, USE_STATICON, USE_NOTIFIER, USE_LYRICS, USE_HAL, USE_HOTKEY, USE_FILEOPS,
-  USE_COVER, USE_KDENOTIFY, USE_UDISKS2, USE_CONVERTER, USE_RGSCAN, USE_SB, USE_TRACKCHANGE, USE_COPYPASTE,
+  USE_COVER, USE_KDENOTIFY, USE_UDISKS, USE_CONVERTER, USE_RGSCAN, USE_SB, USE_TRACKCHANGE, USE_COPYPASTE,
   USE_GNOMEHOTKEY, USE_LIBRARY (модули общего назначения);
 - USE_QMMP_DIALOG, USE_TWO_PANEL_DIALOG (файловые диалоги);
 - USE_ENCA (автоматическое определение кодировки);
@@ -163,9 +163,9 @@ https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
 Модуль OSS3 устарел и отключён по умолчанию.
 Для его включения выполните 'cmake ./ -DUSE_OSS:BOOL=TRUE' перед сборкой.
 
-Поддержка UDisks2 и FreeBSD.
-Под FreeBSD есть возможность использовать модуль Udisks2. Для этого вы также должны установить порт
-sysutils/bsdisks. Bsdisks является реализацией сервиса UDisks2 для FreeBSD.
+Поддержка UDisks и FreeBSD.
+Под FreeBSD есть возможность использовать модуль Udisks. Для этого вы также должны установить порт
+sysutils/bsdisks. Bsdisks является реализацией сервиса UDisks для FreeBSD.
 
 В некоторых случаях вы можете использовать qmake для сборки и установки.
 
diff --git a/README.UKR b/README.UKR
index 36e021b79..004f232d6 100644
--- a/README.UKR
+++ b/README.UKR
@@ -126,7 +126,7 @@ cmake ./ -DUSE_JACK:BOOL=FALSE
 - USE_SOXR, USE_BS2B, USE_LADSPA, USE_CROSSFADE, USE_STEREO, USE_FILEWRITER, USE_MONOTOSTEREO (ефекти);
 - USE_ANALYZER, USE_PROJECTM (візуалізація);
 - USE_MPRIS, USE_SCROBBLER, USE_LISTENBRAINZ, USE_STATICON, USE_NOTIFIER, USE_LYRICS, USE_HAL, USE_HOTKEY, USE_FILEOPS,
-  USE_COVER, USE_KDENOTIFY, USE_UDISKS2, USE_CONVERTER, USE_RGSCAN, USE_TRACKCHANGE, USE_COPYPASTE,
+  USE_COVER, USE_KDENOTIFY, USE_UDISKS, USE_CONVERTER, USE_RGSCAN, USE_TRACKCHANGE, USE_COPYPASTE,
   USE_GNOMEHOTKEY, USE_LIBRARY (модулі загального призначення);
 - USE_QMMP_DIALOG (файловий діалог);
 - USE_ENCA (автоматичне визначення кодування);
@@ -140,14 +140,14 @@ cmake ./ -DUSE_JACK:BOOL=FALSE
 cmake ./ -DCMAKE_INSTALL_PREFIX=інший_шлях
 
 Підтримка OSS3 та Udisks.
-Модулі OSS3 та UDisks2 застаріли і вимкнені за замовчанням.
-Для їх увімкнення виконайте 'cmake ./ -DUSE_OSS:BOOL=TRUE' чи 'cmake ./ -DUSE_OSS:UDISKS2=TRUE' перед компіляцією.
+Модулі OSS3 та UDisks застаріли і вимкнені за замовчанням.
+Для їх увімкнення виконайте 'cmake ./ -DUSE_OSS:BOOL=TRUE' чи 'cmake ./ -DUSE_OSS:UDISKS=TRUE' перед компіляцією.
 
-Підтримка HAL та UDisks2.
+Підтримка HAL та UDisks.
 Більшість дистрибутивів Linux більше не підтримують HAL. Для відключення модуля HAL виконайте перед компіляцією наступну команду:
 cmake ./ -DUSE_HAL:BOOL=FALSE
-Проект UDisks не підтримує FreeBSD, тому під FreeBSD рекомендується вимикати модуль Udisks2 з компіляції наступною командою:
-cmake ./ -DUSE_UDISKS2:BOOL=FALSE
+Проект UDisks не підтримує FreeBSD, тому під FreeBSD рекомендується вимикати модуль Udisks з компіляції наступною командою:
+cmake ./ -DUSE_UDISKS:BOOL=FALSE
 
 У деяких випадках ви можете використовувати qmake для компіляції та встановлення.
 
diff --git a/qmmp.pri b/qmmp.pri
index e3aa3ff92..dc4f86295 100644
--- a/qmmp.pri
+++ b/qmmp.pri
@@ -84,7 +84,7 @@ CONFIG += SOXR_PLUGIN
 CONFIG += LADSPA_PLUGIN
 CONFIG += FILEWRITER_PLUGIN
 CONFIG += PROJECTM_PLUGIN
-CONFIG += UDISKS2_PLUGIN
+CONFIG += UDISKS_PLUGIN
 CONFIG += HAL_PLUGIN
 CONFIG += SID_PLUGIN
 CONFIG += QTMULTIMEDIA_PLUGIN
diff --git a/src/plugins/General/CMakeLists.txt b/src/plugins/General/CMakeLists.txt
index 69c034ff2..d9d815639 100644
--- a/src/plugins/General/CMakeLists.txt
+++ b/src/plugins/General/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(USE_STATICON TRUE CACHE BOOL "enable/disable status icon plugin")
 SET(USE_NOTIFIER TRUE CACHE BOOL "enable/disable notifier plugin")
 SET(USE_LYRICS TRUE CACHE BOOL "enable/disable lyrics version")
 SET(USE_HAL (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") CACHE BOOL "enable/disable hal plugin")
-SET(USE_UDISKS2 TRUE CACHE BOOL "enable/disable udisks2 plugin")
+SET(USE_UDISKS TRUE CACHE BOOL "enable/disable udisks plugin")
 SET(USE_HOTKEY TRUE CACHE BOOL "enable/disable global hotkey plugin")
 SET(USE_GNOMEHOTKEY TRUE CACHE BOOL "enable/disable gnome hotkey plugin")
 SET(USE_FILEOPS TRUE CACHE BOOL "enable/disable fileops plugin")
diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro
index 7286b1426..010e02525 100644
--- a/src/plugins/General/General.pro
+++ b/src/plugins/General/General.pro
@@ -19,8 +19,8 @@ unix:SUBDIRS += mpris \
                 converter \
                 gnomehotkey
 
-contains(CONFIG, UDISKS2_PLUGIN){
-    unix:SUBDIRS += udisks2
+contains(CONFIG, UDISKS_PLUGIN){
+    unix:SUBDIRS += udisks
 }
 
 contains(CONFIG, HAL_PLUGIN){
diff --git a/src/plugins/General/udisks/CMakeLists.txt b/src/plugins/General/udisks/CMakeLists.txt
new file mode 100644
index 000000000..95209cca3
--- /dev/null
+++ b/src/plugins/General/udisks/CMakeLists.txt
@@ -0,0 +1,36 @@
+project(libudisks)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+# libqmmpui & libqmmp
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
+
+SET(libudisks_SRCS
+    udisksfactory.cpp
+    udisksmanager.cpp
+    udisksplugin.cpp
+    udisksdevice.cpp
+    settingsdialog.cpp
+)
+
+SET(libudisks_RCCS translations/translations.qrc)
+
+QT5_ADD_RESOURCES(libudisks_RCC_SRCS ${libudisks_RCCS})
+
+# user interface
+
+SET(libudisks_UIS
+    settingsdialog.ui
+)
+
+QT5_WRAP_UI(libudisks_UIS_H ${libudisks_UIS})
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+ADD_LIBRARY(udisks MODULE ${libudisks_SRCS} ${libudisks_UIS_H} ${libudisks_RCC_SRCS})
+add_dependencies(udisks libqmmpui)
+target_link_libraries(udisks Qt5::Widgets Qt5::DBus libqmmpui libqmmp)
+install(TARGETS udisks DESTINATION ${PLUGIN_DIR}/General)
diff --git a/src/plugins/General/udisks2/settingsdialog.cpp b/src/plugins/General/udisks/settingsdialog.cpp
index 6961318f0..b051cec0b 100644
--- a/src/plugins/General/udisks2/settingsdialog.cpp
+++ b/src/plugins/General/udisks/settingsdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013 by Ilya Kotov                                      *
+ *   Copyright (C) 2013-2021 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,7 +26,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 {
     m_ui.setupUi(this);
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
-    settings.beginGroup("UDisks2");
+    settings.beginGroup("UDisks");
     m_ui.cdGroupBox->setChecked(settings.value("cda", true).toBool());
     m_ui.addTracksCheckBox->setChecked(settings.value("add_tracks", false).toBool());
     m_ui.removeTracksCheckBox->setChecked(settings.value("remove_tracks", false).toBool());
@@ -43,7 +43,7 @@ SettingsDialog::~SettingsDialog()
 void SettingsDialog::accept()
 {
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
-    settings.beginGroup("UDisks2");
+    settings.beginGroup("UDisks");
     settings.setValue("cda", m_ui.cdGroupBox->isChecked());
     settings.setValue("add_tracks", m_ui.addTracksCheckBox->isChecked());
     settings.setValue("remove_tracks", m_ui.removeTracksCheckBox->isChecked());
diff --git a/src/plugins/General/udisks2/settingsdialog.h b/src/plugins/General/udisks/settingsdialog.h
index 4364df4ed..10fb8814f 100644
--- a/src/plugins/General/udisks2/settingsdialog.h
+++ b/src/plugins/General/udisks/settingsdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013 by Ilya Kotov                                      *
+ *   Copyright (C) 2013-2021 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/src/plugins/General/udisks2/settingsdialog.ui b/src/plugins/General/udisks/settingsdialog.ui
index 5b039a88c..5b039a88c 100644
--- a/src/plugins/General/udisks2/settingsdialog.ui
+++ b/src/plugins/General/udisks/settingsdialog.ui
diff --git a/src/plugins/General/udisks/translations/translations.qrc b/src/plugins/General/udisks/translations/translations.qrc
new file mode 100644
index 000000000..8c398ef67
--- /dev/null
+++ b/src/plugins/General/udisks/translations/translations.qrc
@@ -0,0 +1,33 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+  <qresource>
+    <file>udisks_plugin_ru.qm</file>
+    <file>udisks_plugin_uk_UA.qm</file>
+    <file>udisks_plugin_zh_CN.qm</file>
+    <file>udisks_plugin_zh_TW.qm</file>
+    <file>udisks_plugin_tr.qm</file>
+    <file>udisks_plugin_cs.qm</file>
+    <file>udisks_plugin_pt_BR.qm</file>
+    <file>udisks_plugin_pt.qm</file>
+    <file>udisks_plugin_de.qm</file>
+    <file>udisks_plugin_pl_PL.qm</file>
+    <file>udisks_plugin_fr.qm</file>
+    <file>udisks_plugin_it.qm</file>
+    <file>udisks_plugin_kk.qm</file>
+    <file>udisks_plugin_ko.qm</file>
+    <file>udisks_plugin_lt.qm</file>
+    <file>udisks_plugin_hu.qm</file>
+    <file>udisks_plugin_nl.qm</file>
+    <file>udisks_plugin_ja.qm</file>
+    <file>udisks_plugin_sk.qm</file>
+    <file>udisks_plugin_es.qm</file>
+    <file>udisks_plugin_he.qm</file>
+    <file>udisks_plugin_gl_ES.qm</file>
+    <file>udisks_plugin_sr_BA.qm</file>
+    <file>udisks_plugin_sr_RS.qm</file>
+    <file>udisks_plugin_bg.qm</file>
+    <file>udisks_plugin_el.qm</file>
+    <file>udisks_plugin_id.qm</file>
+    <file>udisks_plugin_fi.qm</file>
+  </qresource>
+</RCC>
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts b/src/plugins/General/udisks/translations/udisks_plugin_bg.ts
index f6c63b44a..f6c63b44a 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_bg.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts b/src/plugins/General/udisks/translations/udisks_plugin_cs.ts
index 655ea9c84..655ea9c84 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_cs.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts b/src/plugins/General/udisks/translations/udisks_plugin_de.ts
index 42dd34174..42dd34174 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_de.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts b/src/plugins/General/udisks/translations/udisks_plugin_el.ts
index eb41b22fb..eb41b22fb 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_el.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts b/src/plugins/General/udisks/translations/udisks_plugin_en.ts
index 5e44b7b87..5e44b7b87 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_en.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts b/src/plugins/General/udisks/translations/udisks_plugin_es.ts
index 907d8805d..907d8805d 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_es.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts b/src/plugins/General/udisks/translations/udisks_plugin_fi.ts
index cf41107dd..cf41107dd 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_fi.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts b/src/plugins/General/udisks/translations/udisks_plugin_fr.ts
index 5efce0a69..5efce0a69 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_fr.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts b/src/plugins/General/udisks/translations/udisks_plugin_gl_ES.ts
index f95311746..f95311746 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_gl_ES.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts b/src/plugins/General/udisks/translations/udisks_plugin_he.ts
index 755a13f49..755a13f49 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_he.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts b/src/plugins/General/udisks/translations/udisks_plugin_hu.ts
index 94f6b2dfd..94f6b2dfd 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_hu.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts b/src/plugins/General/udisks/translations/udisks_plugin_id.ts
index ce56e2aa6..ce56e2aa6 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_id.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts b/src/plugins/General/udisks/translations/udisks_plugin_it.ts
index 56b6f4140..56b6f4140 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_it.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts b/src/plugins/General/udisks/translations/udisks_plugin_ja.ts
index 6b226722d..6b226722d 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_ja.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts b/src/plugins/General/udisks/translations/udisks_plugin_kk.ts
index 336c9269d..336c9269d 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_kk.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_ko.ts b/src/plugins/General/udisks/translations/udisks_plugin_ko.ts
index 3ffaba282..3ffaba282 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_ko.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_ko.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts b/src/plugins/General/udisks/translations/udisks_plugin_lt.ts
index e1b6c1ca8..e1b6c1ca8 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_lt.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts b/src/plugins/General/udisks/translations/udisks_plugin_nl.ts
index 95fe9937b..95fe9937b 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_nl.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts b/src/plugins/General/udisks/translations/udisks_plugin_pl_PL.ts
index d37d92e72..d37d92e72 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_pl_PL.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts b/src/plugins/General/udisks/translations/udisks_plugin_pt.ts
index de7b41eb2..de7b41eb2 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_pt.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts b/src/plugins/General/udisks/translations/udisks_plugin_pt_BR.ts
index a62d4d5c5..a62d4d5c5 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_pt_BR.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts b/src/plugins/General/udisks/translations/udisks_plugin_ru.ts
index c04130e85..c04130e85 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_ru.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts b/src/plugins/General/udisks/translations/udisks_plugin_sk.ts
index a8fcd692b..a8fcd692b 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_sk.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts b/src/plugins/General/udisks/translations/udisks_plugin_sr_BA.ts
index bf430d5e8..bf430d5e8 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_sr_BA.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts b/src/plugins/General/udisks/translations/udisks_plugin_sr_RS.ts
index ff03960bc..ff03960bc 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_sr_RS.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts b/src/plugins/General/udisks/translations/udisks_plugin_tr.ts
index 2031a0af3..2031a0af3 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_tr.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts b/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts
index d43c066cc..d43c066cc 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts b/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts
index c281c0f79..c281c0f79 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts
diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts b/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts
index adc7ed488..adc7ed488 100644
--- a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts
diff --git a/src/plugins/General/udisks/udisks.pro b/src/plugins/General/udisks/udisks.pro
new file mode 100644
index 000000000..ca99c7a5e
--- /dev/null
+++ b/src/plugins/General/udisks/udisks.pro
@@ -0,0 +1,26 @@
+include(../../plugins.pri)
+
+TARGET = $$PLUGINS_PREFIX/General/udisks
+
+QT += dbus
+
+HEADERS += udisksfactory.h \
+           udisksplugin.h \
+           udisksmanager.h \
+           udisksdevice.h \
+           settingsdialog.h
+
+SOURCES += udisksfactory.cpp \
+           udisksplugin.cpp \
+           udisksmanager.cpp \
+           udisksdevice.cpp \
+           settingsdialog.cpp
+
+FORMS += settingsdialog.ui
+
+RESOURCES = translations/translations.qrc
+
+LIBS += $$QMMPUI_LIB
+
+target.path = $$PLUGIN_DIR/General
+INSTALLS += target
diff --git a/src/plugins/General/udisks2/udisks2device.cpp b/src/plugins/General/udisks/udisksdevice.cpp
index e48de99fe..544d5a8a0 100644
--- a/src/plugins/General/udisks2/udisks2device.cpp
+++ b/src/plugins/General/udisks/udisksdevice.cpp
@@ -25,9 +25,9 @@
 #if (QT_VERSION < QT_VERSION_CHECK(5, 7, 0)) //qAsConst template
 #include <qmmp/qmmp.h>
 #endif
-#include "udisks2device.h"
+#include "udisksdevice.h"
 
-UDisks2Device::UDisks2Device(QDBusObjectPath o, QObject *parent) : QObject(parent)
+UDisksDevice::UDisksDevice(QDBusObjectPath o, QObject *parent) : QObject(parent)
 {
     m_block_interface = new QDBusInterface("org.freedesktop.UDisks2", o.path(),
                                            "org.freedesktop.UDisks2.Block", QDBusConnection::systemBus(),
@@ -45,41 +45,41 @@ UDisks2Device::UDisks2Device(QDBusObjectPath o, QObject *parent) : QObject(paren
     m_path = o;
 }
 
-UDisks2Device::~UDisks2Device()
+UDisksDevice::~UDisksDevice()
 {
 }
 
-QVariant UDisks2Device::property(const QString &key) const
+QVariant UDisksDevice::property(const QString &key) const
 {
     return m_block_interface->property(key.toLatin1().data());
 }
 
-bool UDisks2Device::isRemovable() const
+bool UDisksDevice::isRemovable() const
 {
     return m_drive_interface->property("Removable").toBool();
 }
 
-bool UDisks2Device::isMediaRemovable() const
+bool UDisksDevice::isMediaRemovable() const
 {
     return m_drive_interface->property("MediaRemovable").toBool();
 }
 
-bool UDisks2Device::isAudio() const
+bool UDisksDevice::isAudio() const
 {
     return m_drive_interface->property("OpticalNumAudioTracks").toInt() > 0;
 }
 
-bool UDisks2Device::isMounted() const
+bool UDisksDevice::isMounted() const
 {
     return !mountPoints().isEmpty();
 }
 
-bool UDisks2Device::isOptical() const
+bool UDisksDevice::isOptical() const
 {
     return m_drive_interface->property("Optical").toBool();
 }
 
-QStringList UDisks2Device::mountPoints() const
+QStringList UDisksDevice::mountPoints() const
 {
     QStringList points;
     QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2", m_path.path(),
@@ -107,12 +107,12 @@ QStringList UDisks2Device::mountPoints() const
     return points;
 }
 
-QString UDisks2Device::deviceFile() const
+QString UDisksDevice::deviceFile() const
 {
     return QString::fromLatin1(m_block_interface->property("Device").toByteArray());
 }
 
-QDBusObjectPath UDisks2Device::objectPath() const
+QDBusObjectPath UDisksDevice::objectPath() const
 {
     return m_path;
 }
diff --git a/src/plugins/General/udisks2/udisks2device.h b/src/plugins/General/udisks/udisksdevice.h
index 4b0e9543c..e027cd2be 100644
--- a/src/plugins/General/udisks2/udisks2device.h
+++ b/src/plugins/General/udisks/udisksdevice.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013 by Ilya Kotov                                      *
+ *   Copyright (C) 2013-2021 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -61,13 +61,13 @@ inline QDBusArgument &operator<<(QDBusArgument &arg, const QByteArrayList &list)
 /**
     @author Ilya Kotov <forkotov02@ya.ru>
 */
-class UDisks2Device : public QObject
+class UDisksDevice : public QObject
 {
     Q_OBJECT
 public:
-    UDisks2Device(QDBusObjectPath o, QObject *parent = nullptr);
+    UDisksDevice(QDBusObjectPath o, QObject *parent = nullptr);
 
-    ~UDisks2Device();
+    ~UDisksDevice();
 
     QVariant property(const QString &key) const;
     bool isRemovable() const;
diff --git a/src/plugins/General/udisks2/udisks2factory.cpp b/src/plugins/General/udisks/udisksfactory.cpp
index 721ff275f..c9237f65a 100644
--- a/src/plugins/General/udisks2/udisks2factory.cpp
+++ b/src/plugins/General/udisks/udisksfactory.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013 by Ilya Kotov                                      *
+ *   Copyright (C) 2013-2021 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,39 +21,39 @@
 #include <QMessageBox>
 #include <qmmp/qmmp.h>
 #include "settingsdialog.h"
-#include "udisks2plugin.h"
-#include "udisks2factory.h"
+#include "udisksplugin.h"
+#include "udisksfactory.h"
 
-GeneralProperties UDisks2Factory::properties() const
+GeneralProperties UDisksFactory::properties() const
 {
     GeneralProperties properties;
-    properties.name = tr("UDisks2 Plugin");
-    properties.shortName = "udisks2";
+    properties.name = tr("UDisks Plugin");
+    properties.shortName = "udisks";
     properties.hasAbout = true;
     properties.hasSettings = true;
     properties.visibilityControl = false;
     return properties;
 }
 
-QObject *UDisks2Factory::create(QObject *parent)
+QObject *UDisksFactory::create(QObject *parent)
 {
-    return new UDisks2Plugin(parent);
+    return new UDisksPlugin(parent);
 }
 
-QDialog *UDisks2Factory::createConfigDialog(QWidget *parent)
+QDialog *UDisksFactory::createConfigDialog(QWidget *parent)
 {
     return new SettingsDialog(parent);
 }
 
-void UDisks2Factory::showAbout(QWidget *parent)
+void UDisksFactory::showAbout(QWidget *parent)
 {
-    QMessageBox::about (parent, tr("About UDisks2 Plugin"),
-                        tr("Qmmp UDisks2 Plugin") + "\n" +
-                        tr("This plugin provides removable devices detection using UDisks2") + "\n" +
+    QMessageBox::about (parent, tr("About UDisks Plugin"),
+                        tr("Qmmp UDisks Plugin") + "\n" +
+                        tr("This plugin provides removable devices detection using UDisks") + "\n" +
                         tr("Written by: Ilya Kotov <forkotov02@ya.ru>"));
 }
 
-QString UDisks2Factory::translation() const
+QString UDisksFactory::translation() const
 {
-    return QLatin1String(":/udisks2_plugin_");
+    return QLatin1String(":/udisks_plugin_");
 }
diff --git a/src/plugins/General/udisks2/udisks2factory.h b/src/plugins/General/udisks/udisksfactory.h
index fecfa6268..ceba73de5 100644
--- a/src/plugins/General/udisks2/udisks2factory.h
+++ b/src/plugins/General/udisks/udisksfactory.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013 by Ilya Kotov                                      *
+ *   Copyright (C) 2013-2021 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -28,7 +28,7 @@
 #include <qmmpui/general.h>
 #include <qmmpui/generalfactory.h>
 
-class UDisks2Factory : public QObject, public GeneralFactory
+class UDisksFactory : public QObject, public GeneralFactory
 {
 Q_OBJECT
 Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0")
diff --git a/src/plugins/General/udisks2/udisks2manager.cpp b/src/plugins/General/udisks/udisksmanager.cpp
index 4bcbc275c..749f36ab1 100644
--- a/src/plugins/General/udisks2/udisks2manager.cpp
+++ b/src/plugins/General/udisks/udisksmanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013 by Ilya Kotov                                      *
+ *   Copyright (C) 2013-2021 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,9 +24,9 @@
 #include <QDBusArgument>
 #include <QDBusMetaType>
 #include <QXmlStreamReader>
-#include "udisks2manager.h"
+#include "udisksmanager.h"
 
-UDisks2Manager::UDisks2Manager(QObject *parent)
+UDisksManager::UDisksManager(QObject *parent)
         : QObject(parent)
 {
     m_interface = new QDBusInterface("org.freedesktop.UDisks2", "/org/freedesktop/UDisks2",
@@ -43,11 +43,11 @@ UDisks2Manager::UDisks2Manager(QObject *parent)
 }
 
 
-UDisks2Manager::~UDisks2Manager()
+UDisksManager::~UDisksManager()
 {
 }
 
-QList<QDBusObjectPath> UDisks2Manager::findAllDevices()
+QList<QDBusObjectPath> UDisksManager::findAllDevices()
 {
     QList<QDBusObjectPath> paths;
     QDBusMessage call = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",
@@ -76,14 +76,14 @@ QList<QDBusObjectPath> UDisks2Manager::findAllDevices()
     return paths;
 }
 
-void UDisks2Manager::onInterfacesAdded(const QDBusObjectPath &object_path, const QVariantMapMap &)
+void UDisksManager::onInterfacesAdded(const QDBusObjectPath &object_path, const QVariantMapMap &)
 {
     if(object_path.path().startsWith("/org/freedesktop/UDisks2/jobs"))
         return;
     emit deviceAdded(object_path);
 }
 
-void UDisks2Manager::onInterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &)
+void UDisksManager::onInterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &)
 {
     if(object_path.path().startsWith("/org/freedesktop/UDisks2/jobs"))
         return;
diff --git a/src/plugins/General/udisks2/udisks2manager.h b/src/plugins/General/udisks/udisksmanager.h
index 2b4e705fe..9e8fc14d2 100644
--- a/src/plugins/General/udisks2/udisks2manager.h
+++ b/src/plugins/General/udisks/udisksmanager.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013 by Ilya Kotov                                      *
+ *   Copyright (C) 2013-2021 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -33,13 +33,13 @@ Q_DECLARE_METATYPE(QVariantMapMap)
 /**
     @author Ilya Kotov <forkotov02@ya.ru>
 */
-class UDisks2Manager : public QObject
+class UDisksManager : public QObject
 {
 Q_OBJECT
 public:
-    UDisks2Manager(QObject *parent = nullptr);
+    UDisksManager(QObject *parent = nullptr);
 
-    ~UDisks2Manager();
+    ~UDisksManager();
 
     QList<QDBusObjectPath> findAllDevices();
 
diff --git a/src/plugins/General/udisks2/udisks2plugin.cpp b/src/plugins/General/udisks/udisksplugin.cpp
index d83c8cd04..ac1559270 100644
--- a/src/plugins/General/udisks2/udisks2plugin.cpp
+++ b/src/plugins/General/udisks/udisksplugin.cpp
@@ -26,16 +26,16 @@
 #include <qmmpui/playlistmanager.h>
 #include <qmmpui/playlistitem.h>
 #include <qmmp/qmmp.h>
-#include "udisks2device.h"
-#include "udisks2manager.h"
-#include "udisks2plugin.h"
+#include "udisksdevice.h"
+#include "udisksmanager.h"
+#include "udisksplugin.h"
 
-UDisks2Plugin::UDisks2Plugin(QObject *parent) : QObject(parent)
+UDisksPlugin::UDisksPlugin(QObject *parent) : QObject(parent)
 {
     qDBusRegisterMetaType<QVariantMapMap>();
     qDBusRegisterMetaType<QByteArrayList>();
 
-    m_manager = new UDisks2Manager(this);
+    m_manager = new UDisksManager(this);
     m_actions = new QActionGroup(this);
     connect(m_manager,SIGNAL(deviceAdded(QDBusObjectPath)), SLOT(addDevice(QDBusObjectPath)));
     connect(m_manager,SIGNAL(deviceRemoved(QDBusObjectPath)), SLOT(removeDevice(QDBusObjectPath)));
@@ -59,20 +59,20 @@ UDisks2Plugin::UDisks2Plugin(QObject *parent) : QObject(parent)
     settings.endGroup();
 }
 
-UDisks2Plugin::~UDisks2Plugin()
+UDisksPlugin::~UDisksPlugin()
 {
 }
 
-void UDisks2Plugin::removeDevice(QDBusObjectPath o)
+void UDisksPlugin::removeDevice(QDBusObjectPath o)
 {
-    QList<UDisks2Device *>::iterator it = m_devices.begin();
+    QList<UDisksDevice *>::iterator it = m_devices.begin();
     while(it != m_devices.end())
     {
         if((*it)->objectPath() == o)
         {
             delete (*it);
             it = m_devices.erase(it);
-            qDebug("UDisks2Plugin: removed device: \"%s\"", qPrintable(o.path()));
+            qDebug("UDisksPlugin: removed device: \"%s\"", qPrintable(o.path()));
             updateActions();
             break;
         }
@@ -83,18 +83,18 @@ void UDisks2Plugin::removeDevice(QDBusObjectPath o)
     }
 }
 
-void UDisks2Plugin::addDevice(QDBusObjectPath o)
+void UDisksPlugin::addDevice(QDBusObjectPath o)
 {
-    for(const UDisks2Device *device : qAsConst(m_devices)) //is it already exists?
+    for(const UDisksDevice *device : qAsConst(m_devices)) //is it already exists?
     {
         if (device->objectPath() == o)
             return;
     }
-    UDisks2Device *device = new UDisks2Device(o, this);
+    UDisksDevice *device = new UDisksDevice(o, this);
 
     if(device->isRemovable()) //detect removable devices only
     {
-        qDebug("UDisks2Plugin: added device: \"%s\"", qPrintable(o.path()));
+        qDebug("UDisksPlugin: added device: \"%s\"", qPrintable(o.path()));
         m_devices << device;
         updateActions();
         connect(device, SIGNAL(changed()), SLOT(updateActions()));
@@ -103,10 +103,10 @@ void UDisks2Plugin::addDevice(QDBusObjectPath o)
         delete device;
 }
 
-void UDisks2Plugin::updateActions()
+void UDisksPlugin::updateActions()
 {
     // add action for cd audio or mounted volume
-    for(const UDisks2Device *device : qAsConst(m_devices))
+    for(const UDisksDevice *device : qAsConst(m_devices))
     {
         QString dev_path;
         if (m_detectCDA && device->isAudio()) //cd audio
@@ -152,7 +152,7 @@ void UDisks2Plugin::updateActions()
             else
                 action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveHDIcon));
 
-            qDebug("UDisks2Plugin: added menu item: \"%s\"", qPrintable(dev_path));
+            qDebug("UDisksPlugin: added menu item: \"%s\"", qPrintable(dev_path));
 
             action->setText(actionText);
             action->setData(dev_path);
@@ -166,7 +166,7 @@ void UDisks2Plugin::updateActions()
     {
         if (!findDevice(action))
         {
-            qDebug("UDisks2Plugin: removed menu item: \"%s\"", qPrintable(action->data().toString()));
+            qDebug("UDisksPlugin: removed menu item: \"%s\"", qPrintable(action->data().toString()));
             m_actions->removeAction(action);
             UiHelper::instance()->removeAction(action);
             removePath(action->data().toString());
@@ -175,14 +175,14 @@ void UDisks2Plugin::updateActions()
     }
 }
 
-void UDisks2Plugin::processAction(QAction *action)
+void UDisksPlugin::processAction(QAction *action)
 {
-    qDebug("UDisks2Plugin: action triggered: %s", qPrintable(action->data().toString()));
+    qDebug("UDisksPlugin: action triggered: %s", qPrintable(action->data().toString()));
     QString path = action->data().toString();
     PlayListManager::instance()->selectedPlayList()->add(path);
 }
 
-QAction *UDisks2Plugin::findAction(const QString &dev_path)
+QAction *UDisksPlugin::findAction(const QString &dev_path)
 {
     for(QAction *action : m_actions->actions())
     {
@@ -192,9 +192,9 @@ QAction *UDisks2Plugin::findAction(const QString &dev_path)
     return nullptr;
 }
 
-UDisks2Device *UDisks2Plugin::findDevice(QAction *action)
+UDisksDevice *UDisksPlugin::findDevice(QAction *action)
 {
-    for(UDisks2Device *device : qAsConst(m_devices))
+    for(UDisksDevice *device : qAsConst(m_devices))
     {
         QString dev_path;
         if (device->isAudio())
@@ -213,7 +213,7 @@ UDisks2Device *UDisks2Plugin::findDevice(QAction *action)
     return nullptr;
 }
 
-void UDisks2Plugin::addPath(const QString &path)
+void UDisksPlugin::addPath(const QString &path)
 {
     PlayListModel *model = PlayListManager::instance()->selectedPlayList();
 
@@ -234,7 +234,7 @@ void UDisks2Plugin::addPath(const QString &path)
         PlayListManager::instance()->selectedPlayList()->add(path);
 }
 
-void UDisks2Plugin::removePath(const QString &path)
+void UDisksPlugin::removePath(const QString &path)
 {
     if ((path.startsWith("cdda://") && !m_removeTracks) ||
             (!path.startsWith("cdda://") && !m_removeFiles)) //process settings
diff --git a/src/plugins/General/udisks2/udisks2plugin.h b/src/plugins/General/udisks/udisksplugin.h
index a5d428220..66727d941 100644
--- a/src/plugins/General/udisks2/udisks2plugin.h
+++ b/src/plugins/General/udisks/udisksplugin.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013 by Ilya Kotov                                      *
+ *   Copyright (C) 2013-2021 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,8 +23,8 @@
 #include <QDBusObjectPath>
 #include <qmmpui/general.h>
 
-class UDisks2Manager;
-class UDisks2Device;
+class UDisksManager;
+class UDisksDevice;
 class QActionGroup;
 class QAction;
 
@@ -32,13 +32,13 @@ class QAction;
     @author Ilya Kotov <forkotov02@ya.ru>
 */
 
-class UDisks2Plugin : public QObject
+class UDisksPlugin : public QObject
 {
 Q_OBJECT
 public:
-    UDisks2Plugin(QObject *parent = nullptr);
+    UDisksPlugin(QObject *parent = nullptr);
 
-    ~UDisks2Plugin();
+    ~UDisksPlugin();
 
 private slots:
     void removeDevice(QDBusObjectPath);
@@ -48,11 +48,11 @@ private slots:
 
 private:
     QAction *findAction(const QString &dev_path);
-    UDisks2Device *findDevice(QAction *action);
+    UDisksDevice *findDevice(QAction *action);
     void addPath(const QString &path);
     void removePath(const QString &path);
-    UDisks2Manager *m_manager;
-    QList <UDisks2Device *> m_devices;
+    UDisksManager *m_manager;
+    QList <UDisksDevice *> m_devices;
     QActionGroup *m_actions;
     bool m_detectCDA;
     bool m_addTracks;
diff --git a/src/plugins/General/udisks2/CMakeLists.txt b/src/plugins/General/udisks2/CMakeLists.txt
deleted file mode 100644
index c767c824d..000000000
--- a/src/plugins/General/udisks2/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-project(libudisks2)
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-# libqmmpui & libqmmp
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
-link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
-
-SET(libudisks2_SRCS
-    udisks2factory.cpp
-    udisks2manager.cpp
-    udisks2plugin.cpp
-    udisks2device.cpp
-    settingsdialog.cpp
-)
-
-SET(libudisks2_RCCS translations/translations.qrc)
-
-QT5_ADD_RESOURCES(libudisks2_RCC_SRCS ${libudisks2_RCCS})
-
-# user interface
-
-SET(libudisks2_UIS
-    settingsdialog.ui
-)
-
-QT5_WRAP_UI(libudisks2_UIS_H ${libudisks2_UIS})
-# Don't forget to include output directory, otherwise
-# the UI file won't be wrapped!
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-ADD_LIBRARY(udisks2 MODULE ${libudisks2_SRCS} ${libudisks2_UIS_H} ${libudisks2_RCC_SRCS})
-add_dependencies(udisks2 libqmmpui)
-target_link_libraries(udisks2 Qt5::Widgets Qt5::DBus libqmmpui libqmmp)
-install(TARGETS udisks2 DESTINATION ${PLUGIN_DIR}/General)
diff --git a/src/plugins/General/udisks2/translations/translations.qrc b/src/plugins/General/udisks2/translations/translations.qrc
deleted file mode 100644
index 9e07b55b2..000000000
--- a/src/plugins/General/udisks2/translations/translations.qrc
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-  <qresource>
-    <file>udisks2_plugin_ru.qm</file>
-    <file>udisks2_plugin_uk_UA.qm</file>
-    <file>udisks2_plugin_zh_CN.qm</file>
-    <file>udisks2_plugin_zh_TW.qm</file>
-    <file>udisks2_plugin_tr.qm</file>
-    <file>udisks2_plugin_cs.qm</file>
-    <file>udisks2_plugin_pt_BR.qm</file>
-    <file>udisks2_plugin_pt.qm</file>
-    <file>udisks2_plugin_de.qm</file>
-    <file>udisks2_plugin_pl_PL.qm</file>
-    <file>udisks2_plugin_fr.qm</file>
-    <file>udisks2_plugin_it.qm</file>
-    <file>udisks2_plugin_kk.qm</file>
-    <file>udisks2_plugin_ko.qm</file>
-    <file>udisks2_plugin_lt.qm</file>
-    <file>udisks2_plugin_hu.qm</file>
-    <file>udisks2_plugin_nl.qm</file>
-    <file>udisks2_plugin_ja.qm</file>
-    <file>udisks2_plugin_sk.qm</file>
-    <file>udisks2_plugin_es.qm</file>
-    <file>udisks2_plugin_he.qm</file>
-    <file>udisks2_plugin_gl_ES.qm</file>
-    <file>udisks2_plugin_sr_BA.qm</file>
-    <file>udisks2_plugin_sr_RS.qm</file>
-    <file>udisks2_plugin_bg.qm</file>
-    <file>udisks2_plugin_el.qm</file>
-    <file>udisks2_plugin_id.qm</file>
-    <file>udisks2_plugin_fi.qm</file>
-  </qresource>
-</RCC>
diff --git a/src/plugins/General/udisks2/udisks2.pro b/src/plugins/General/udisks2/udisks2.pro
deleted file mode 100644
index 8b49d9dc5..000000000
--- a/src/plugins/General/udisks2/udisks2.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-include(../../plugins.pri)
-
-TARGET = $$PLUGINS_PREFIX/General/udisks2
-
-QT += dbus
-
-HEADERS += udisks2factory.h \
-           udisks2plugin.h \
-           udisks2manager.h \
-           udisks2device.h \
-           settingsdialog.h
-
-SOURCES += udisks2factory.cpp \
-           udisks2plugin.cpp \
-           udisks2manager.cpp \
-           udisks2device.cpp \
-           settingsdialog.cpp
-
-FORMS += settingsdialog.ui
-
-RESOURCES = translations/translations.qrc
-
-LIBS += $$QMMPUI_LIB
-
-target.path = $$PLUGIN_DIR/General
-INSTALLS += target