diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
| commit | 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a (patch) | |
| tree | 15d339b62e98d5858a57aa787334e14f0e2f0ad7 /src/plugins/General/udisks2 | |
| parent | 6fc05db7c6de9a51beba754f12ff4ac32859977d (diff) | |
| download | qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.gz qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.bz2 qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.zip | |
copy 1.2 branch to trunk
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/udisks2')
32 files changed, 151 insertions, 164 deletions
diff --git a/src/plugins/General/udisks2/CMakeLists.txt b/src/plugins/General/udisks2/CMakeLists.txt index bb12e48b2..a24c94e5f 100644 --- a/src/plugins/General/udisks2/CMakeLists.txt +++ b/src/plugins/General/udisks2/CMakeLists.txt @@ -1,19 +1,5 @@ project(libudisks2) -SET (QT_USE_QTDBUS TRUE) - -INCLUDE(FindQt4) - -include(${QT_USE_FILE}) - -# qt plugin -ADD_DEFINITIONS( -Wall ) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) -ADD_DEFINITIONS(-DQT_THREAD) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) # libqmmpui & libqmmp @@ -31,7 +17,7 @@ SET(libudisks2_SRCS SET(libudisks2_RCCS translations/translations.qrc) -QT4_ADD_RESOURCES(libudisks2_RCC_SRCS ${libudisks2_RCCS}) +QT5_ADD_RESOURCES(libudisks2_RCC_SRCS ${libudisks2_RCCS}) # user interface @@ -39,12 +25,12 @@ SET(libudisks2_UIS settingsdialog.ui ) -QT4_WRAP_UI(libudisks2_UIS_H ${libudisks2_UIS}) +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 qmmpui) -target_link_libraries(udisks2 ${QT_LIBRARIES} qmmpui libqmmp) +target_link_libraries(udisks2 Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) install(TARGETS udisks2 DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts index a8c9d09c3..765d15a72 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_bg.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts index 44536607b..5654b8831 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_cs.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>Modul UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>O modulu UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Modul Qmmp UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Tento modul poskytuje detekci výměnných médií pomocí UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts index cd32c9d11..5e81135a4 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_de.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>UDisks2-Modul</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>Über UDisks2-Modul</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Qmmp UDisks2-Modul</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Dieses Modul bietet Wechsellaufwerkerkennung unter Verwendung von UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Geschrieben von: Ilya Kotov <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts index 0d51aee7b..1ae0e648c 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_el.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>Πρόσθετο UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>Σχετικά με το πρόσθετο UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Qmmp πρόσθετο UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Αυτό το πρόσθετο παρέχει την ανίχνευση αφαιρούμενων συσκευών μέσω UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts index 9561978a9..4a74ace97 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_en.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts index c815dbe06..de68e2ff3 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_es.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>Módulo UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>Acerca del Módulo UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Módulo UDisks2 de Qmmp</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Este módulo proporciona detección de dispositivos extraíbles mediante UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Escrito por: Ilya Kotov <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts index c74ffd367..c26a2075b 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_fi.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>UDisks2-liitännäinen</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Qmmp:n UDisks2-liitännäinen</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Toteuttanut: Ilya Kotov <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts index 77477d25f..67da21e68 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_fr.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>Greffon UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>À propos du greffon UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Greffon UDisks2 pour Qmmp</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Ce greffon fournit une détection de périphériques amovibles en utilisant UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Écrit par : Ilya Kotov <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts index cd506c367..2f1043041 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_gl_ES.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>Engadido UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>Sobre o engadido UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Engadido UDisks2 de Qmmp</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Este engadido provén detección de dispositivos extraíbles usando UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts index df0d33f43..177175889 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_he.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>תוסף UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>אודות תוסף UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>תוסף UDisks2 של Qmmp</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>תוסף זה מספק איתור התקנים ברי הזזה באמצעות UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts index 6d30fbe49..e705d5801 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_hu.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts index 988e79fec..d0b6ea52d 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_id.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>Plugin UDisks</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>Tentang Plugin UDisks</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Plugin UDisks Qmmp</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Plugin ini menyediakan deteksi perangkat dapat-dilepas menggunakan UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts index 7b5b2e7a0..36193fb68 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_it.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished">Autore: Ilya Kotov <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts index 73598b9ad..46dc98772 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_ja.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>UDisks2 プラグイン</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>UDisks2 プラグインについて</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>QMMP UDisks2 プラグイン</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>このプラグインは着脱可能なデバイスの検知を UDisks2 により行ないます</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts index ec49c5bb4..e4a2d48cc 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_kk.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts index a5e2415a3..8faf69ee3 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_lt.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>UDisks2 Įskiepis</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>Apie UDisks2 Įskiepį </translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Qmmp UDisks2 Įskiepis </translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation type="unfinished">Šis įskiepis aptinka prijungiamus įrenginius naudodamas UDisks2 </translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Sukūrė: Ilya Kotov</translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts index f0bbc2e10..65727b53c 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_nl.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished">Auteur: Ilya Kotov <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts index 443fa10ee..b70384545 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_pl_PL.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>Wtyczka UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>O wtyczce UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Wtyczka UDisks2 dla Qmmp</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Ta wtyczka pozwala na wykrywanie urządzeń przy użyciu UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts index 86a790e8a..8b621b9b9 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_pt.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>Suplemento UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>Sobre o suplemento UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Suplemento Qmmp UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Este suplemento permite a deteção de discos amovíveis através do serviço UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Desenvolvido por: Ilya Kotov <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts index a6e07070b..59b82be01 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_pt_BR.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>Plugin UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>Sobre o plugin UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Plugin Qmmp UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Este plugin permite a detecção de dispositivos removíveis através do serviço UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts index 101935a00..fb63634ac 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_ru.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>Модуль UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>О модуле UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Модуль UDisks2 для Qmmp</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Это модуль отслеживает съёмные устройства с помощью UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Разработчик: Илья Котов <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts index 735bd1324..7bb01457c 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_sk.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts index b191e85e6..469b250ec 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_sr_BA.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>Удискс2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>О прикључку за UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Кумп прикључак за UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Омогућује откривање уклоњивих уређаја користећи UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Аутор: Ilya Kotov <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts index 9db721bca..d27eb3dcf 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_sr_RS.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>Удискс2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>О прикључку за UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Кумп прикључак за UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Омогућује откривање уклоњивих уређаја користећи UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Аутор: Ilya Kotov <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts index b6b699647..b484068b6 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_tr.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished">Yazan: Ilya Kotov <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts index 017c0c0c6..e31253340 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_uk_UA.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>Модуль UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>Про модуль UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Модуль UDisks2 для Qmmp</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>Цей модуль відстежує з'ємні пристрої за допомогою UDisks2</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Розробник: Ілля Котов <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts index 4770b4df4..39651091c 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_zh_CN.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation>UDisk2插件</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation>关于UDisk2插件</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation>Qmmp播放器UDisk2插件</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation>本插件使用UDisk2提供对移动设备的探测功能</translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts b/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts index 900afb2e2..f434f8fc0 100644 --- a/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts +++ b/src/plugins/General/udisks2/translations/udisks2_plugin_zh_TW.ts @@ -42,27 +42,27 @@ <context> <name>UDisks2Factory</name> <message> - <location filename="../udisks2factory.cpp" line="32"/> + <location filename="../udisks2factory.cpp" line="31"/> <source>UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="52"/> + <location filename="../udisks2factory.cpp" line="51"/> <source>About UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="53"/> + <location filename="../udisks2factory.cpp" line="52"/> <source>Qmmp UDisks2 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="54"/> + <location filename="../udisks2factory.cpp" line="53"/> <source>This plugin provides removable devices detection using UDisks2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../udisks2factory.cpp" line="55"/> + <location filename="../udisks2factory.cpp" line="54"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>作者：Ilya Kotov <forkotov02@ya.ru></translation> </message> diff --git a/src/plugins/General/udisks2/udisks2device.cpp b/src/plugins/General/udisks2/udisks2device.cpp index a6f4499ce..db0e88f85 100644 --- a/src/plugins/General/udisks2/udisks2device.cpp +++ b/src/plugins/General/udisks2/udisks2device.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013 by Ilya Kotov * + * Copyright (C) 2013-2016 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -93,7 +93,10 @@ QStringList UDisks2Device::mountPoints() const foreach (QVariant arg, args) { QByteArrayList list; - arg.value<QDBusVariant>().variant().value<QDBusArgument>() >> list; + QDBusArgument a = arg.value<QDBusVariant>().variant().value<QDBusArgument>(); + if(a.currentType() != QDBusArgument::ArrayType) + continue; + a >> list; foreach (QByteArray p, list) points.append(p); @@ -103,7 +106,7 @@ QStringList UDisks2Device::mountPoints() const QString UDisks2Device::deviceFile() const { - return QString::fromAscii(m_block_interface->property("Device").toByteArray().constData()); + return QString::fromLatin1(m_block_interface->property("Device").toByteArray()); } QDBusObjectPath UDisks2Device::objectPath() const diff --git a/src/plugins/General/udisks2/udisks2factory.cpp b/src/plugins/General/udisks2/udisks2factory.cpp index 3bd3d6d6d..0548b8932 100644 --- a/src/plugins/General/udisks2/udisks2factory.cpp +++ b/src/plugins/General/udisks2/udisks2factory.cpp @@ -18,9 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ + #include <QMessageBox> -#include <QTranslator> -#include <QtPlugin> #include <qmmp/qmmp.h> #include "settingsdialog.h" #include "udisks2plugin.h" @@ -62,5 +61,3 @@ QTranslator *UDisks2Factory::createTranslator(QObject *parent) translator->load(QString(":/udisks2_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(udisks2, UDisks2Factory) diff --git a/src/plugins/General/udisks2/udisks2factory.h b/src/plugins/General/udisks2/udisks2factory.h index b12e4722c..e4d1f94ff 100644 --- a/src/plugins/General/udisks2/udisks2factory.h +++ b/src/plugins/General/udisks2/udisks2factory.h @@ -32,6 +32,7 @@ class UDisks2Factory : public QObject, public GeneralFactory { Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; |