Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2020-01-14 21:04:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Tue Jan 14 21:04:36 2020 rev:79 rq:763502 version:5.66.0 Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2019-12-18 14:45:07.481850970 +0100 +++ /work/SRC/openSUSE:Factory/.solid.new.6675/solid.changes 2020-01-14 21:07:54.878780404 +0100 @@ -1,0 +2,18 @@ +Sun Jan 5 09:02:29 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.66.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.66.0.php +- Changes since 5.65.0: + * Remove endl. qCritical/qDebug already adds a endl. + * Clean up unnecessary code + * Display first / in mounted storage access description + * Port QSet::toList deprecated method + * Remove unused header from QtWidgets + * Fix build on BSD + * Port solid from Qt5::Widgets to Qt5::Gui + * Ensure mounted nfs filesystems matches their fstab declared counterpart (kde#406242) + * Update the obsolete projects.kde.org URL + +------------------------------------------------------------------- Old: ---- solid-5.65.0.tar.xz solid-5.65.0.tar.xz.sig New: ---- solid-5.66.0.tar.xz solid-5.66.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.KLhPdU/_old 2020-01-14 21:07:55.550780714 +0100 +++ /var/tmp/diff_new_pack.KLhPdU/_new 2020-01-14 21:07:55.562780720 +0100 @@ -1,7 +1,7 @@ # # spec file for package solid # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +17,10 @@ %define lname libKF5Solid5 -%define _tar_path 5.65 +%define _tar_path 5.66 %bcond_without lang Name: solid -Version: 5.65.0 +Version: 5.66.0 Release: 0 Summary: KDE Desktop hardware abstraction License: LGPL-2.1-or-later @@ -41,9 +41,9 @@ BuildRequires: pkgconfig BuildRequires: cmake(Qt5Concurrent) >= 5.11.0 BuildRequires: cmake(Qt5DBus) >= 5.11.0 +BuildRequires: cmake(Qt5Gui) >= 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} ++++++ solid-5.65.0.tar.xz -> solid-5.66.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/CMakeLists.txt new/solid-5.66.0/CMakeLists.txt --- old/solid-5.65.0/CMakeLists.txt 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/CMakeLists.txt 2020-01-04 11:16:42.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.65.0") # handled by release scripts +set(KF5_VERSION "5.66.0") # handled by release scripts project(Solid VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.65.0 NO_MODULE) -set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) +find_package(ECM 5.66.0 NO_MODULE) +set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -16,8 +16,8 @@ include(KDECMakeSettings) include(ECMQtDeclareLoggingCategory) -set(REQUIRED_QT_VERSION 5.11.0) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml Widgets) +set(REQUIRED_QT_VERSION 5.12.0) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml Gui) if (NOT ANDROID) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/autotests/fakehardwaretest.cpp new/solid-5.66.0/autotests/fakehardwaretest.cpp --- old/solid-5.65.0/autotests/fakehardwaretest.cpp 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/autotests/fakehardwaretest.cpp 2020-01-04 11:16:42.000000000 +0100 @@ -20,7 +20,7 @@ #include "fakehardwaretest.h" // Qt includes -#include <QtTest> +#include <QTest> // Solid includes #include <solid/devices/ifaces/device.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/autotests/halbasictest.cpp new/solid-5.66.0/autotests/halbasictest.cpp --- old/solid-5.65.0/autotests/halbasictest.cpp 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/autotests/halbasictest.cpp 2020-01-04 11:16:42.000000000 +0100 @@ -20,7 +20,7 @@ #include "halbasictest.h" -#include <QtTest> +#include <QTest> #include "solid/devices/backends/hal/halmanager.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/autotests/qtest_dbus.h new/solid-5.66.0/autotests/qtest_dbus.h --- old/solid-5.65.0/autotests/qtest_dbus.h 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/autotests/qtest_dbus.h 2020-01-04 11:16:42.000000000 +0100 @@ -22,7 +22,8 @@ #ifndef SOLID_QTEST_DBUS_H #define SOLID_QTEST_DBUS_H -#include <QtTest> +#include <QTest> +#include <QProcess> #include <QDebug> #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/autotests/solidhwtest.cpp new/solid-5.66.0/autotests/solidhwtest.cpp --- old/solid-5.65.0/autotests/solidhwtest.cpp 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/autotests/solidhwtest.cpp 2020-01-04 11:16:42.000000000 +0100 @@ -20,7 +20,8 @@ #include "solidhwtest.h" -#include <QtTest> +#include <QTest> +#include <QSignalSpy> #include <solid/devicenotifier.h> #include <solid/device.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/autotests/solidmttest.cpp new/solid-5.66.0/autotests/solidmttest.cpp --- old/solid-5.65.0/autotests/solidmttest.cpp 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/autotests/solidmttest.cpp 2020-01-04 11:16:42.000000000 +0100 @@ -23,7 +23,7 @@ #include <QThreadPool> #include <qtconcurrentrun.h> -#include <QtTest> +#include <QTest> #include <solid/device.h> #include <solid/predicate.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/ar/solid5_qt.po new/solid-5.66.0/po/ar/solid5_qt.po --- old/solid-5.65.0/po/ar/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/ar/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -16,13 +16,13 @@ "X-Generator: Virtaal 0.7.1\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/bg/solid5_qt.po new/solid-5.66.0/po/bg/solid5_qt.po --- old/solid-5.65.0/po/bg/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/bg/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -18,13 +18,13 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/bs/solid5_qt.po new/solid-5.66.0/po/bs/solid5_qt.po --- old/solid-5.65.0/po/bs/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/bs/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -13,13 +13,13 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/ca/solid5_qt.po new/solid-5.66.0/po/ca/solid5_qt.po --- old/solid-5.65.0/po/ca/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/ca/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -22,13 +22,13 @@ "X-Accelerator-Marker: &\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 a %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/ca@valencia/solid5_qt.po new/solid-5.66.0/po/ca@valencia/solid5_qt.po --- old/solid-5.65.0/po/ca@valencia/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/ca@valencia/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -24,13 +24,13 @@ "X-Qt-Contexts: true\n" "X-Project-Style: kde\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 a %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/cs/solid5_qt.po new/solid-5.66.0/po/cs/solid5_qt.po --- old/solid-5.65.0/po/cs/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/cs/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -22,13 +22,13 @@ "X-Source-Language: en_US\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 na %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/da/solid5_qt.po new/solid-5.66.0/po/da/solid5_qt.po --- old/solid-5.65.0/po/da/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/da/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -18,13 +18,13 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 på %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/de/solid5_qt.po new/solid-5.66.0/po/de/solid5_qt.po --- old/solid-5.65.0/po/de/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/de/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -20,13 +20,13 @@ "X-Qt-Contexts: true\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 auf %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/el/solid5_qt.po new/solid-5.66.0/po/el/solid5_qt.po --- old/solid-5.65.0/po/el/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/el/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -23,13 +23,13 @@ "X-Generator: Lokalize 1.5\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/en_GB/solid5_qt.po new/solid-5.66.0/po/en_GB/solid5_qt.po --- old/solid-5.65.0/po/en_GB/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/en_GB/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -19,13 +19,13 @@ "X-Generator: Lokalize 19.07.70\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 on %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/eo/solid5_qt.po new/solid-5.66.0/po/eo/solid5_qt.po --- old/solid-5.65.0/po/eo/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/eo/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -17,13 +17,13 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/es/solid5_qt.po new/solid-5.66.0/po/es/solid5_qt.po --- old/solid-5.65.0/po/es/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/es/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -20,13 +20,13 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 en %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/et/solid5_qt.po new/solid-5.66.0/po/et/solid5_qt.po --- old/solid-5.65.0/po/et/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/et/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -19,13 +19,13 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 serveris %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/eu/solid5_qt.po new/solid-5.66.0/po/eu/solid5_qt.po --- old/solid-5.65.0/po/eu/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/eu/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -23,13 +23,13 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 %2-(e)(a)n" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/fi/solid5_qt.po new/solid-5.66.0/po/fi/solid5_qt.po --- old/solid-5.65.0/po/fi/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/fi/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -26,13 +26,13 @@ "X-Generator: Lokalize 18.12.3\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 palvelimella %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/fr/solid5_qt.po new/solid-5.66.0/po/fr/solid5_qt.po --- old/solid-5.65.0/po/fr/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/fr/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -12,7 +12,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-24 18:50+0000\n" -"PO-Revision-Date: 2019-07-21 11:20+0800\n" +"PO-Revision-Date: 2019-11-11 08:18+0800\n" "Last-Translator: Simon Depiets <[email protected]>\n" "Language-Team: French <[email protected]>\n" "Language: fr\n" @@ -26,13 +26,13 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 sur %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" @@ -944,7 +944,7 @@ #: solid/devices/backends/upower/upowerdevice.cpp:144 msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Lithium Polymer" -msgstr "Polymère de lithium " +msgstr "Polymère de lithium" #: solid/devices/backends/upower/upowerdevice.cpp:146 msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/ga/solid5_qt.po new/solid-5.66.0/po/ga/solid5_qt.po --- old/solid-5.65.0/po/ga/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/ga/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -18,13 +18,13 @@ "3 : 4\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/gd/solid5_qt.po new/solid-5.66.0/po/gd/solid5_qt.po --- old/solid-5.65.0/po/gd/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/gd/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -15,13 +15,13 @@ "X-Generator: Virtaal 0.7.1\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/gl/solid5_qt.po new/solid-5.66.0/po/gl/solid5_qt.po --- old/solid-5.65.0/po/gl/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/gl/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -21,13 +21,13 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 en %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/he/solid5_qt.po new/solid-5.66.0/po/he/solid5_qt.po --- old/solid-5.65.0/po/he/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/he/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -17,13 +17,13 @@ "X-Generator: Zanata 3.9.6\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/hr/solid5_qt.po new/solid-5.66.0/po/hr/solid5_qt.po --- old/solid-5.65.0/po/hr/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/hr/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -25,13 +25,13 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/hu/solid5_qt.po new/solid-5.66.0/po/hu/solid5_qt.po --- old/solid-5.65.0/po/hu/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/hu/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -21,13 +21,13 @@ "X-Generator: Lokalize 20.03.70\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 itt: %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/ia/solid5_qt.po new/solid-5.66.0/po/ia/solid5_qt.po --- old/solid-5.65.0/po/ia/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/ia/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -1,15 +1,15 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# g.sora <[email protected]>, 2010, 2011, 2013, 2014, 2017. +# g.sora <[email protected]>, 2010, 2011, 2013, 2014, 2017, 2019. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2017-04-14 23:43+0100\n" -"Last-Translator: giovanni <[email protected]>\n" -"Language-Team: Interlingua <[email protected]>\n" +"PO-Revision-Date: 2019-12-24 22:45+0100\n" +"Last-Translator: Giovanni Sora <[email protected]>\n" +"Language-Team: Interlingua <[email protected]>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,30 +18,27 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" -msgstr "" +msgstr "%1 sur %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" -msgstr "" +msgstr "%1 (%2)" #: solid/devices/backends/fstab/fstabmanager.cpp:96 msgctxt "Solid::Backends::Fstab::FstabManager|" msgid "Filesystem Volumes" -msgstr "" +msgstr "Volumines de systema de file" #: solid/devices/backends/fstab/fstabmanager.cpp:97 -#, fuzzy -#| msgctxt "Solid::Backends::UDev::UDevManager|" -#| msgid "Devices declared in your system" msgctxt "Solid::Backends::Fstab::FstabManager|" msgid "Mountable filesystems declared in your system" -msgstr "Dispositivos declarate in tu systema" +msgstr "Systema de file montabile declarate in tu systema" #: solid/devices/backends/hal/haldevice.cpp:63 #, qt-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/id/solid5_qt.po new/solid-5.66.0/po/id/solid5_qt.po --- old/solid-5.65.0/po/id/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/id/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -13,13 +13,13 @@ "X-Generator: Lokalize 19.08.1\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 pada %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/is/solid5_qt.po new/solid-5.66.0/po/is/solid5_qt.po --- old/solid-5.65.0/po/is/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/is/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -20,13 +20,13 @@ "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/it/solid5_qt.po new/solid-5.66.0/po/it/solid5_qt.po --- old/solid-5.65.0/po/it/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/it/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -19,13 +19,13 @@ "X-Qt-Contexts: true\n" "X-Generator: Lokalize 19.04.0\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 su %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/ja/solid5_qt.po new/solid-5.66.0/po/ja/solid5_qt.po --- old/solid-5.65.0/po/ja/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/ja/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -20,13 +20,13 @@ "X-Qt-Contexts: true\n" "X-Generator: Lokalize 19.04.2\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/kk/solid5_qt.po new/solid-5.66.0/po/kk/solid5_qt.po --- old/solid-5.65.0/po/kk/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/kk/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -19,13 +19,13 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/km/solid5_qt.po new/solid-5.66.0/po/km/solid5_qt.po --- old/solid-5.65.0/po/km/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/km/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -17,13 +17,13 @@ "X-Language: km-CM\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/ko/solid5_qt.po new/solid-5.66.0/po/ko/solid5_qt.po --- old/solid-5.65.0/po/ko/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/ko/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -18,13 +18,13 @@ "X-Qt-Contexts: true\n" "X-Generator: Lokalize 18.12.3\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%2의 %1" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/lt/solid5_qt.po new/solid-5.66.0/po/lt/solid5_qt.po --- old/solid-5.65.0/po/lt/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/lt/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -22,13 +22,13 @@ "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/lv/solid5_qt.po new/solid-5.66.0/po/lv/solid5_qt.po --- old/solid-5.65.0/po/lv/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/lv/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -22,13 +22,13 @@ "2);\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/ml/solid5_qt.po new/solid-5.66.0/po/ml/solid5_qt.po --- old/solid-5.65.0/po/ml/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/ml/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -19,13 +19,13 @@ "X-Generator: KBabel 1.11.4\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/mr/solid5_qt.po new/solid-5.66.0/po/mr/solid5_qt.po --- old/solid-5.65.0/po/mr/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/mr/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -18,13 +18,13 @@ "X-Generator: Lokalize 1.5\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/ms/solid5_qt.po new/solid-5.66.0/po/ms/solid5_qt.po --- old/solid-5.65.0/po/ms/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/ms/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -19,13 +19,13 @@ "Plural-Forms: nplurals=2; plural=1;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/nb/solid5_qt.po new/solid-5.66.0/po/nb/solid5_qt.po --- old/solid-5.65.0/po/nb/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/nb/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -21,13 +21,13 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 på %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/nds/solid5_qt.po new/solid-5.66.0/po/nds/solid5_qt.po --- old/solid-5.65.0/po/nds/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/nds/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -19,13 +19,13 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/nl/solid5_qt.po new/solid-5.66.0/po/nl/solid5_qt.po --- old/solid-5.65.0/po/nl/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/nl/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -18,13 +18,13 @@ "X-Generator: Lokalize 19.04.0\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 op %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/nn/solid5_qt.po new/solid-5.66.0/po/nn/solid5_qt.po --- old/solid-5.65.0/po/nn/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/nn/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -20,13 +20,13 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 på %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/pa/solid5_qt.po new/solid-5.66.0/po/pa/solid5_qt.po --- old/solid-5.65.0/po/pa/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/pa/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -18,13 +18,13 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%2 ਉੱਤੇ %1" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/pl/solid5_qt.po new/solid-5.66.0/po/pl/solid5_qt.po --- old/solid-5.65.0/po/pl/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/pl/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -21,13 +21,13 @@ "|| n%100>=20) ? 1 : 2);\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 na %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/pt/solid5_qt.po new/solid-5.66.0/po/pt/solid5_qt.po --- old/solid-5.65.0/po/pt/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/pt/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -17,13 +17,13 @@ "X-POFile-SpellExtra: acPlugged\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 em %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/pt_BR/solid5_qt.po new/solid-5.66.0/po/pt_BR/solid5_qt.po --- old/solid-5.65.0/po/pt_BR/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/pt_BR/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -20,13 +20,13 @@ "X-Generator: Lokalize 19.04.0\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 em %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/ro/solid5_qt.po new/solid-5.66.0/po/ro/solid5_qt.po --- old/solid-5.65.0/po/ro/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/ro/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -21,13 +21,13 @@ "20)) ? 1 : 2;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/ru/solid5_qt.po new/solid-5.66.0/po/ru/solid5_qt.po --- old/solid-5.65.0/po/ru/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/ru/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -24,13 +24,13 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 на %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/se/solid5_qt.po new/solid-5.66.0/po/se/solid5_qt.po --- old/solid-5.65.0/po/se/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/se/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -20,13 +20,13 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/sk/solid5_qt.po new/solid-5.66.0/po/sk/solid5_qt.po --- old/solid-5.65.0/po/sk/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/sk/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -18,13 +18,13 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 na %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/sl/solid5_qt.po new/solid-5.66.0/po/sl/solid5_qt.po --- old/solid-5.65.0/po/sl/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/sl/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -21,13 +21,13 @@ "%100==4 ? 3 : 0);\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 na %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/sv/solid5_qt.po new/solid-5.66.0/po/sv/solid5_qt.po --- old/solid-5.65.0/po/sv/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/sv/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -13,13 +13,13 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 på %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/ta/solid5_qt.po new/solid-5.66.0/po/ta/solid5_qt.po --- old/solid-5.65.0/po/ta/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/ta/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -18,13 +18,13 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/tg/solid5_qt.po new/solid-5.66.0/po/tg/solid5_qt.po --- old/solid-5.65.0/po/tg/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/tg/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -13,13 +13,13 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 19.04.3\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 дар %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/th/solid5_qt.po new/solid-5.66.0/po/th/solid5_qt.po --- old/solid-5.65.0/po/th/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/th/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -18,13 +18,13 @@ "X-Generator: Lokalize 1.1\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/tr/solid5_qt.po new/solid-5.66.0/po/tr/solid5_qt.po --- old/solid-5.65.0/po/tr/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/tr/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -24,13 +24,13 @@ "X-Generator: Lokalize 1.4\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%2 üzerinde %1" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/ug/solid5_qt.po new/solid-5.66.0/po/ug/solid5_qt.po --- old/solid-5.65.0/po/ug/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/ug/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -19,13 +19,13 @@ "X-Generator: Poedit 1.5.5\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/uk/solid5_qt.po new/solid-5.66.0/po/uk/solid5_qt.po --- old/solid-5.65.0/po/uk/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/uk/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -21,13 +21,13 @@ "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 на %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/zh_CN/solid5_qt.po new/solid-5.66.0/po/zh_CN/solid5_qt.po --- old/solid-5.65.0/po/zh_CN/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/zh_CN/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -23,13 +23,13 @@ "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-trunk/messages/frameworks/solid5_qt.pot\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%2 上的 %1" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/po/zh_TW/solid5_qt.po new/solid-5.66.0/po/zh_TW/solid5_qt.po --- old/solid-5.65.0/po/zh_TW/solid5_qt.po 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/po/zh_TW/solid5_qt.po 2020-01-04 11:16:42.000000000 +0100 @@ -12,7 +12,7 @@ "POT-Creation-Date: 2014-04-01 01:49+0000\n" "PO-Revision-Date: 2019-05-07 22:33+0800\n" "Last-Translator: pan93412 <[email protected]>\n" -"Language-Team: Chinese <[email protected]>\n" +"Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,13 +21,13 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" -#: solid/devices/backends/fstab/fstabdevice.cpp:83 +#: solid/devices/backends/fstab/fstabdevice.cpp:80 #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" msgstr "%1 於 %2" -#: solid/devices/backends/fstab/fstabdevice.cpp:86 +#: solid/devices/backends/fstab/fstabdevice.cpp:83 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/src/solid/CMakeLists.txt new/solid-5.66.0/src/solid/CMakeLists.txt --- old/solid-5.65.0/src/solid/CMakeLists.txt 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/src/solid/CMakeLists.txt 2020-01-04 11:16:42.000000000 +0100 @@ -30,7 +30,7 @@ target_link_libraries(KF5Solid PUBLIC Qt5::Core PRIVATE Qt5::Xml - Qt5::Widgets + Qt5::Gui ${solid_OPTIONAL_LIBS} ) if (TARGET Qt5::DBus) @@ -105,7 +105,7 @@ set_target_properties(KF5Solid_static PROPERTIES COMPILE_FLAGS -DSOLID_STATIC_DEFINE=1) target_link_libraries(KF5Solid_static PUBLIC Qt5::Core) - target_link_libraries(KF5Solid_static PRIVATE Qt5::Xml Qt5::Widgets ${solid_OPTIONAL_LIBS}) + target_link_libraries(KF5Solid_static PRIVATE Qt5::Xml Qt5::Gui ${solid_OPTIONAL_LIBS}) if (TARGET Qt5::DBus) target_link_libraries(KF5Solid_static PRIVATE Qt5::DBus) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/src/solid/devices/backends/fakehw/fakemanager.cpp new/solid-5.66.0/src/solid/devices/backends/fakehw/fakemanager.cpp --- old/solid-5.65.0/src/solid/devices/backends/fakehw/fakemanager.cpp 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/src/solid/devices/backends/fakehw/fakemanager.cpp 2020-01-04 11:16:42.000000000 +0100 @@ -192,19 +192,19 @@ { QFile machineFile(d->xmlFile); if (!machineFile.open(QIODevice::ReadOnly)) { - qWarning() << Q_FUNC_INFO << "Error while opening " << d->xmlFile << endl; + qWarning() << Q_FUNC_INFO << "Error while opening " << d->xmlFile; return; } QDomDocument fakeDocument; if (!fakeDocument.setContent(&machineFile)) { - qWarning() << Q_FUNC_INFO << "Error while creating the QDomDocument." << endl; + qWarning() << Q_FUNC_INFO << "Error while creating the QDomDocument."; machineFile.close(); return; } machineFile.close(); - qDebug() << Q_FUNC_INFO << "Parsing fake computer XML: " << d->xmlFile << endl; + qDebug() << Q_FUNC_INFO << "Parsing fake computer XML: " << d->xmlFile; QDomElement mainElement = fakeDocument.documentElement(); QDomNode node = mainElement.firstChild(); while (!node.isNull()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/src/solid/devices/backends/fstab/fstabdevice.cpp new/solid-5.66.0/src/solid/devices/backends/fstab/fstabdevice.cpp --- old/solid-5.65.0/src/solid/devices/backends/fstab/fstabdevice.cpp 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/src/solid/devices/backends/fstab/fstabdevice.cpp 2020-01-04 11:16:42.000000000 +0100 @@ -47,10 +47,7 @@ m_storageType = StorageType::NetworkShare; } else if (fstype.startsWith("nfs")) { m_vendor = m_device.left(m_device.indexOf(":/")); - m_product = m_device.mid(m_device.indexOf(":/") + 2); - if (m_product.isEmpty()) { - m_product = QStringLiteral("/"); - } + m_product = m_device.mid(m_device.indexOf(":/") + 1); m_storageType = StorageType::NetworkShare; } else if (fstype.startsWith("fuse.") || fstype == QLatin1String("overlay")) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/src/solid/devices/backends/fstab/fstabhandling.cpp new/solid-5.66.0/src/solid/devices/backends/fstab/fstabhandling.cpp --- old/solid-5.65.0/src/solid/devices/backends/fstab/fstabhandling.cpp 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/src/solid/devices/backends/fstab/fstabhandling.cpp 2020-01-04 11:16:42.000000000 +0100 @@ -225,9 +225,32 @@ _k_updateFstabMountPointsCache(); _k_updateMtabMountPointsCache(); - QStringList devices = globalFstabCache->localData().m_fstabCache.keys(); - devices += globalFstabCache->localData().m_mtabCache.keys(); - devices.removeDuplicates(); + QStringList devices = globalFstabCache->localData().m_mtabCache.keys(); + + // Ensure that regardless an fstab device ends with a slash + // it will match its eventual mounted device regardless whether or not its path + // ends with a slash + for (auto it = globalFstabCache->localData().m_fstabCache.constBegin(), + end = globalFstabCache->localData().m_fstabCache.constEnd(); + it != end; ++it) { + + auto device = it.key(); + // the device is already known + if (devices.contains(device)) { + continue; + } + + // deviceName will or won't end with / depending if device ended with one + QString deviceName = device; + if (deviceName.endsWith(QLatin1Char('/'))) { + deviceName.chop(1); + } else { + deviceName.append(QLatin1Char('/')); + } + if (!devices.contains(deviceName)) { + devices.append(device); + } + } return devices; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/src/solid/devices/backends/hal/halstorageaccess.cpp new/solid-5.66.0/src/solid/devices/backends/hal/halstorageaccess.cpp --- old/solid-5.65.0/src/solid/devices/backends/hal/halstorageaccess.cpp 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/src/solid/devices/backends/hal/halstorageaccess.cpp 2020-01-04 11:16:42.000000000 +0100 @@ -29,8 +29,8 @@ #include <QDBusConnection> #include <QDBusInterface> #include <QDBusReply> -#include <QApplication> -#include <QWidget> +#include <QGuiApplication> +#include <QWindow> #include <unistd.h> #include <stdlib.h> @@ -324,7 +324,7 @@ QDBusConnection::sessionBus().registerObject(m_lastReturnObject, this, QDBusConnection::ExportScriptableSlots); - QWidget *activeWindow = QApplication::activeWindow(); + auto activeWindow = QGuiApplication::focusWindow(); uint wId = 0; if (activeWindow != nullptr) { wId = (uint)activeWindow->winId(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp new/solid-5.66.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp --- old/solid-5.65.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp 2020-01-04 11:16:42.000000000 +0100 @@ -26,9 +26,9 @@ #include <QDomDocument> #include <QDBusConnection> #include <QDir> -#include <QApplication> -#include <QWidget> #include <QDBusInterface> +#include <QGuiApplication> +#include <QWindow> using namespace Solid::Backends::UDisks2; @@ -349,7 +349,9 @@ QDBusConnection::sessionBus().registerObject(m_lastReturnObject, this, QDBusConnection::ExportScriptableSlots); - QWidget *activeWindow = QApplication::activeWindow(); + // TODO: this only works on X11, Wayland doesn't have global window ids. + // Passing ids to other processes doesn't make any sense + auto activeWindow = QGuiApplication::focusWindow(); uint wId = 0; if (activeWindow != nullptr) { wId = (uint)activeWindow->winId(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/src/solid/devices/frontend/devicemanager.cpp new/solid-5.66.0/src/solid/devices/frontend/devicemanager.cpp --- old/solid-5.65.0/src/solid/devices/frontend/devicemanager.cpp 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/src/solid/devices/frontend/devicemanager.cpp 2020-01-04 11:16:42.000000000 +0100 @@ -143,7 +143,7 @@ continue; } - QList<DeviceInterface::Type> sortedTypes = supportedTypes.toList(); + QList<DeviceInterface::Type> sortedTypes = supportedTypes.values(); std::sort(sortedTypes.begin(), sortedTypes.end()); Q_FOREACH (DeviceInterface::Type type, sortedTypes) { udis += backend->devicesFromQuery(parentUdi, type); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.65.0/src/solid/power/backends/freedesktop/fdinhibition.cpp new/solid-5.66.0/src/solid/power/backends/freedesktop/fdinhibition.cpp --- old/solid-5.65.0/src/solid/power/backends/freedesktop/fdinhibition.cpp 2019-12-07 22:50:54.000000000 +0100 +++ new/solid-5.66.0/src/solid/power/backends/freedesktop/fdinhibition.cpp 2020-01-04 11:16:42.000000000 +0100 @@ -25,7 +25,7 @@ #include <QVariant> #include <QDebug> -#include <QApplication> +#include <QCoreApplication> #include <QDBusConnection> #include <QDBusUnixFileDescriptor> @@ -55,7 +55,7 @@ QList<QVariant> args; args << LogindInhibitionArgument::fromPowerState(m_inhibitions) - << qApp->applicationName() + << QCoreApplication::instance()->applicationName() << m_description << QStringLiteral("block"); msg.setArguments(args);
