Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2019-10-14 13:40:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Mon Oct 14 13:40:38 2019 rev:76 rq:738072 version:5.63.0 Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2019-09-23 12:27:55.697703528 +0200 +++ /work/SRC/openSUSE:Factory/.solid.new.2352/solid.changes 2019-10-14 13:40:40.769526100 +0200 @@ -1,0 +2,12 @@ +Sun Oct 6 13:27:08 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 5.63.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.63.0.php +- Changes since 5.62.0: + * Mark technology propertie as constant to avoid warning + * fstab: include QThreadStorage in all cases + * Use directly QElapsedTimer + +------------------------------------------------------------------- Old: ---- solid-5.62.0.tar.xz solid-5.62.0.tar.xz.sig New: ---- solid-5.63.0.tar.xz solid-5.63.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.hrWgOg/_old 2019-10-14 13:40:42.233522284 +0200 +++ /var/tmp/diff_new_pack.hrWgOg/_new 2019-10-14 13:40:42.253522232 +0200 @@ -17,10 +17,10 @@ %define lname libKF5Solid5 -%define _tar_path 5.62 +%define _tar_path 5.63 %bcond_without lang Name: solid -Version: 5.62.0 +Version: 5.63.0 Release: 0 Summary: KDE Desktop hardware abstraction License: LGPL-2.1-or-later @@ -39,15 +39,15 @@ BuildRequires: flex BuildRequires: kf5-filesystem BuildRequires: pkgconfig -BuildRequires: cmake(Qt5Concurrent) >= 5.6.0 -BuildRequires: cmake(Qt5DBus) >= 5.6.0 -BuildRequires: cmake(Qt5Qml) >= 5.6.0 -BuildRequires: cmake(Qt5Test) >= 5.6.0 -BuildRequires: cmake(Qt5Widgets) >= 5.6.0 -BuildRequires: cmake(Qt5Xml) >= 5.6.0 +BuildRequires: cmake(Qt5Concurrent) >= 5.11.0 +BuildRequires: cmake(Qt5DBus) >= 5.11.0 +BuildRequires: cmake(Qt5Qml) >= 5.11.0 +BuildRequires: cmake(Qt5Test) >= 5.11.0 +BuildRequires: cmake(Qt5Widgets) >= 5.11.0 +BuildRequires: cmake(Qt5Xml) >= 5.11.0 BuildRequires: pkgconfig(libudev) %if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.6.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.11.0 %endif %description @@ -91,7 +91,7 @@ Group: Development/Libraries/KDE Requires: %{lname} = %{version} Requires: extra-cmake-modules -Requires: cmake(Qt5Core) >= 5.6.0 +Requires: cmake(Qt5Core) >= 5.11.0 %description devel Solid is a device integration framework. It provides a way of querying and ++++++ solid-5.62.0.tar.xz -> solid-5.63.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.62.0/CMakeLists.txt new/solid-5.63.0/CMakeLists.txt --- old/solid-5.62.0/CMakeLists.txt 2019-09-07 16:52:16.000000000 +0200 +++ new/solid-5.63.0/CMakeLists.txt 2019-10-06 11:52:17.000000000 +0200 @@ -1,11 +1,10 @@ - cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.62.0") # handled by release scripts +set(KF5_VERSION "5.63.0") # handled by release scripts project(Solid VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.62.0 NO_MODULE) +find_package(ECM 5.63.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.62.0/autotests/solidpowertest.cpp new/solid-5.63.0/autotests/solidpowertest.cpp --- old/solid-5.62.0/autotests/solidpowertest.cpp 2019-09-07 16:52:16.000000000 +0200 +++ new/solid-5.63.0/autotests/solidpowertest.cpp 2019-10-06 11:52:17.000000000 +0200 @@ -79,7 +79,7 @@ QCOMPARE(job->error(), (int) InhibitionJob::EmptyDescription); delete job; - job = Power::inhibit(Power::Sleep, QLatin1Literal("Running a test, we don't want to suspend now")); + job = Power::inhibit(Power::Sleep, QLatin1String("Running a test, we don't want to suspend now")); QVERIFY(job->exec()); auto inhibition = job->inhibition(); @@ -116,7 +116,7 @@ QVERIFY(!job->exec()); QCOMPARE(job->error(), (int) RequestStateJob::Unsupported); - QCOMPARE(job->errorText(), QLatin1Literal(QLatin1Literal("State Brightness is unsupported"))); + QCOMPARE(job->errorText(), QLatin1String(QLatin1String("State Brightness is unsupported"))); } QTEST_MAIN(solidPowerTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.62.0/po/ca/solid5_qt.po new/solid-5.63.0/po/ca/solid5_qt.po --- old/solid-5.62.0/po/ca/solid5_qt.po 2019-09-07 16:52:16.000000000 +0200 +++ new/solid-5.63.0/po/ca/solid5_qt.po 2019-10-06 11:52:17.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: solid5_qt\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2014-01-24 18:50+0000\n" -"PO-Revision-Date: 2019-05-06 18:46+0100\n" +"PO-Revision-Date: 2019-10-05 10:24+0100\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" @@ -956,7 +956,7 @@ #: solid/devices/backends/upower/upowerdevice.cpp:150 msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Nickel Cadmium" -msgstr "Niquel-cadmi" +msgstr "Níquel cadmi" #: solid/devices/backends/upower/upowerdevice.cpp:152 msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" @@ -991,7 +991,7 @@ #: solid/devices/backends/win/windevice.cpp:179 msgctxt "Solid::Backends::Win::WinDevice|battery technology" msgid "Nickel Cadmium" -msgstr "Niquel-cadmi" +msgstr "Níquel cadmi" #: solid/devices/backends/win/windevice.cpp:182 msgctxt "Solid::Backends::Win::WinDevice|battery technology" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.62.0/po/se/solid5_qt.po new/solid-5.63.0/po/se/solid5_qt.po --- old/solid-5.62.0/po/se/solid5_qt.po 2019-09-07 16:52:16.000000000 +0200 +++ new/solid-5.63.0/po/se/solid5_qt.po 2019-10-06 11:52:17.000000000 +0200 @@ -42,147 +42,147 @@ msgid "Mountable filesystems declared in your system" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:64 +#: solid/devices/backends/hal/haldevice.cpp:63 #, qt-format msgctxt "Solid::Backends::Hal::HalDevice|" msgid "%1 TiB" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:66 +#: solid/devices/backends/hal/haldevice.cpp:65 #, qt-format msgctxt "Solid::Backends::Hal::HalDevice|" msgid "%1 GiB" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:72 +#: solid/devices/backends/hal/haldevice.cpp:71 #, qt-format msgctxt "Solid::Backends::Hal::HalDevice|" msgid "%1 MiB" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:77 +#: solid/devices/backends/hal/haldevice.cpp:76 #, qt-format msgctxt "Solid::Backends::Hal::HalDevice|" msgid "%1 KiB" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:81 +#: solid/devices/backends/hal/haldevice.cpp:80 #, qt-format msgctxt "Solid::Backends::Hal::HalDevice|" msgid "%1 B" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:85 +#: solid/devices/backends/hal/haldevice.cpp:84 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "0 B" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:320 +#: solid/devices/backends/hal/haldevice.cpp:319 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "WLAN Interface" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:322 +#: solid/devices/backends/hal/haldevice.cpp:321 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Networking Interface" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:507 +#: solid/devices/backends/hal/haldevice.cpp:506 msgctxt "Solid::Backends::Hal::HalDevice|First item of %1%2 Drive sentence" msgid "CD-ROM" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:509 +#: solid/devices/backends/hal/haldevice.cpp:508 msgctxt "Solid::Backends::Hal::HalDevice|First item of %1%2 Drive sentence" msgid "CD-R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:512 +#: solid/devices/backends/hal/haldevice.cpp:511 msgctxt "Solid::Backends::Hal::HalDevice|First item of %1%2 Drive sentence" msgid "CD-RW" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:516 +#: solid/devices/backends/hal/haldevice.cpp:515 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/DVD-ROM" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:519 +#: solid/devices/backends/hal/haldevice.cpp:518 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/DVD+R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:522 +#: solid/devices/backends/hal/haldevice.cpp:521 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/DVD+RW" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:525 +#: solid/devices/backends/hal/haldevice.cpp:524 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/DVD-R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:528 +#: solid/devices/backends/hal/haldevice.cpp:527 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/DVD-RW" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:531 +#: solid/devices/backends/hal/haldevice.cpp:530 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/DVD-RAM" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:535 +#: solid/devices/backends/hal/haldevice.cpp:534 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/DVD±R DL" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:537 +#: solid/devices/backends/hal/haldevice.cpp:536 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/DVD±R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:542 +#: solid/devices/backends/hal/haldevice.cpp:541 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/DVD±RW DL" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:544 +#: solid/devices/backends/hal/haldevice.cpp:543 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/DVD±RW" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:548 +#: solid/devices/backends/hal/haldevice.cpp:547 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/BD-ROM" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:551 +#: solid/devices/backends/hal/haldevice.cpp:550 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/BD-R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:554 +#: solid/devices/backends/hal/haldevice.cpp:553 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/BD-RE" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:557 +#: solid/devices/backends/hal/haldevice.cpp:556 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/HD DVD-ROM" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:560 +#: solid/devices/backends/hal/haldevice.cpp:559 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/HD DVD-R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:563 +#: solid/devices/backends/hal/haldevice.cpp:562 msgctxt "Solid::Backends::Hal::HalDevice|Second item of %1%2 Drive sentence" msgid "/HD DVD-RW" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:567 +#: solid/devices/backends/hal/haldevice.cpp:566 #, qt-format msgctxt "" "Solid::Backends::Hal::HalDevice|%1 is CD-ROM/CD-R/etc; %2 is '/DVD-ROM'/'/" @@ -190,7 +190,7 @@ msgid "External %1%2 Drive" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:569 +#: solid/devices/backends/hal/haldevice.cpp:568 #, qt-format msgctxt "" "Solid::Backends::Hal::HalDevice|%1 is CD-ROM/CD-R/etc; %2 is '/DVD-ROM'/'/" @@ -198,43 +198,43 @@ msgid "%1%2 Drive" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:577 +#: solid/devices/backends/hal/haldevice.cpp:576 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "External Floppy Drive" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:579 +#: solid/devices/backends/hal/haldevice.cpp:578 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Floppy Drive" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:591 -#: solid/devices/backends/hal/haldevice.cpp:794 +#: solid/devices/backends/hal/haldevice.cpp:590 +#: solid/devices/backends/hal/haldevice.cpp:793 #, qt-format msgctxt "Solid::Backends::Hal::HalDevice|%1 is the size" msgid "%1 External Hard Drive" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:593 -#: solid/devices/backends/hal/haldevice.cpp:796 +#: solid/devices/backends/hal/haldevice.cpp:592 +#: solid/devices/backends/hal/haldevice.cpp:795 #, qt-format msgctxt "Solid::Backends::Hal::HalDevice|%1 is the size" msgid "%1 Hard Drive" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:597 -#: solid/devices/backends/hal/haldevice.cpp:800 +#: solid/devices/backends/hal/haldevice.cpp:596 +#: solid/devices/backends/hal/haldevice.cpp:799 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "External Hard Drive" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:599 -#: solid/devices/backends/hal/haldevice.cpp:802 +#: solid/devices/backends/hal/haldevice.cpp:598 +#: solid/devices/backends/hal/haldevice.cpp:801 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Hard Drive" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:618 +#: solid/devices/backends/hal/haldevice.cpp:617 #, qt-format msgctxt "" "Solid::Backends::Hal::HalDevice|%1 is the vendor, %2 is the model of the " @@ -242,205 +242,205 @@ msgid "%1 %2" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:623 +#: solid/devices/backends/hal/haldevice.cpp:622 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Drive" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:652 +#: solid/devices/backends/hal/haldevice.cpp:651 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "CD-ROM" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:657 +#: solid/devices/backends/hal/haldevice.cpp:656 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Blank CD-R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:659 +#: solid/devices/backends/hal/haldevice.cpp:658 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "CD-R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:665 +#: solid/devices/backends/hal/haldevice.cpp:664 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Blank CD-RW" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:667 +#: solid/devices/backends/hal/haldevice.cpp:666 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "CD-RW" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:672 +#: solid/devices/backends/hal/haldevice.cpp:671 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "DVD-ROM" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:677 +#: solid/devices/backends/hal/haldevice.cpp:676 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Blank DVD-RAM" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:679 +#: solid/devices/backends/hal/haldevice.cpp:678 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "DVD-RAM" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:685 +#: solid/devices/backends/hal/haldevice.cpp:684 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Blank DVD-R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:687 +#: solid/devices/backends/hal/haldevice.cpp:686 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "DVD-R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:693 +#: solid/devices/backends/hal/haldevice.cpp:692 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Blank DVD+R Dual-Layer" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:695 +#: solid/devices/backends/hal/haldevice.cpp:694 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "DVD+R Dual-Layer" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:701 +#: solid/devices/backends/hal/haldevice.cpp:700 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Blank DVD-RW" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:703 +#: solid/devices/backends/hal/haldevice.cpp:702 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "DVD-RW" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:709 +#: solid/devices/backends/hal/haldevice.cpp:708 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Blank DVD+R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:711 +#: solid/devices/backends/hal/haldevice.cpp:710 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "DVD+R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:717 +#: solid/devices/backends/hal/haldevice.cpp:716 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Blank DVD+RW" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:719 +#: solid/devices/backends/hal/haldevice.cpp:718 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "DVD+RW" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:725 +#: solid/devices/backends/hal/haldevice.cpp:724 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Blank DVD+RW Dual-Layer" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:727 +#: solid/devices/backends/hal/haldevice.cpp:726 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "DVD+RW Dual-Layer" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:732 +#: solid/devices/backends/hal/haldevice.cpp:731 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "BD-ROM" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:737 +#: solid/devices/backends/hal/haldevice.cpp:736 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Blank BD-R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:739 +#: solid/devices/backends/hal/haldevice.cpp:738 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "BD-R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:745 +#: solid/devices/backends/hal/haldevice.cpp:744 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Blank BD-RE" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:747 +#: solid/devices/backends/hal/haldevice.cpp:746 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "BD-RE" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:752 +#: solid/devices/backends/hal/haldevice.cpp:751 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "HD DVD-ROM" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:757 +#: solid/devices/backends/hal/haldevice.cpp:756 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Blank HD DVD-R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:759 +#: solid/devices/backends/hal/haldevice.cpp:758 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "HD DVD-R" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:765 +#: solid/devices/backends/hal/haldevice.cpp:764 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Blank HD DVD-RW" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:767 +#: solid/devices/backends/hal/haldevice.cpp:766 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "HD DVD-RW" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:774 +#: solid/devices/backends/hal/haldevice.cpp:773 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Audio CD" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:787 +#: solid/devices/backends/hal/haldevice.cpp:786 #, qt-format msgctxt "Solid::Backends::Hal::HalDevice|%1 is the size" msgid "%1 Encrypted Container" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:789 +#: solid/devices/backends/hal/haldevice.cpp:788 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Encrypted Container" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:807 +#: solid/devices/backends/hal/haldevice.cpp:806 #, qt-format msgctxt "Solid::Backends::Hal::HalDevice|%1 is the size" msgid "%1 Removable Media" msgstr "" -#: solid/devices/backends/hal/haldevice.cpp:809 +#: solid/devices/backends/hal/haldevice.cpp:808 #, qt-format msgctxt "Solid::Backends::Hal::HalDevice|%1 is the size" msgid "%1 Media" msgstr "" -#: solid/devices/backends/udev/udevdevice.cpp:116 +#: solid/devices/backends/udev/udevdevice.cpp:114 msgctxt "Solid::Backends::UDev::UDevDevice|" msgid "Computer" msgstr "" -#: solid/devices/backends/udev/udevdevice.cpp:120 +#: solid/devices/backends/udev/udevdevice.cpp:118 msgctxt "Solid::Backends::UDev::UDevDevice|" msgid "Processor" msgstr "" -#: solid/devices/backends/udev/udevdevice.cpp:131 +#: solid/devices/backends/udev/udevdevice.cpp:129 msgctxt "Solid::Backends::UDev::UDevDevice|" msgid "Portable Media Player" msgstr "" -#: solid/devices/backends/udev/udevdevice.cpp:134 +#: solid/devices/backends/udev/udevdevice.cpp:132 msgctxt "Solid::Backends::UDev::UDevDevice|" msgid "Camera" msgstr "" @@ -455,147 +455,147 @@ msgid "Devices declared in your system" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:65 +#: solid/devices/backends/udisks2/udisksdevice.cpp:59 #, qt-format msgctxt "udisksdevice|" msgid "%1 TiB" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:67 +#: solid/devices/backends/udisks2/udisksdevice.cpp:61 #, qt-format msgctxt "udisksdevice|" msgid "%1 GiB" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:73 +#: solid/devices/backends/udisks2/udisksdevice.cpp:67 #, qt-format msgctxt "udisksdevice|" msgid "%1 MiB" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:78 +#: solid/devices/backends/udisks2/udisksdevice.cpp:72 #, qt-format msgctxt "udisksdevice|" msgid "%1 KiB" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:82 +#: solid/devices/backends/udisks2/udisksdevice.cpp:76 #, qt-format msgctxt "udisksdevice|" msgid "%1 B" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:86 +#: solid/devices/backends/udisks2/udisksdevice.cpp:80 msgctxt "udisksdevice|" msgid "0 B" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:257 +#: solid/devices/backends/udisks2/udisksdevice.cpp:251 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Swap Space" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:279 +#: solid/devices/backends/udisks2/udisksdevice.cpp:273 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Loop Device" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:295 +#: solid/devices/backends/udisks2/udisksdevice.cpp:289 msgctxt "Solid::Backends::UDisks2::Device|First item of %1%2 Drive sentence" msgid "CD-ROM" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:297 +#: solid/devices/backends/udisks2/udisksdevice.cpp:291 msgctxt "Solid::Backends::UDisks2::Device|First item of %1%2 Drive sentence" msgid "CD-R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:300 +#: solid/devices/backends/udisks2/udisksdevice.cpp:294 msgctxt "Solid::Backends::UDisks2::Device|First item of %1%2 Drive sentence" msgid "CD-RW" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:304 +#: solid/devices/backends/udisks2/udisksdevice.cpp:298 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/DVD-ROM" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:307 +#: solid/devices/backends/udisks2/udisksdevice.cpp:301 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/DVD+R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:310 +#: solid/devices/backends/udisks2/udisksdevice.cpp:304 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/DVD+RW" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:313 +#: solid/devices/backends/udisks2/udisksdevice.cpp:307 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/DVD-R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:316 +#: solid/devices/backends/udisks2/udisksdevice.cpp:310 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/DVD-RW" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:319 +#: solid/devices/backends/udisks2/udisksdevice.cpp:313 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/DVD-RAM" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:323 +#: solid/devices/backends/udisks2/udisksdevice.cpp:317 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/DVD±R DL" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:325 +#: solid/devices/backends/udisks2/udisksdevice.cpp:319 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/DVD±R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:330 +#: solid/devices/backends/udisks2/udisksdevice.cpp:324 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/DVD±RW DL" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:332 +#: solid/devices/backends/udisks2/udisksdevice.cpp:326 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/DVD±RW" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:336 +#: solid/devices/backends/udisks2/udisksdevice.cpp:330 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/BD-ROM" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:339 +#: solid/devices/backends/udisks2/udisksdevice.cpp:333 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/BD-R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:342 +#: solid/devices/backends/udisks2/udisksdevice.cpp:336 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/BD-RE" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:345 +#: solid/devices/backends/udisks2/udisksdevice.cpp:339 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/HD DVD-ROM" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:348 +#: solid/devices/backends/udisks2/udisksdevice.cpp:342 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/HD DVD-R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:351 +#: solid/devices/backends/udisks2/udisksdevice.cpp:345 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/HD DVD-RW" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:355 +#: solid/devices/backends/udisks2/udisksdevice.cpp:349 #, qt-format msgctxt "" "Solid::Backends::UDisks2::Device|%1 is CD-ROM/CD-R/etc; %2 is '/DVD-ROM'/'/" @@ -603,7 +603,7 @@ msgid "External %1%2 Drive" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:357 +#: solid/devices/backends/udisks2/udisksdevice.cpp:351 #, qt-format msgctxt "" "Solid::Backends::UDisks2::Device|%1 is CD-ROM/CD-R/etc; %2 is '/DVD-ROM'/'/" @@ -611,43 +611,43 @@ msgid "%1%2 Drive" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:365 +#: solid/devices/backends/udisks2/udisksdevice.cpp:359 msgctxt "Solid::Backends::UDisks2::Device|" msgid "External Floppy Drive" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:367 +#: solid/devices/backends/udisks2/udisksdevice.cpp:361 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Floppy Drive" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:379 -#: solid/devices/backends/udisks2/udisksdevice.cpp:587 +#: solid/devices/backends/udisks2/udisksdevice.cpp:373 +#: solid/devices/backends/udisks2/udisksdevice.cpp:581 #, qt-format msgctxt "Solid::Backends::UDisks2::Device|%1 is the size" msgid "%1 External Hard Drive" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:381 -#: solid/devices/backends/udisks2/udisksdevice.cpp:589 +#: solid/devices/backends/udisks2/udisksdevice.cpp:375 +#: solid/devices/backends/udisks2/udisksdevice.cpp:583 #, qt-format msgctxt "Solid::Backends::UDisks2::Device|%1 is the size" msgid "%1 Hard Drive" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:385 -#: solid/devices/backends/udisks2/udisksdevice.cpp:593 +#: solid/devices/backends/udisks2/udisksdevice.cpp:379 +#: solid/devices/backends/udisks2/udisksdevice.cpp:587 msgctxt "Solid::Backends::UDisks2::Device|" msgid "External Hard Drive" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:387 -#: solid/devices/backends/udisks2/udisksdevice.cpp:595 +#: solid/devices/backends/udisks2/udisksdevice.cpp:381 +#: solid/devices/backends/udisks2/udisksdevice.cpp:589 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Hard Drive" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:410 +#: solid/devices/backends/udisks2/udisksdevice.cpp:404 #, qt-format msgctxt "" "Solid::Backends::UDisks2::Device|%1 is the vendor, %2 is the model of the " @@ -655,311 +655,311 @@ msgid "%1 %2" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:416 +#: solid/devices/backends/udisks2/udisksdevice.cpp:410 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Drive" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:446 +#: solid/devices/backends/udisks2/udisksdevice.cpp:440 msgctxt "Solid::Backends::UDisks2::Device|" msgid "CD-ROM" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:451 +#: solid/devices/backends/udisks2/udisksdevice.cpp:445 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Blank CD-R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:453 +#: solid/devices/backends/udisks2/udisksdevice.cpp:447 msgctxt "Solid::Backends::UDisks2::Device|" msgid "CD-R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:459 +#: solid/devices/backends/udisks2/udisksdevice.cpp:453 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Blank CD-RW" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:461 +#: solid/devices/backends/udisks2/udisksdevice.cpp:455 msgctxt "Solid::Backends::UDisks2::Device|" msgid "CD-RW" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:466 +#: solid/devices/backends/udisks2/udisksdevice.cpp:460 msgctxt "Solid::Backends::UDisks2::Device|" msgid "DVD-ROM" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:471 +#: solid/devices/backends/udisks2/udisksdevice.cpp:465 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Blank DVD-RAM" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:473 +#: solid/devices/backends/udisks2/udisksdevice.cpp:467 msgctxt "Solid::Backends::UDisks2::Device|" msgid "DVD-RAM" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:479 +#: solid/devices/backends/udisks2/udisksdevice.cpp:473 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Blank DVD-R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:481 +#: solid/devices/backends/udisks2/udisksdevice.cpp:475 msgctxt "Solid::Backends::UDisks2::Device|" msgid "DVD-R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:487 +#: solid/devices/backends/udisks2/udisksdevice.cpp:481 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Blank DVD+R Dual-Layer" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:489 +#: solid/devices/backends/udisks2/udisksdevice.cpp:483 msgctxt "Solid::Backends::UDisks2::Device|" msgid "DVD+R Dual-Layer" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:495 +#: solid/devices/backends/udisks2/udisksdevice.cpp:489 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Blank DVD-RW" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:497 +#: solid/devices/backends/udisks2/udisksdevice.cpp:491 msgctxt "Solid::Backends::UDisks2::Device|" msgid "DVD-RW" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:503 +#: solid/devices/backends/udisks2/udisksdevice.cpp:497 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Blank DVD+R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:505 +#: solid/devices/backends/udisks2/udisksdevice.cpp:499 msgctxt "Solid::Backends::UDisks2::Device|" msgid "DVD+R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:511 +#: solid/devices/backends/udisks2/udisksdevice.cpp:505 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Blank DVD+RW" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:513 +#: solid/devices/backends/udisks2/udisksdevice.cpp:507 msgctxt "Solid::Backends::UDisks2::Device|" msgid "DVD+RW" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:519 +#: solid/devices/backends/udisks2/udisksdevice.cpp:513 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Blank DVD+RW Dual-Layer" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:521 +#: solid/devices/backends/udisks2/udisksdevice.cpp:515 msgctxt "Solid::Backends::UDisks2::Device|" msgid "DVD+RW Dual-Layer" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:526 +#: solid/devices/backends/udisks2/udisksdevice.cpp:520 msgctxt "Solid::Backends::UDisks2::Device|" msgid "BD-ROM" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:531 +#: solid/devices/backends/udisks2/udisksdevice.cpp:525 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Blank BD-R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:533 +#: solid/devices/backends/udisks2/udisksdevice.cpp:527 msgctxt "Solid::Backends::UDisks2::Device|" msgid "BD-R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:539 +#: solid/devices/backends/udisks2/udisksdevice.cpp:533 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Blank BD-RE" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:541 +#: solid/devices/backends/udisks2/udisksdevice.cpp:535 msgctxt "Solid::Backends::UDisks2::Device|" msgid "BD-RE" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:546 +#: solid/devices/backends/udisks2/udisksdevice.cpp:540 msgctxt "Solid::Backends::UDisks2::Device|" msgid "HD DVD-ROM" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:551 +#: solid/devices/backends/udisks2/udisksdevice.cpp:545 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Blank HD DVD-R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:553 +#: solid/devices/backends/udisks2/udisksdevice.cpp:547 msgctxt "Solid::Backends::UDisks2::Device|" msgid "HD DVD-R" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:559 +#: solid/devices/backends/udisks2/udisksdevice.cpp:553 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Blank HD DVD-RW" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:561 +#: solid/devices/backends/udisks2/udisksdevice.cpp:555 msgctxt "Solid::Backends::UDisks2::Device|" msgid "HD DVD-RW" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:568 +#: solid/devices/backends/udisks2/udisksdevice.cpp:562 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Audio CD" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:580 +#: solid/devices/backends/udisks2/udisksdevice.cpp:574 #, qt-format msgctxt "Solid::Backends::UDisks2::Device|%1 is the size" msgid "%1 Encrypted Drive" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:582 +#: solid/devices/backends/udisks2/udisksdevice.cpp:576 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Encrypted Drive" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:599 +#: solid/devices/backends/udisks2/udisksdevice.cpp:593 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Floppy Disk" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:602 +#: solid/devices/backends/udisks2/udisksdevice.cpp:596 #, qt-format msgctxt "Solid::Backends::UDisks2::Device|%1 is the size" msgid "%1 Removable Media" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:604 +#: solid/devices/backends/udisks2/udisksdevice.cpp:598 #, qt-format msgctxt "Solid::Backends::UDisks2::Device|%1 is the size" msgid "%1 Media" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:747 +#: solid/devices/backends/udisks2/udisksdevice.cpp:741 msgctxt "Solid::Backends::UDisks2::Device|" msgid "You are not authorized to perform this operation" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:749 +#: solid/devices/backends/udisks2/udisksdevice.cpp:743 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The device is currently busy" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:751 +#: solid/devices/backends/udisks2/udisksdevice.cpp:745 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The requested operation has failed" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:753 +#: solid/devices/backends/udisks2/udisksdevice.cpp:747 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The requested operation has been canceled" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:755 +#: solid/devices/backends/udisks2/udisksdevice.cpp:749 msgctxt "Solid::Backends::UDisks2::Device|" msgid "An invalid or malformed option has been given" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:757 +#: solid/devices/backends/udisks2/udisksdevice.cpp:751 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The kernel driver for this filesystem type is not available" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:759 +#: solid/devices/backends/udisks2/udisksdevice.cpp:753 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The device is already mounted" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:761 +#: solid/devices/backends/udisks2/udisksdevice.cpp:755 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The device is not mounted" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:763 +#: solid/devices/backends/udisks2/udisksdevice.cpp:757 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The device is mounted by another user" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:765 +#: solid/devices/backends/udisks2/udisksdevice.cpp:759 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The device is already unmounting" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:767 +#: solid/devices/backends/udisks2/udisksdevice.cpp:761 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The operation timed out" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:769 +#: solid/devices/backends/udisks2/udisksdevice.cpp:763 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The operation would wake up a disk that is in a deep-sleep state" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:771 +#: solid/devices/backends/udisks2/udisksdevice.cpp:765 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The operation has already been canceled" msgstr "" -#: solid/devices/backends/udisks2/udisksdevice.cpp:773 +#: solid/devices/backends/udisks2/udisksdevice.cpp:767 msgctxt "Solid::Backends::UDisks2::Device|" msgid "An unspecified error has occurred" msgstr "" -#: solid/devices/backends/udisks2/udisksmanager.cpp:93 +#: solid/devices/backends/udisks2/udisksmanager.cpp:92 msgctxt "Solid::Backends::UDisks2::Manager|" msgid "Storage" msgstr "" -#: solid/devices/backends/udisks2/udisksmanager.cpp:94 +#: solid/devices/backends/udisks2/udisksmanager.cpp:93 msgctxt "Solid::Backends::UDisks2::Manager|" msgid "Storage devices" msgstr "" -#: solid/devices/backends/upower/upowerdevice.cpp:128 +#: solid/devices/backends/upower/upowerdevice.cpp:127 #, qt-format msgctxt "Solid::Backends::UPower::UPowerDevice|%1 is battery technology" msgid "%1 Battery" msgstr "" -#: solid/devices/backends/upower/upowerdevice.cpp:143 +#: solid/devices/backends/upower/upowerdevice.cpp:142 msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Lithium Ion" msgstr "" -#: solid/devices/backends/upower/upowerdevice.cpp:145 +#: solid/devices/backends/upower/upowerdevice.cpp:144 msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Lithium Polymer" msgstr "" -#: solid/devices/backends/upower/upowerdevice.cpp:147 +#: solid/devices/backends/upower/upowerdevice.cpp:146 msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Lithium Iron Phosphate" msgstr "" -#: solid/devices/backends/upower/upowerdevice.cpp:149 +#: solid/devices/backends/upower/upowerdevice.cpp:148 msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Lead Acid" msgstr "" -#: solid/devices/backends/upower/upowerdevice.cpp:151 +#: solid/devices/backends/upower/upowerdevice.cpp:150 msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Nickel Cadmium" msgstr "" -#: solid/devices/backends/upower/upowerdevice.cpp:153 +#: solid/devices/backends/upower/upowerdevice.cpp:152 msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Nickel Metal Hydride" msgstr "" -#: solid/devices/backends/upower/upowerdevice.cpp:155 +#: solid/devices/backends/upower/upowerdevice.cpp:154 msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Unknown" msgstr "" @@ -1064,33 +1064,33 @@ msgid "Network Share" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:174 -#: tools/solid-hardware/solid-hardware.cpp:273 +#: tools/solid-hardware/solid-hardware.cpp:173 +#: tools/solid-hardware/solid-hardware.cpp:272 msgctxt "solid-hardware|" msgid "Device udi" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:189 +#: tools/solid-hardware/solid-hardware.cpp:188 msgctxt "solid-hardware|" msgid "KDE tool for querying your hardware from the command line" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:192 +#: tools/solid-hardware/solid-hardware.cpp:191 msgctxt "solid-hardware|" msgid "Command to execute" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:194 +#: tools/solid-hardware/solid-hardware.cpp:193 msgctxt "solid-hardware|" msgid "Show available commands" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:200 tools/solid-power/main.cpp:47 +#: tools/solid-hardware/solid-hardware.cpp:199 tools/solid-power/main.cpp:47 msgctxt "solid-hardware|" msgid "Syntax:" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:203 +#: tools/solid-hardware/solid-hardware.cpp:202 msgctxt "solid-hardware|" msgid "" " # List the hardware available in the system.\n" @@ -1105,14 +1105,14 @@ " # - Otherwise only device UDIs are listed.\n" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:214 +#: tools/solid-hardware/solid-hardware.cpp:213 msgctxt "solid-hardware|" msgid "" " # Display all the interfaces and properties of the device\n" " # corresponding to 'udi' in a platform neutral fashion.\n" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:219 +#: tools/solid-hardware/solid-hardware.cpp:218 msgctxt "solid-hardware|" msgid "" " # Display all the properties of the device corresponding to " @@ -1121,7 +1121,7 @@ "dependent).\n" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:224 +#: tools/solid-hardware/solid-hardware.cpp:223 msgctxt "solid-hardware|" msgid "" " # List the UDI of devices corresponding to 'predicate'.\n" @@ -1131,63 +1131,63 @@ " # - Otherwise the search is done on all the devices.\n" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:231 +#: tools/solid-hardware/solid-hardware.cpp:230 msgctxt "solid-hardware|" msgid "" " # If applicable, mount the device corresponding to 'udi'.\n" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:235 +#: tools/solid-hardware/solid-hardware.cpp:234 msgctxt "solid-hardware|" msgid "" " # If applicable, unmount the device corresponding to 'udi'.\n" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:239 +#: tools/solid-hardware/solid-hardware.cpp:238 msgctxt "solid-hardware|" msgid "" " # If applicable, eject the device corresponding to 'udi'.\n" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:243 +#: tools/solid-hardware/solid-hardware.cpp:242 msgctxt "solid-hardware|" msgid " # Listen to all add/remove events on supported hardware." msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:260 +#: tools/solid-hardware/solid-hardware.cpp:259 msgctxt "solid-hardware|" msgid "Show device details" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:261 +#: tools/solid-hardware/solid-hardware.cpp:260 msgctxt "solid-hardware|" msgid "Show non portable information" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:274 +#: tools/solid-hardware/solid-hardware.cpp:273 msgctxt "solid-hardware|" msgid "Parent device udi" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:302 +#: tools/solid-hardware/solid-hardware.cpp:301 #, qt-format msgctxt "solid-hardware|" msgid "Syntax Error: Unknown command '%1'" msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:371 +#: tools/solid-hardware/solid-hardware.cpp:370 #, qt-format msgctxt "SolidHardware|" msgid "Error: %1 does not have the interface StorageAccess." msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:376 +#: tools/solid-hardware/solid-hardware.cpp:375 #, qt-format msgctxt "SolidHardware|" msgid "Error: %1 does not have the interface OpticalDrive." msgstr "" -#: tools/solid-hardware/solid-hardware.cpp:409 +#: tools/solid-hardware/solid-hardware.cpp:408 #, qt-format msgctxt "SolidHardware|" msgid "Error: %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.62.0/src/imports/devices.h new/solid-5.63.0/src/imports/devices.h --- old/solid-5.62.0/src/imports/devices.h 2019-09-07 16:52:16.000000000 +0200 +++ new/solid-5.63.0/src/imports/devices.h 2019-10-06 11:52:17.000000000 +0200 @@ -40,7 +40,7 @@ * * It is intended to be used from QML like this: * - * <code> + * @code * Solid.Devices { * id: allDevices * } @@ -64,7 +64,7 @@ * networkShares.devices[0], "NetworkShare" * ).url * } - * </code> + * @endcode */ class Devices: public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.62.0/src/solid/CMakeLists.txt new/solid-5.63.0/src/solid/CMakeLists.txt --- old/solid-5.62.0/src/solid/CMakeLists.txt 2019-09-07 16:52:16.000000000 +0200 +++ new/solid-5.63.0/src/solid/CMakeLists.txt 2019-10-06 11:52:17.000000000 +0200 @@ -9,7 +9,12 @@ set(solid_LIB_SRCS ${solid_LIB_SRCS} ${solid_QM_LOADER}) add_library(KF5Solid ${solid_LIB_SRCS}) -target_include_directories(KF5Solid PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..>") +set(solid_BUILD_INCLUDE_DIRS + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_BINARY_DIR}/.. +) +target_include_directories(KF5Solid PUBLIC "$<BUILD_INTERFACE:${solid_BUILD_INCLUDE_DIRS}>") generate_export_header(KF5Solid BASE_NAME Solid) add_library(KF5::Solid ALIAS KF5Solid) @@ -119,6 +124,8 @@ MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" LINK_QCHS Qt5Core_QCH + INCLUDE_DIRS + ${solid_BUILD_INCLUDE_DIRS} BLANK_MACROS SOLID_EXPORT SOLID_DEPRECATED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.62.0/src/solid/devices/backends/fstab/fstabhandling.cpp new/solid-5.63.0/src/solid/devices/backends/fstab/fstabhandling.cpp --- old/solid-5.62.0/src/solid/devices/backends/fstab/fstabhandling.cpp 2019-09-07 16:52:16.000000000 +0200 +++ new/solid-5.63.0/src/solid/devices/backends/fstab/fstabhandling.cpp 2019-10-06 11:52:17.000000000 +0200 @@ -25,6 +25,7 @@ #include <QObject> #include <QProcess> #include <QTextStream> +#include <QThreadStorage> #include <solid/devices/soliddefs_p.h> @@ -49,7 +50,6 @@ #include <sys/param.h> #endif #include <sys/mount.h> -#include <QThreadStorage> #endif #ifdef Q_OS_SOLARIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.62.0/src/solid/devices/backends/hal/halfstabhandling.cpp new/solid-5.63.0/src/solid/devices/backends/hal/halfstabhandling.cpp --- old/solid-5.62.0/src/solid/devices/backends/hal/halfstabhandling.cpp 2019-09-07 16:52:16.000000000 +0200 +++ new/solid-5.63.0/src/solid/devices/backends/hal/halfstabhandling.cpp 2019-10-06 11:52:17.000000000 +0200 @@ -26,7 +26,7 @@ #include <QProcess> #include <QTextStream> #include <QWriteLocker> -#include <QTime> +#include <QElapsedTimer> #include <soliddefs_p.h> #include <config-solid.h> @@ -50,7 +50,7 @@ public: QReadWriteLock lock; bool firstCall = true; - QTime elapsedTime; + QElapsedTimer elapsedTime; QMultiHash<QString, QString> values; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.62.0/src/solid/devices/frontend/battery.h new/solid-5.63.0/src/solid/devices/frontend/battery.h --- old/solid-5.62.0/src/solid/devices/frontend/battery.h 2019-09-07 16:52:16.000000000 +0200 +++ new/solid-5.63.0/src/solid/devices/frontend/battery.h 2019-10-06 11:52:17.000000000 +0200 @@ -53,7 +53,7 @@ Q_PROPERTY(double energyRate READ energyRate NOTIFY energyRateChanged) Q_PROPERTY(double voltage READ voltage NOTIFY voltageChanged) Q_PROPERTY(double temperature READ temperature NOTIFY temperatureChanged) - Q_PROPERTY(Technology technology READ technology) + Q_PROPERTY(Technology technology READ technology CONSTANT) Q_PROPERTY(bool recalled READ isRecalled) Q_PROPERTY(QString recallVendor READ recallVendor) Q_PROPERTY(QString recallUrl READ recallUrl) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.62.0/src/solid/power/backends/dummy/dummyrequeststatejob.cpp new/solid-5.63.0/src/solid/power/backends/dummy/dummyrequeststatejob.cpp --- old/solid-5.62.0/src/solid/power/backends/dummy/dummyrequeststatejob.cpp 2019-09-07 16:52:16.000000000 +0200 +++ new/solid-5.63.0/src/solid/power/backends/dummy/dummyrequeststatejob.cpp 2019-10-06 11:52:17.000000000 +0200 @@ -28,7 +28,7 @@ { if (state == Power::Shutdown) { setError(RequestStateJob::Unsupported); - setErrorText(QLatin1Literal("State Brightness is unsupported")); + setErrorText(QLatin1String("State Brightness is unsupported")); } emitResult(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.62.0/src/tools/solid-power/main.cpp new/solid-5.63.0/src/tools/solid-power/main.cpp --- old/solid-5.62.0/src/tools/solid-power/main.cpp 2019-09-07 16:52:16.000000000 +0200 +++ new/solid-5.63.0/src/tools/solid-power/main.cpp 2019-10-06 11:52:17.000000000 +0200 @@ -30,7 +30,7 @@ qputenv("SOLID_POWER_BACKEND", "FREE_DESKTOP"); QCoreApplication app(argc, argv); - app.setApplicationName(QLatin1Literal("solid-power")); + app.setApplicationName(QLatin1String("solid-power")); QCommandLineParser parser; parser.setApplicationDescription(QCoreApplication::translate("solid-power", "Tool to know and set the power management state of your device"));
