Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2018-03-20 21:44:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcoreaddons (Old) and /work/SRC/openSUSE:Factory/.kcoreaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcoreaddons" Tue Mar 20 21:44:02 2018 rev:54 rq:586814 version:5.44.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcoreaddons/kcoreaddons.changes 2018-02-16 21:29:12.944559644 +0100 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new/kcoreaddons.changes 2018-03-20 21:45:07.094609878 +0100 @@ -1,0 +2,18 @@ +Mon Mar 12 23:29:41 CET 2018 - lbeltr...@kde.org + +- Update to 5.44.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.44.0.php +- Changes since 5.43.0: + * Cleanup m_inotify_wd_to_entry before invalidating Entry pointers (kde#390214) + * kcoreaddons_add_plugin: remove effectless OBJECT_DEPENDS on json file + * Help automoc to find metadata JSON files referenced in the code + * kcoreaddons_desktop_to_json: note the generated file in the build log + * Bump shared-mime-info to 1.3 + * Use override keyword here + * Introduce K_PLUGIN_CLASS_WITH_JSON + * KUrlMimeData: port to QStringLiteral + * Increase timeout in the hope of fixing test failure on the CI + +------------------------------------------------------------------- Old: ---- kcoreaddons-5.43.0.tar.xz New: ---- kcoreaddons-5.44.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.8lHqxB/_old 2018-03-20 21:45:07.862582238 +0100 +++ /var/tmp/diff_new_pack.8lHqxB/_new 2018-03-20 21:45:07.886581374 +0100 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5CoreAddons5 -%define _tar_path 5.43 +%define _tar_path 5.44 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kcoreaddons -Version: 5.43.0 +Version: 5.44.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_tar_path} @@ -40,7 +40,7 @@ Recommends: %{name}-lang = %{version} %endif Summary: Utilities for core application functionality and accessing the OS -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz ++++++ kcoreaddons-5.43.0.tar.xz -> kcoreaddons-5.44.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/CMakeLists.txt new/kcoreaddons-5.44.0/CMakeLists.txt --- old/kcoreaddons-5.43.0/CMakeLists.txt 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/CMakeLists.txt 2018-03-06 09:12:31.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.43.0") # handled by release scripts +set(KF5_VERSION "5.44.0") # handled by release scripts project(KCoreAddons VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.43.0 NO_MODULE) +find_package(ECM 5.44.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) @@ -29,12 +29,27 @@ set(REQUIRED_QT_VERSION 5.7.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core) -set(KCoreAddons_AUTOMOC_MACRO_NAMES "K_PLUGIN_FACTORY_WITH_JSON" "K_PLUGIN_FACTORY") +# TODO: create ECM macro for automoc & json things +set(KCoreAddons_AUTOMOC_MACRO_NAMES "K_PLUGIN_FACTORY_WITH_JSON" "K_PLUGIN_FACTORY" "K_PLUGIN_CLASS_WITH_JSON") if(NOT CMAKE_VERSION VERSION_LESS "3.10.0") # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros. # 3.10+ lets us provide more macro names that require automoc. list(APPEND CMAKE_AUTOMOC_MACRO_NAMES ${KCoreAddons_AUTOMOC_MACRO_NAMES}) endif() +set(KCoreAddons_AUTOMOC_MACRO_NAMES_WITH_JSON_ARG2 "K_PLUGIN_FACTORY_WITH_JSON" "K_PLUGIN_CLASS_WITH_JSON") +if(NOT CMAKE_VERSION VERSION_LESS "3.9.0") + # CMake's automoc needs help to find names of plugin metadata files in case Q_PLUGIN_METADATA + # is indirectly used via other C++ preprocessor macros + # 3.9+ lets us provide some filter rule pairs (keyword, regexp) to match the names of such files + # in the plain text of the sources. See AUTOMOC_DEPEND_FILTERS docs for details. + foreach(macro_name ${KCoreAddons_AUTOMOC_MACRO_NAMES_WITH_JSON_ARG2}) + list(APPEND CMAKE_AUTOMOC_DEPEND_FILTERS + "${macro_name}" + "[\n^][ \t]*${macro_name}[ \t\n]*\\([^,]*,[ \t\n]*\"([^\"]+)\"" + ) + endforeach() +endif() + find_package(Threads) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/KF5CoreAddonsConfig.cmake.in new/kcoreaddons-5.44.0/KF5CoreAddonsConfig.cmake.in --- old/kcoreaddons-5.43.0/KF5CoreAddonsConfig.cmake.in 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/KF5CoreAddonsConfig.cmake.in 2018-03-06 09:12:31.000000000 +0100 @@ -9,6 +9,15 @@ # 3.10+ lets us provide more macro names that require automoc. list(APPEND CMAKE_AUTOMOC_MACRO_NAMES @KCoreAddons_AUTOMOC_MACRO_NAMES@) endif() +if(NOT CMAKE_VERSION VERSION_LESS "3.9.0") + foreach(macro_name @KCoreAddons_AUTOMOC_MACRO_NAMES_WITH_JSON_ARG2@) + # tell automoc how to find names of plugin metadata files + list(APPEND CMAKE_AUTOMOC_DEPEND_FILTERS + "${macro_name}" + "[\n^][ \t]*${macro_name}[ \t\n]*\\([^,]*,[ \t\n]*\"([^\"]+)\"" + ) + endforeach() +endif() if(CMAKE_CROSSCOMPILING AND KF5_HOST_TOOLING) find_file(TARGETSFILE KF5CoreAddons/KF5CoreAddonsToolingTargets.cmake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/KF5CoreAddonsMacros.cmake new/kcoreaddons-5.44.0/KF5CoreAddonsMacros.cmake --- old/kcoreaddons-5.43.0/KF5CoreAddonsMacros.cmake 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/KF5CoreAddonsMacros.cmake 2018-03-06 09:12:31.000000000 +0100 @@ -58,11 +58,13 @@ endforeach() endif() + file(RELATIVE_PATH relativejson ${CMAKE_CURRENT_BINARY_DIR} ${json}) add_custom_command( OUTPUT ${json} COMMAND ${command} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${desktop} + COMMENT "Generating ${relativejson}" ) set_property(TARGET ${target} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${json}) endfunction() @@ -119,23 +121,6 @@ endif() get_filename_component(json "${KCA_ADD_PLUGIN_JSON}" REALPATH) - # ensure we recompile the corresponding object files when the json file changes - set(dependent_sources ) - foreach(source ${KCA_ADD_PLUGIN_SOURCES}) - get_filename_component(source "${source}" REALPATH) - if(EXISTS "${source}") - file(STRINGS "${source}" match REGEX "K_PLUGIN_FACTORY_WITH_JSON") - if(match) - list(APPEND dependent_sources "${source}") - endif() - endif() - endforeach() - if(NOT dependent_sources) - # fallback to all sources - better safe than sorry... - set(dependent_sources ${KCA_ADD_PLUGIN_SOURCES}) - endif() - set_property(SOURCE ${dependent_sources} APPEND PROPERTY OBJECT_DEPENDS ${json}) - add_library(${plugin} MODULE ${KCA_ADD_PLUGIN_SOURCES}) set_property(TARGET ${plugin} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${json}) # If find_package(ECM 5.38) or higher is called, output the plugin in a INSTALL_NAMESPACE subfolder. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/autotests/kdirwatch_unittest.cpp new/kcoreaddons-5.44.0/autotests/kdirwatch_unittest.cpp --- old/kcoreaddons-5.43.0/autotests/kdirwatch_unittest.cpp 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/autotests/kdirwatch_unittest.cpp 2018-03-06 09:12:31.000000000 +0100 @@ -836,7 +836,7 @@ QSignalSpy spy(&watch, &KDirWatch::dirty); QBENCHMARK { createDirectoryTree(dir.path()); - QTRY_COMPARE_WITH_TIMEOUT(spy.count(), numFiles, s_maxTries * 50); + QTRY_COMPARE_WITH_TIMEOUT(spy.count(), numFiles, s_maxTries * 50 * 2); spy.clear(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/autotests/kjobtest.h new/kcoreaddons-5.44.0/autotests/kjobtest.h --- old/kcoreaddons-5.43.0/autotests/kjobtest.h 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/autotests/kjobtest.h 2018-03-06 09:12:31.000000000 +0100 @@ -30,7 +30,7 @@ Q_OBJECT public: TestJob(); - virtual ~TestJob(); + ~TestJob() override; void start() Q_DECL_OVERRIDE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/po/en_GB/kcoreaddons5_qt.po new/kcoreaddons-5.44.0/po/en_GB/kcoreaddons5_qt.po --- old/kcoreaddons-5.43.0/po/en_GB/kcoreaddons5_qt.po 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/po/en_GB/kcoreaddons5_qt.po 2018-03-06 09:12:31.000000000 +0100 @@ -2,15 +2,15 @@ # Malcolm Hunter <malcolm.hun...@gmx.co.uk>, 2002,2003,2004, 2005, 2006, 2007, 2008, 2009. # Jonathan Riddell <kde-en...@jriddell.org>, 2003. # Andrew Coles <andrew_co...@yahoo.co.uk>, 2004, 2005, 2009, 2010. -# Steve Allewell <steve.allew...@gmail.com>, 2014, 2015, 2016, 2017. +# Steve Allewell <steve.allew...@gmail.com>, 2014, 2015, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2017-11-26 15:56+0000\n" +"PO-Revision-Date: 2018-01-01 15:06+0000\n" "Last-Translator: Steve Allewell <steve.allew...@gmail.com>\n" -"Language-Team: British English <kde-i18n-...@kde.org>\n" +"Language-Team: British English <kde-l10n-en...@kde.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -114,7 +114,7 @@ #: lib/kaboutdata.cpp:376 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2.1" -msgstr "GNU Lesser General Public License Version 2.1" +msgstr "GNU Lesser General Public Licence Version 2.1" #: lib/kaboutdata.cpp:380 msgctxt "KAboutLicense|@item license" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/po/id/kcoreaddons5_qt.po new/kcoreaddons-5.44.0/po/id/kcoreaddons5_qt.po --- old/kcoreaddons-5.43.0/po/id/kcoreaddons5_qt.po 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/po/id/kcoreaddons5_qt.po 2018-03-06 09:12:31.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2018-01-26 08:03+0700\n" +"PO-Revision-Date: 2018-03-02 22:16+0700\n" "Last-Translator: Wantoyo <wanto...@gmail.com>\n" "Language-Team: Indonesian <kde-i18n-...@kde.org>\n" "Language: id\n" @@ -120,7 +120,7 @@ #: lib/kaboutdata.cpp:380 msgctxt "KAboutLicense|@item license" msgid "Custom" -msgstr "Suai" +msgstr "Suaian" #: lib/kaboutdata.cpp:383 msgctxt "KAboutLicense|@item license" @@ -153,12 +153,12 @@ #: lib/kaboutdata.cpp:1162 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." -msgstr "Nama file dasar dari seluruh desktop untuk aplikasi ini." +msgstr "Nama fail dasar dari seluruh desktop untuk aplikasi ini." #: lib/kaboutdata.cpp:1163 msgctxt "KAboutData CLI|" msgid "file name" -msgstr "nama file" +msgstr "nama fail " #: lib/kaboutdata.cpp:1172 msgctxt "KAboutData CLI|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/po/nb/kcoreaddons5_qt.po new/kcoreaddons-5.44.0/po/nb/kcoreaddons5_qt.po --- old/kcoreaddons-5.43.0/po/nb/kcoreaddons5_qt.po 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/po/nb/kcoreaddons5_qt.po 2018-03-06 09:12:31.000000000 +0100 @@ -132,57 +132,52 @@ msgid "Not specified" msgstr "Ikke oppgitt" -#: lib/kaboutdata.cpp:918 +#: lib/kaboutdata.cpp:932 msgctxt "KAboutData|replace this with information about your translation team" msgid "" "<p>KDE is translated into many languages thanks to the work of the " "translation teams all over the world.</p><p>For more information on KDE " -"internationalization visit <a href=\"http://l10n.kde.org\";>http://l10n.kde."; +"internationalization visit <a href=\"https://l10n.kde.org\";>https://l10n.kde."; "org</a></p>" msgstr "" -"<p>KDE er oversatt til mange språk, takket være arbeidet til de mange " -"oversettelses-lagene over hele verden.</p><p>For mer informasjon om KDEs " -"internasjonalisering besøk <a href=\"http://l10n.kde.org\";> http://l10n.kde."; -"org</a> eller <a href=\"http://www.skolelinux.org/no\";>http://www.skolelinux."; -"org/no</a></p>" -#: lib/kaboutdata.cpp:1145 +#: lib/kaboutdata.cpp:1159 msgctxt "KAboutData CLI|" msgid "Show author information." msgstr "Vis forfatterinformasjon" -#: lib/kaboutdata.cpp:1146 +#: lib/kaboutdata.cpp:1160 msgctxt "KAboutData CLI|" msgid "Show license information." msgstr "Viser lisensinformasjon" -#: lib/kaboutdata.cpp:1148 +#: lib/kaboutdata.cpp:1162 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." msgstr "" -#: lib/kaboutdata.cpp:1149 +#: lib/kaboutdata.cpp:1163 msgctxt "KAboutData CLI|" msgid "file name" msgstr "" -#: lib/kaboutdata.cpp:1158 +#: lib/kaboutdata.cpp:1172 msgctxt "KAboutData CLI|" msgid "This application was written by somebody who wants to remain anonymous." msgstr "Dette programmet ble skrevet av noen som ønsker å være anonyme." -#: lib/kaboutdata.cpp:1160 +#: lib/kaboutdata.cpp:1174 #, qt-format msgctxt "KAboutData CLI|" msgid "%1 was written by:" msgstr "" -#: lib/kaboutdata.cpp:1171 +#: lib/kaboutdata.cpp:1185 msgctxt "KAboutData CLI|" -msgid "Please use http://bugs.kde.org to report bugs." -msgstr "Bruk http://bugs.kde.org for å rapportere feil." +msgid "Please use https://bugs.kde.org to report bugs." +msgstr "" -#: lib/kaboutdata.cpp:1173 +#: lib/kaboutdata.cpp:1187 #, qt-format msgctxt "KAboutData CLI|" msgid "Please report bugs to %1." @@ -481,35 +476,45 @@ #, fuzzy, qt-format msgctxt "KFormat|" msgid "%n millisecond(s)" -msgstr "%n millisekund(er)" +msgid_plural "%n millisecond(s)" +msgstr[0] "%n millisekund(er)" +msgstr[1] "%n millisekund(er)" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:306 #, fuzzy, qt-format msgctxt "KFormat|" msgid "%n day(s)" -msgstr "%n dag(er)" +msgid_plural "%n day(s)" +msgstr[0] "%n dag(er)" +msgstr[1] "%n dag(er)" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:311 #, fuzzy, qt-format msgctxt "KFormat|" msgid "%n hour(s)" -msgstr "%n time(r)" +msgid_plural "%n hour(s)" +msgstr[0] "%n time(r)" +msgstr[1] "%n time(r)" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:316 #, fuzzy, qt-format msgctxt "KFormat|" msgid "%n minute(s)" -msgstr "%n minutt(er)" +msgid_plural "%n minute(s)" +msgstr[0] "%n minutt(er)" +msgstr[1] "%n minutt(er)" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:321 #, fuzzy, qt-format msgctxt "KFormat|" msgid "%n second(s)" -msgstr "%n sekund(er)" +msgid_plural "%n second(s)" +msgstr[0] "%n sekund(er)" +msgstr[1] "%n sekund(er)" #. @item:intext days and hours. This uses the previous item:intext messages. If this does not fit the grammar of your language please contact the i18n team to solve the problem #. ---------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/po/zh_CN/kcoreaddons5_qt.po new/kcoreaddons-5.44.0/po/zh_CN/kcoreaddons5_qt.po --- old/kcoreaddons-5.43.0/po/zh_CN/kcoreaddons5_qt.po 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/po/zh_CN/kcoreaddons5_qt.po 2018-03-06 09:12:31.000000000 +0100 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-02-01 07:11-0500\n" +"PO-Revision-Date: 2018-02-28 02:23-0500\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/src/lib/io/kdirwatch.cpp new/kcoreaddons-5.44.0/src/lib/io/kdirwatch.cpp --- old/kcoreaddons-5.43.0/src/lib/io/kdirwatch.cpp 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/src/lib/io/kdirwatch.cpp 2018-03-06 09:12:31.000000000 +0100 @@ -1075,6 +1075,9 @@ << " [" << (instance ? instance->objectName() : QString()) << "]"; } QString p = e->path; // take a copy, QMap::remove takes a reference and deletes, since e points into the map +#if HAVE_SYS_INOTIFY_H + m_inotify_wd_to_entry.remove(e->wd); +#endif m_mapEntries.remove(p); // <e> not valid any more } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/src/lib/io/kprocess.h new/kcoreaddons-5.44.0/src/lib/io/kprocess.h --- old/kcoreaddons-5.43.0/src/lib/io/kprocess.h 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/src/lib/io/kprocess.h 2018-03-06 09:12:31.000000000 +0100 @@ -75,7 +75,7 @@ /** * Destructor */ - virtual ~KProcess(); + ~KProcess() override; /** * Set how to handle the output channels of the child process. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/src/lib/io/kurlmimedata.cpp new/kcoreaddons-5.44.0/src/lib/io/kurlmimedata.cpp --- old/kcoreaddons-5.43.0/src/lib/io/kurlmimedata.cpp 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/src/lib/io/kurlmimedata.cpp 2018-03-06 09:12:31.000000000 +0100 @@ -21,7 +21,7 @@ #include <QStringList> #include <QMimeData> -static const char s_kdeUriListMime[] = "application/x-kde4-urilist"; // keep this name "kde4" for compat. +static QString kdeUriListMime() { return QStringLiteral("application/x-kde4-urilist"); } // keep this name "kde4" for compat. static QByteArray uriListData(const QList<QUrl> &urls) { @@ -41,7 +41,7 @@ mimeData->setUrls(mostLocalUrls); // set text/uri-list and text/plain // Export the real KIO urls as a kde-specific mimetype - mimeData->setData(QString::fromLatin1(s_kdeUriListMime), uriListData(urls)); + mimeData->setData(kdeUriListMime(), uriListData(urls)); } void KUrlMimeData::setMetaData(const MetaDataMap &metaData, QMimeData *mimeData) @@ -58,13 +58,13 @@ QStringList KUrlMimeData::mimeDataTypes() { - return QStringList() << QString::fromLatin1(s_kdeUriListMime) << QStringLiteral("text/uri-list"); + return QStringList() << kdeUriListMime() << QStringLiteral("text/uri-list"); } static QList<QUrl> extractKdeUriList(const QMimeData *mimeData) { QList<QUrl> uris; - const QByteArray ba = mimeData->data(QString::fromLatin1(s_kdeUriListMime)); + const QByteArray ba = mimeData->data(kdeUriListMime()); // Code from qmimedata.cpp QList<QByteArray> urls = ba.split('\n'); for (int i = 0; i < urls.size(); ++i) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/src/lib/jobs/kcompositejob.h new/kcoreaddons-5.44.0/src/lib/jobs/kcompositejob.h --- old/kcoreaddons-5.43.0/src/lib/jobs/kcompositejob.h 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/src/lib/jobs/kcompositejob.h 2018-03-06 09:12:31.000000000 +0100 @@ -47,7 +47,7 @@ /** * Destroys a KCompositeJob object. */ - virtual ~KCompositeJob(); + ~KCompositeJob() override; protected: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/src/lib/jobs/kjob.h new/kcoreaddons-5.44.0/src/lib/jobs/kjob.h --- old/kcoreaddons-5.43.0/src/lib/jobs/kjob.h 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/src/lib/jobs/kjob.h 2018-03-06 09:12:31.000000000 +0100 @@ -115,7 +115,7 @@ /** * Destroys a KJob object. */ - virtual ~KJob(); + ~KJob() override; /** * Attach a UI delegate to this job. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/src/lib/jobs/kjobtrackerinterface.h new/kcoreaddons-5.44.0/src/lib/jobs/kjobtrackerinterface.h --- old/kcoreaddons-5.43.0/src/lib/jobs/kjobtrackerinterface.h 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/src/lib/jobs/kjobtrackerinterface.h 2018-03-06 09:12:31.000000000 +0100 @@ -46,7 +46,7 @@ /** * Destroys a KJobTrackerInterface */ - virtual ~KJobTrackerInterface(); + ~KJobTrackerInterface() override; public Q_SLOTS: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/src/lib/jobs/kjobuidelegate.h new/kcoreaddons-5.44.0/src/lib/jobs/kjobuidelegate.h --- old/kcoreaddons-5.43.0/src/lib/jobs/kjobuidelegate.h 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/src/lib/jobs/kjobuidelegate.h 2018-03-06 09:12:31.000000000 +0100 @@ -51,7 +51,7 @@ /** * Destroys a KJobUiDelegate. */ - virtual ~KJobUiDelegate(); + ~KJobUiDelegate() override; protected: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/src/lib/plugin/kpluginfactory.h new/kcoreaddons-5.44.0/src/lib/plugin/kpluginfactory.h --- old/kcoreaddons-5.43.0/src/lib/plugin/kpluginfactory.h 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/src/lib/plugin/kpluginfactory.h 2018-03-06 09:12:31.000000000 +0100 @@ -175,6 +175,44 @@ /** * \relates KPluginFactory * + * Create a KPluginFactory subclass and export it as the root plugin object with + * JSON metadata. + * + * This macro does the same as K_PLUGIN_FACTORY_WITH_JSON, but you only have to pass the class name and the json file. + * The factory name and registerPlugin call are deduced from the class name. + * + * @code + * #include <myplugin.moc> + * @endcode + * in the same source file when that one has the name "myplugin.cpp". + * + * Example: + * \code + * #include <KPluginFactory> + * #include <plugininterface.h> + * + * class MyPlugin : public PluginInterface + * { + * public: + * MyPlugin(QObject *parent, const QVariantList &args) + * : PluginInterface(parent) + * {} + * }; + * + * K_PLUGIN_CLASS_WITH_JSON(MyPlugin, "metadata.json") + * + * #include <myplugin.moc> + * \endcode + * + * \see K_PLUGIN_FACTORY_WITH_JSON + * + * @since 5.44 + */ +#define K_PLUGIN_CLASS_WITH_JSON(classname, jsonFile) K_PLUGIN_FACTORY_WITH_JSON(classname ## Factory, jsonFile, registerPlugin<classname >();) + +/** + * \relates KPluginFactory + * * K_PLUGIN_FACTORY_DECLARATION declares the KPluginFactory subclass. This macro * can be used in a header file. * @@ -302,7 +340,7 @@ /** * This destroys the PluginFactory. */ - virtual ~KPluginFactory(); + ~KPluginFactory() override; /** * Use this method to create an object. It will try to create an object which inherits diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/src/mimetypes/CMakeLists.txt new/kcoreaddons-5.44.0/src/mimetypes/CMakeLists.txt --- old/kcoreaddons-5.43.0/src/mimetypes/CMakeLists.txt 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/src/mimetypes/CMakeLists.txt 2018-03-06 09:12:31.000000000 +0100 @@ -1,8 +1,8 @@ # always install the mime-types install(FILES kde5.xml DESTINATION ${KDE_INSTALL_MIMEDIR}) -# for KDE frameworks 5 we require at least version 0.70 -find_package(SharedMimeInfo 0.70) +# for KDE frameworks 5 we require at least version 1.3 +find_package(SharedMimeInfo 1.3) set_package_properties(SharedMimeInfo PROPERTIES TYPE OPTIONAL PURPOSE "Allows KDE applications to determine file types" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.43.0/src/mimetypes/kde5.xml new/kcoreaddons-5.44.0/src/mimetypes/kde5.xml --- old/kcoreaddons-5.43.0/src/mimetypes/kde5.xml 2018-02-05 12:58:30.000000000 +0100 +++ new/kcoreaddons-5.44.0/src/mimetypes/kde5.xml 2018-03-06 09:12:31.000000000 +0100 @@ -21,65 +21,6 @@ in s-m-i means that someone receiving such a file by email or from a website will at least get a description of what it is, even without kcoreaddons installed.--> <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info";> - <mime-type type="application/metalink+xml"> - <sub-class-of type="application/xml"/> - <comment>Metalink download</comment> - <comment xml:lang="ar">تنزيل Metalink</comment> - <comment xml:lang="bs">metalink preuzimanje</comment> - <comment xml:lang="ca">Baixada de «Metalink»</comment> - <comment xml:lang="ca@valencia">Baixada de «Metalink»</comment> - <comment xml:lang="cs">Stahování Metalink</comment> - <comment xml:lang="da">Metalink-download</comment> - <comment xml:lang="de">Metalink-Download</comment> - <comment xml:lang="el">Λήψη Metalink</comment> - <comment xml:lang="en_GB">Metalink download</comment> - <comment xml:lang="es">Descarga Metalink</comment> - <comment xml:lang="et">Metalinki allalaadimine</comment> - <comment xml:lang="eu">Metalik deskarga</comment> - <comment xml:lang="fi">Metalink-lataus</comment> - <comment xml:lang="fr">Téléchargement par méta-liens</comment> - <comment xml:lang="ga">Íosluchtú Metalink</comment> - <comment xml:lang="gd">luchdadh a-nuas meata-cheangail</comment> - <comment xml:lang="gl">Descarga de Metalink</comment> - <comment xml:lang="hr">Metalink preuzimanje</comment> - <comment xml:lang="hu">Metalinkletöltés</comment> - <comment xml:lang="ia">Discargamento de Metalink</comment> - <comment xml:lang="id">Metalink unduh</comment> - <comment xml:lang="is">Metalink niðurhal</comment> - <comment xml:lang="it">scaricamento Metalink</comment> - <comment xml:lang="ja">Metalink ダウンロード</comment> - <comment xml:lang="kk">Метасілтеме</comment> - <comment xml:lang="km">ទាញយកតំណមេតា</comment> - <comment xml:lang="ko">Metalink 다운로드</comment> - <comment xml:lang="lt">Metalink atsiuntimas</comment> - <comment xml:lang="lv">Metalink lejupielāde</comment> - <comment xml:lang="ml">മെറ്റാ-കണ്ണി ഡൌണ്ലോഡ്</comment> - <comment xml:lang="mr">मेटालिंक डाउनलोड</comment> - <comment xml:lang="nb">Metalink nedlasting</comment> - <comment xml:lang="nds">Metalink-Daalladen</comment> - <comment xml:lang="nl">Download van metalink</comment> - <comment xml:lang="nn">Metalink-nedlasting</comment> - <comment xml:lang="pa">ਮੇਟਾਲਿੰਕ ਡਾਊਨਲੋਡ</comment> - <comment xml:lang="pl">Pobieranie Metalink</comment> - <comment xml:lang="pt">Transferência do Metalink</comment> - <comment xml:lang="pt_BR">Download do metalink</comment> - <comment xml:lang="ro">Descărcare Metalink</comment> - <comment xml:lang="ru">метассылка</comment> - <comment xml:lang="se">Metalink-viežžan</comment> - <comment xml:lang="sk">Sťahovanie Metalink</comment> - <comment xml:lang="sl">Prejem Metalink</comment> - <comment xml:lang="sr">металинк преузимање</comment> - <comment xml:lang="sr@ijekavian">металинк преузимање</comment> - <comment xml:lang="sr@ijekavianlatin">metalink preuzimanje</comment> - <comment xml:lang="sr@latin">metalink preuzimanje</comment> - <comment xml:lang="sv">Metalink-nerladdning</comment> - <comment xml:lang="tr">Metalink indirmesi</comment> - <comment xml:lang="ug">Metalink چۈشۈرۈش</comment> - <comment xml:lang="uk">метапосилання отримання</comment> - <comment xml:lang="zh_CN">Metalink 下载</comment> - <comment xml:lang="zh_TW">Metalink 下載</comment> - <glob pattern="*.metalink"/> - </mime-type> <mime-type type="application/relaxng"> <sub-class-of type="application/xml"/> <comment>RELAX NG</comment> @@ -633,124 +574,6 @@ <comment xml:lang="zh_TW">Kugar 報告樣本</comment> <glob pattern="*.kut"/> </mime-type> - <mime-type type="application/x-mimearchive"> - <comment>mime encapsulated web archive</comment> - <comment xml:lang="ar">نوع ملفات يغلف أرشف ويب</comment> - <comment xml:lang="bs">MIME učaurena veb arhiva</comment> - <comment xml:lang="ca">Arxiu web encapsulat en MIME</comment> - <comment xml:lang="ca@valencia">Arxiu web encapsulat en MIME</comment> - <comment xml:lang="cs">web archív zapouzdřený v MIME</comment> - <comment xml:lang="da">MIME-indkapslet webarkiv</comment> - <comment xml:lang="de">MIME-ummanteltes Web-Archiv</comment> - <comment xml:lang="el">εσωκλειόμενο μήνυμα mime αρχειοθήκης ιστοσελίδας</comment> - <comment xml:lang="en_GB">mime encapsulated web archive</comment> - <comment xml:lang="es">archivo web encapsulado mime</comment> - <comment xml:lang="et">MIME kapselduses veebiarhiiv</comment> - <comment xml:lang="eu">mime kaptsulatutako web artxiboa</comment> - <comment xml:lang="fi">MIME-kapseloitu web-arkisto</comment> - <comment xml:lang="fr">Archive Web encapsulée MIME</comment> - <comment xml:lang="ga">cartlann Ghréasáin cuachta mar MIME</comment> - <comment xml:lang="gd">tasglann-lìn capslaichte mime</comment> - <comment xml:lang="gl">arquivo web mime encapsulado</comment> - <comment xml:lang="hr">mime enkapsulirana mrežna arhiva</comment> - <comment xml:lang="hu">MIME formátumú webes archívum</comment> - <comment xml:lang="ia">mime : archivo web encapsulate</comment> - <comment xml:lang="id">Arsip web tertudung mime</comment> - <comment xml:lang="is">MIME-formað vefskráasafn</comment> - <comment xml:lang="it">archivio Web incapsulato in MIME</comment> - <comment xml:lang="ja">mime カプセル化された web アーカイブ</comment> - <comment xml:lang="kk">MIME инкапсуляцияланған веб-архиві</comment> - <comment xml:lang="km">ប័ណ្ណសារបណ្ដាញដែលបានស្រោបរបស់ mime</comment> - <comment xml:lang="ko">MIME 캡슐화된 웹 압축 파일</comment> - <comment xml:lang="lt">į mime įdėtas žiniatinklio archyvas</comment> - <comment xml:lang="lv">mime iekapsilēts tīmekļa arhīvs</comment> - <comment xml:lang="ml">സംക്ഷേപിച്ച മൈം വെബ് ശേഖരം</comment> - <comment xml:lang="mr">mime असलेला वेब संग्रह</comment> - <comment xml:lang="nb">mime-innkapslet nettarkiv</comment> - <comment xml:lang="nds">MIME-inkapselt Nettarchiev</comment> - <comment xml:lang="nl">mime-ingekapseld webarchief</comment> - <comment xml:lang="nn">MIME-innkapsla vevarkiv</comment> - <comment xml:lang="pl">archiwum WWW w kodowaniu MIME</comment> - <comment xml:lang="pt">pacote Web encapsulado em MIME</comment> - <comment xml:lang="pt_BR">Arquivo web encapsulado em MIME</comment> - <comment xml:lang="ro">arhivă web încapsulată mime</comment> - <comment xml:lang="ru">веб-архив</comment> - <comment xml:lang="sk">web archív zapuzdrený v MIME</comment> - <comment xml:lang="sl">spletni arhiv vložen po MIME</comment> - <comment xml:lang="sr">МИМЕ учаурена веб архива</comment> - <comment xml:lang="sr@ijekavian">МИМЕ учаурена веб архива</comment> - <comment xml:lang="sr@ijekavianlatin">MIME učaurena veb arhiva</comment> - <comment xml:lang="sr@latin">MIME učaurena veb arhiva</comment> - <comment xml:lang="sv">MIME-inkapslat webbarkiv</comment> - <comment xml:lang="tr">kapsüllenmiş web arşivi</comment> - <comment xml:lang="ug">كاپسۇللانغان mime تور بەت ئارخىپى</comment> - <comment xml:lang="uk">інкапсульований вебархів MIME</comment> - <comment xml:lang="zh_CN">封装 MIME 的网页归档</comment> - <comment xml:lang="zh_TW">MIME 封裝網頁歸檔</comment> - <glob pattern="*.mhtml"/> - <glob pattern="*.mht"/> - </mime-type> - <mime-type type="application/x-nzb"> <!-- fdo #10029, released in s-m-i 0.91 --> - <comment>NewzBin usenet index</comment> - <comment xml:lang="ar">فهرس يوزنت NewzBin</comment> - <comment xml:lang="bs">NewzBinov indeks Useneta</comment> - <comment xml:lang="ca">Índex usenet NewzBin</comment> - <comment xml:lang="ca@valencia">Índex usenet NewzBin</comment> - <comment xml:lang="cs">Index NewzBin usenet</comment> - <comment xml:lang="da">NewzBin usenet-indeks</comment> - <comment xml:lang="de">NewzBin-Usenet-Index</comment> - <comment xml:lang="el">Ευρετήριο νέων NewzBin</comment> - <comment xml:lang="en_GB">NewzBin usenet index</comment> - <comment xml:lang="es">Índice usenet de NewzBin</comment> - <comment xml:lang="et">NewzBini useneti indeks</comment> - <comment xml:lang="eu">NewzBin usenet indizea</comment> - <comment xml:lang="fi">NewzBin-keskusteluryhmäindeksi</comment> - <comment xml:lang="fr">Index Usenet de NewzBin</comment> - <comment xml:lang="ga">Innéacs usenet NewzBin</comment> - <comment xml:lang="gd">clàr-innse usenet NewzBin</comment> - <comment xml:lang="gl">Índice da usenet de NewsBin</comment> - <comment xml:lang="hr">NewzBin usenet indeks</comment> - <comment xml:lang="hu">NewzBin Usenet-index</comment> - <comment xml:lang="ia">Indice usenet de NewzBiz</comment> - <comment xml:lang="id">Indeks usenet NewzBin</comment> - <comment xml:lang="is">NewzBin usenet yfirlit</comment> - <comment xml:lang="it">indice Usenet di NewzBin</comment> - <comment xml:lang="ja">NewzBin usenet インデックス</comment> - <comment xml:lang="kk">NewzBin usenet индексі</comment> - <comment xml:lang="km">លិបិក្រមបណ្ដាញប្រើរបស់ NewzBin</comment> - <comment xml:lang="ko">NewzBin 유즈넷 인덱스</comment> - <comment xml:lang="lt">NewzBin usenet indeksas</comment> - <comment xml:lang="lv">NewzBin usenet indekss</comment> - <comment xml:lang="ml">ന്യൂസ്ബിന് യൂസ്നെറ്റ് സൂചിക</comment> - <comment xml:lang="mr">न्युझबिन युजनेट अनुक्रमणिका </comment> - <comment xml:lang="nb">NewzBin usenet index</comment> - <comment xml:lang="nds">NewzBin-Usenet-Index</comment> - <comment xml:lang="nl">NewzBin-usenet-index</comment> - <comment xml:lang="nn">NewzBin-temagruppeindeks</comment> - <comment xml:lang="pl">Indeks grup dyskusyjnych NewzBin</comment> - <comment xml:lang="pt">Índice de notícias do NewzBin</comment> - <comment xml:lang="pt_BR">Índice de notícias do NewzBin</comment> - <comment xml:lang="ro">index usenet NewzBin</comment> - <comment xml:lang="ru">индекс Usenet для NewzBin</comment> - <comment xml:lang="se">NewzBin usenetindeaksa</comment> - <comment xml:lang="sk">NewzBin usenet index</comment> - <comment xml:lang="sl">Kazalo novičarskih skupin NewzBin</comment> - <comment xml:lang="sr">Њузбинов индекс јузнета</comment> - <comment xml:lang="sr@ijekavian">Њузбинов индекс јузнета</comment> - <comment xml:lang="sr@ijekavianlatin">NewzBinov indeks Useneta</comment> - <comment xml:lang="sr@latin">NewzBinov indeks Useneta</comment> - <comment xml:lang="sv">Newzbin-diskussionsgruppindex</comment> - <comment xml:lang="tr">NewzBin usenet dizini</comment> - <comment xml:lang="ug">NewzBin usenet ئىندېكس</comment> - <comment xml:lang="uk">покажчик usenet NewzBin</comment> - <comment xml:lang="zh_CN">NewzBin usenet 索引</comment> - <comment xml:lang="zh_TW">NewzBin usenet 索引</comment> - <sub-class-of type="application/xml"/> - <magic priority="80"> - <match type="string" value="<nzb" offset="0:256"/> - </magic> - <glob pattern="*.nzb"/> - </mime-type> <mime-type type="application/x-plasma"> <sub-class-of type="application/zip"/> <comment>plasmoid</comment> @@ -1286,68 +1109,6 @@ <comment xml:lang="zh_TW">W3C XML 機制</comment> <glob pattern="*.xsd"/> </mime-type> - <mime-type type="audio/aac"> <!-- in fdo s-m-i since 1.1 --> - <comment>AAC sound</comment> - <comment xml:lang="ar">صوت AAC</comment> - <comment xml:lang="ast">Soníu AAC</comment> - <comment xml:lang="bs">AAC zvuk</comment> - <comment xml:lang="ca">So AAC</comment> - <comment xml:lang="ca@valencia">So AAC</comment> - <comment xml:lang="cs">Zvuk AAC</comment> - <comment xml:lang="da">AAC-lyd</comment> - <comment xml:lang="de">AAC-Audio</comment> - <comment xml:lang="el">Ήχος ACC</comment> - <comment xml:lang="en_GB">AAC sound</comment> - <comment xml:lang="es">Sonido AAC</comment> - <comment xml:lang="et">AAC helifail</comment> - <comment xml:lang="eu">AAC soinua</comment> - <comment xml:lang="fi">AAC-ääni</comment> - <comment xml:lang="fr">Son AAC</comment> - <comment xml:lang="ga">Fuaim AAC</comment> - <comment xml:lang="gd">fuaim AAC</comment> - <comment xml:lang="gl">Son AAC</comment> - <comment xml:lang="hr">AAC zvuk</comment> - <comment xml:lang="hu">AAC-hang</comment> - <comment xml:lang="ia">Sono AAC</comment> - <comment xml:lang="id">Suara AAC</comment> - <comment xml:lang="is">AAC hljóð</comment> - <comment xml:lang="it">suono AAC</comment> - <comment xml:lang="ja">AAC サウンド</comment> - <comment xml:lang="kk">AAC дыбысы</comment> - <comment xml:lang="km">សំឡេង AAC</comment> - <comment xml:lang="ko">AAC 소리</comment> - <comment xml:lang="lt">AAC garsas</comment> - <comment xml:lang="lv">AAC skaņa</comment> - <comment xml:lang="ml">എഎസി ശബ്ദം</comment> - <comment xml:lang="mr">AAC आवाज</comment> - <comment xml:lang="ms">Bunyi AAC </comment> - <comment xml:lang="nb">AAC-lyd</comment> - <comment xml:lang="nds">AAC-Kläng</comment> - <comment xml:lang="nl">AAC-geluid</comment> - <comment xml:lang="nn">AAC-lyd</comment> - <comment xml:lang="pa">AAC ਸਾਊਂਡ</comment> - <comment xml:lang="pl">Dźwięk AAC</comment> - <comment xml:lang="pt">Som AAC</comment> - <comment xml:lang="pt_BR">Som AAC</comment> - <comment xml:lang="ro">Sunet AAC</comment> - <comment xml:lang="ru">аудио AAC</comment> - <comment xml:lang="se">AAC-jietna</comment> - <comment xml:lang="sk">Zvuk AAC</comment> - <comment xml:lang="sl">Zvok AAC</comment> - <comment xml:lang="sq">AAC sound</comment> - <comment xml:lang="sr">ААЦ звук</comment> - <comment xml:lang="sr@ijekavian">ААЦ звук</comment> - <comment xml:lang="sr@ijekavianlatin">AAC zvuk</comment> - <comment xml:lang="sr@latin">AAC zvuk</comment> - <comment xml:lang="sv">AAC-ljud</comment> - <comment xml:lang="th">เสียงรูปแบบ AAC</comment> - <comment xml:lang="tr">AAC sesi</comment> - <comment xml:lang="ug">AAC ئاۋاز</comment> - <comment xml:lang="uk">звук у форматі AAC</comment> - <comment xml:lang="zh_CN">AAC 声音</comment> - <comment xml:lang="zh_TW">AAC 音效</comment> - <glob pattern="*.aac"/> - </mime-type> <mime-type type="audio/x-pn-realaudio-plugin"> <!-- Not a type of file, so will not go to shared-mime-info --> <comment>RealAudio plugin file</comment> <comment xml:lang="ar">ملف ملحق RealAudio</comment> @@ -1630,7 +1391,7 @@ <comment xml:lang="hr">Intelova® heksadecimalna objektna datoteka</comment> <comment xml:lang="hu">Intel®-féle hexadecimális objektumfájl</comment> <comment xml:lang="ia">File objecto hexadecimal de Intel(c)</comment> - <comment xml:lang="id">File obyek heksadesimal Intel®</comment> + <comment xml:lang="id">File objek heksadesimal Intel®</comment> <comment xml:lang="is">Intel® hexadesimal hlutaskrá</comment> <comment xml:lang="it">file oggetto esadecimale Intel®</comment> <comment xml:lang="ja">Intel® 十六進オブジェクトファイル</comment> @@ -1691,7 +1452,7 @@ <comment xml:lang="hr">Kate lista od priključka učitavača liste datoteka</comment> <comment xml:lang="hu">Kate-listafájl (fájllista vagy bővítménylista)</comment> <comment xml:lang="ia">Kate: Lista de plugin de cargator de lista de file</comment> - <comment xml:lang="id">Daftar file Kate pemuat daftar plugin</comment> + <comment xml:lang="id">Daftar fail Kate pemuat daftar plugin</comment> <comment xml:lang="is">Kate skráahleðsluíforritalisti</comment> <comment xml:lang="it">elenco delle estensioni del caricatore di elenchi di file di Kate</comment> <comment xml:lang="ja">Kate ファイルリストローダプラグインリスト</comment> @@ -1727,66 +1488,6 @@ <comment xml:lang="zh_TW">Kate 檔案清單載入器外掛程式清單</comment> <glob pattern="*.katefl"/> </mime-type> - <mime-type type="text/x-objchdr"> <!-- ??? Useless, without glob or magic. Remove? --> - <sub-class-of type="text/x-csrc"/> - <comment>Objective-C header</comment> - <comment xml:lang="ar">ترويسة Objective-C</comment> - <comment xml:lang="ast">Testera d'Objective-C</comment> - <comment xml:lang="bs">Objective‑c zaglavlje</comment> - <comment xml:lang="ca">Capçalera Objective-C</comment> - <comment xml:lang="ca@valencia">Capçalera Objective-C</comment> - <comment xml:lang="cs">Objective-C hlavička</comment> - <comment xml:lang="da">Objective-C header-fil</comment> - <comment xml:lang="de">Objective-C-Header</comment> - <comment xml:lang="el">Κεφαλίδα Objective-C</comment> - <comment xml:lang="en_GB">Objective-C header</comment> - <comment xml:lang="es">Cabecera de Objective-C</comment> - <comment xml:lang="et">Objective-C päis</comment> - <comment xml:lang="eu">Objective-C goiburua</comment> - <comment xml:lang="fi">Objective C -otsake</comment> - <comment xml:lang="fr">En-tête « Objective-C »</comment> - <comment xml:lang="ga">Ceanntásc Objective-C</comment> - <comment xml:lang="gd">bann-cinn Objective-C</comment> - <comment xml:lang="gl">Cabeceira de Objective-C</comment> - <comment xml:lang="hr">Objective-C zaglavlje</comment> - <comment xml:lang="hu">Objective-C-fejlécfájl</comment> - <comment xml:lang="ia">Capite de Objective-C</comment> - <comment xml:lang="id">Tajuk Objective-C</comment> - <comment xml:lang="is">Objective-C haus</comment> - <comment xml:lang="it">intestazione Objective-C</comment> - <comment xml:lang="ja">Objective-C ヘッダ</comment> - <comment xml:lang="kk">Objective-C айдар файлы</comment> - <comment xml:lang="km">ក្បាល Objective-C</comment> - <comment xml:lang="ko">오브젝티브-C 헤더</comment> - <comment xml:lang="lt">Objektinio-C antraštė</comment> - <comment xml:lang="lv">Objective-C galvene</comment> - <comment xml:lang="ml">ഒബ്ജക്ടീവ്-സി ഹെഡര്</comment> - <comment xml:lang="mr">ओब्जेक्टिव्ह-सी हेडर</comment> - <comment xml:lang="nb">Objective-C hodefil</comment> - <comment xml:lang="nds">"Objective-C"-Koppdatei</comment> - <comment xml:lang="nl">Objective-C-header</comment> - <comment xml:lang="nn">Objective-C-deklarasjonsfil</comment> - <comment xml:lang="pa">Objective-C ਹੈੱਡਰ</comment> - <comment xml:lang="pl">Plik nagłówkowy Objective-C</comment> - <comment xml:lang="pt">Ficheiro de inclusão em Objective-C</comment> - <comment xml:lang="pt_BR">Cabeçalho em Objetive-C</comment> - <comment xml:lang="ro">antet Objective-C</comment> - <comment xml:lang="ru">заголовочный файл Objective-C</comment> - <comment xml:lang="se">Objective-C oaivefiila</comment> - <comment xml:lang="sk">Hlavičkový súbor Objektového C</comment> - <comment xml:lang="sl">Glava za Objective-C</comment> - <comment xml:lang="sr">објектив‑Ц заглавље</comment> - <comment xml:lang="sr@ijekavian">објектив‑Ц заглавље</comment> - <comment xml:lang="sr@ijekavianlatin">Objective‑c zaglavlje</comment> - <comment xml:lang="sr@latin">Objective‑c zaglavlje</comment> - <comment xml:lang="sv">Objective-C deklarationsfil</comment> - <comment xml:lang="th">แฟ้มส่วนหัวภาษา Objective-C</comment> - <comment xml:lang="tr">Objective-C başlığı</comment> - <comment xml:lang="ug">Objective-C باشى</comment> - <comment xml:lang="uk">файл заголовків Objective-C</comment> - <comment xml:lang="zh_CN">Objective-C 头文件</comment> - <comment xml:lang="zh_TW">Objective-C 標頭檔</comment> - </mime-type> <mime-type type="text/vnd.abc"> <!-- fdo #6578, needs update --> <sub-class-of type="text/plain"/> <comment>abc musical notation file</comment> @@ -3456,69 +3157,6 @@ <glob pattern="*.wmp"/> </mime-type> - <!-- http://www4.wiwiss.fu-berlin.de/bizer/TriG/ --> - <!-- Used in Nepomuk to encode almost all ontologies --> - <mime-type xmlns="http://www.freedesktop.org/standards/shared-mime-info"; type="application/x-trig"> <!-- fdo #32182, released in s-m-i 1.1 --> - <comment>TriG RDF document</comment> - <comment xml:lang="ar">وثيقة TriG RDF</comment> - <comment xml:lang="ast">Documentu RDF de TriG</comment> - <comment xml:lang="bs">TriG RDF dokument</comment> - <comment xml:lang="ca">Document RDF del TriG</comment> - <comment xml:lang="ca@valencia">Document RDF del TriG</comment> - <comment xml:lang="cs">Dokument TriG RDF</comment> - <comment xml:lang="da">TriG RDF-dokument</comment> - <comment xml:lang="de">TriG-RDF-Dokument</comment> - <comment xml:lang="el">Έγγραφο TriG RDF</comment> - <comment xml:lang="en_GB">TriG RDF document</comment> - <comment xml:lang="es">Documento RDF TriG</comment> - <comment xml:lang="et">TriG RDF-dokument</comment> - <comment xml:lang="eu">TriG RDF dokumentua</comment> - <comment xml:lang="fi">TriG RDF -tiedosto</comment> - <comment xml:lang="fr">Document « RDF TriG »</comment> - <comment xml:lang="ga">Cáipéis RDF TriG</comment> - <comment xml:lang="gd">sgrìobhainn TriG RDF</comment> - <comment xml:lang="gl">Documento RDF de TriG</comment> - <comment xml:lang="hr">TriG RDF dokument</comment> - <comment xml:lang="hu">TriG RDF-dokumentum</comment> - <comment xml:lang="ia">Documento RDF de TRiG</comment> - <comment xml:lang="id">Dokumen TriG RDF</comment> - <comment xml:lang="is">TriG RDF skjal</comment> - <comment xml:lang="it">documento TriG RDF</comment> - <comment xml:lang="ja">TriG RDF 文書</comment> - <comment xml:lang="kk">TriG RDF құжаты</comment> - <comment xml:lang="km">ឯកសារ TriG RDF</comment> - <comment xml:lang="ko">TriG RDF 문서</comment> - <comment xml:lang="lt">TriG RDF dokumentas</comment> - <comment xml:lang="lv">TriG RDF dokuments</comment> - <comment xml:lang="ml">ട്രിഗ് ആര് ഡി എഫ് രേഖ</comment> - <comment xml:lang="mr">ट्रीग RDF दस्तऐवज</comment> - <comment xml:lang="nb">TriG RDF-dokument</comment> - <comment xml:lang="nds">RDF-Dokment för TriG</comment> - <comment xml:lang="nl">TriG RDF-document</comment> - <comment xml:lang="nn">TriG RDF-dokument</comment> - <comment xml:lang="pa">TriG RDF ਡੌਕੂਮੈਂਟ</comment> - <comment xml:lang="pl">Dokument TriG RDF</comment> - <comment xml:lang="pt">Documento RDF do TriG</comment> - <comment xml:lang="pt_BR">Documento RDF do TriG</comment> - <comment xml:lang="ro">Document RDF TriG</comment> - <comment xml:lang="ru">документ TriG RDF</comment> - <comment xml:lang="se">TriG RDF-dokumeanta</comment> - <comment xml:lang="sk">Dokument TriG RDF</comment> - <comment xml:lang="sl">Dokument TriG RDF</comment> - <comment xml:lang="sq">TriG RDF dokument</comment> - <comment xml:lang="sr">три‑Г РДФ документ</comment> - <comment xml:lang="sr@ijekavian">три‑Г РДФ документ</comment> - <comment xml:lang="sr@ijekavianlatin">TriG RDF dokument</comment> - <comment xml:lang="sr@latin">TriG RDF dokument</comment> - <comment xml:lang="sv">Trig RDF-dokument</comment> - <comment xml:lang="tr">TriG RDF belgesi</comment> - <comment xml:lang="ug">TriG RDF پۈتۈك</comment> - <comment xml:lang="uk">документ RDF TriG</comment> - <comment xml:lang="zh_CN">TriG RDF 文档</comment> - <comment xml:lang="zh_TW">TriG RDF 文件</comment> - <sub-class-of type="text/plain" /> - <glob pattern="*.trig" /> - </mime-type> <!-- http://www.dajobe.org/2004/01/turtle/#sec-mime --> <!-- Important: the SPARQL RDF query lanaguge uses turtle encoding for graph patterns. --> <mime-type xmlns="http://www.freedesktop.org/standards/shared-mime-info"; type="application/x-turtle"> <!-- fdo #18089, but not in followup #32812 --> @@ -3643,7 +3281,7 @@ </magic> <glob pattern="*.pic"/> </mime-type> - <mime-type type="text/x-qml"> <!-- in fdo smi > 0.90; *.qmltypes and *.qmlproject added to fdo smi > 1.3 --> + <mime-type type="text/x-qml"> <!-- *.qmltypes and *.qmlproject added to fdo smi > 1.3 --> <comment>Qt Markup Language file</comment> <comment xml:lang="ar">ملف لغة الوصف Qt</comment> <comment xml:lang="ast">Ficheru de llinguax de marques Qt</comment> @@ -3704,125 +3342,6 @@ <glob pattern="*.qmltypes"/> <glob pattern="*.qmlproject"/> </mime-type> - <mime-type type="application/x-mobipocket-ebook"> <!-- in fdo s-m-i since 0.91 --> - <comment>Mobipocket e-book</comment> - <comment xml:lang="ar">كتاب إلكتروني Mobipocket</comment> - <comment xml:lang="ast">Llibru electrónicu Mobipocket</comment> - <comment xml:lang="bs">Mobipocket e-book</comment> - <comment xml:lang="ca">Llibre electrònic Mobipocket</comment> - <comment xml:lang="ca@valencia">Llibre electrònic Mobipocket</comment> - <comment xml:lang="cs"> E-Book Mobipocket</comment> - <comment xml:lang="da">Mobipocket e-bog</comment> - <comment xml:lang="de">Mobipocket-e-book</comment> - <comment xml:lang="el">Ηλ. βιβλίο Mobipocket</comment> - <comment xml:lang="en_GB">Mobipocket e-book</comment> - <comment xml:lang="es">Libro electrónico Mobipocket</comment> - <comment xml:lang="et">Mobipocketi e-raamat</comment> - <comment xml:lang="eu">Mobipocket liburu elektronikoa (e-book)</comment> - <comment xml:lang="fi">Mobipocket-e-kirja</comment> - <comment xml:lang="fr">Livre électronique « Mobipocket »</comment> - <comment xml:lang="ga">Ríomhleabhar Mobipocket</comment> - <comment xml:lang="gd">leabhar-d Mobipocket</comment> - <comment xml:lang="gl">Libro electrónico Mobipocket</comment> - <comment xml:lang="hr">E-knjiga u Mobipocketu</comment> - <comment xml:lang="hu">Mobipocket e-book</comment> - <comment xml:lang="ia">Mobipocket e-book</comment> - <comment xml:lang="id">E-book Mobipocket</comment> - <comment xml:lang="is">Mobipocket rafbók</comment> - <comment xml:lang="it">Libro elettronico Mobipocket</comment> - <comment xml:lang="kk">Mobipocket эл.кітабі</comment> - <comment xml:lang="km">Mobipocket e-book</comment> - <comment xml:lang="ko">Mobipocket 전자책</comment> - <comment xml:lang="lt">Mobipocket e-knyga</comment> - <comment xml:lang="lv">Mobipocket e-grāmata</comment> - <comment xml:lang="mr">मोबीपॉकेट इ-पुस्तक</comment> - <comment xml:lang="nb">Mobipocket e-bok</comment> - <comment xml:lang="nds">E-Book för Mobipocket</comment> - <comment xml:lang="nl">Mobipocket e-book</comment> - <comment xml:lang="nn">Mobipocket e-bøk</comment> - <comment xml:lang="pl">Mobipocket e-book</comment> - <comment xml:lang="pt">E-Book do Mobipocket</comment> - <comment xml:lang="pt_BR">E-book do Mobipocket</comment> - <comment xml:lang="ro">Carte digitală Mobipocket</comment> - <comment xml:lang="ru">электронная книга Mobipocket</comment> - <comment xml:lang="se">Mobipocket e-girji</comment> - <comment xml:lang="sk">Elektronická kniha Mobipocket</comment> - <comment xml:lang="sl">E-knjiga Mobipocket</comment> - <comment xml:lang="sr">Мобипокетова е‑књига</comment> - <comment xml:lang="sr@ijekavian">Мобипокетова е‑књига</comment> - <comment xml:lang="sr@ijekavianlatin">Mobipocketova e‑knjiga</comment> - <comment xml:lang="sr@latin">Mobipocketova e‑knjiga</comment> - <comment xml:lang="sv">Mobipocket e-bok</comment> - <comment xml:lang="tr">Mobipocket e-kitap</comment> - <comment xml:lang="ug">Mobipocket ئې-كىتاب</comment> - <comment xml:lang="uk">електронна книга Mobipocket</comment> - <comment xml:lang="zh_CN">Mobipocket 电子书</comment> - <comment xml:lang="zh_TW">Mobipocket e-book</comment> - <sub-class-of type="application/vnd.palm"/> - <generic-icon name="x-office-document"/> - <glob pattern="*.mobi"/> - <glob pattern="*.prc" /> - <magic priority="30"> - <!-- This also matches AportisDoc, so lower the priority and prefer extension --> - <match type="string" offset="60" value="TEXtREAd" /> - </magic> - <magic priority="80"> - <match type="string" offset="60" value="BOOKMOBI" /> - </magic> - </mime-type> - <!-- Released since s-m-i 1.3, remove when we can depend on it --> - <mime-type type="image/webp"> - <comment>WebP image</comment> - <comment xml:lang="ast">Imaxe WebP</comment> - <comment xml:lang="ca">Imatge WebP</comment> - <comment xml:lang="ca@valencia">Imatge WebP</comment> - <comment xml:lang="cs">Obrázek WebP</comment> - <comment xml:lang="da">WebP-billede</comment> - <comment xml:lang="de">WebP-Bild</comment> - <comment xml:lang="el">Εικόνα WebP</comment> - <comment xml:lang="en_GB">WebP image</comment> - <comment xml:lang="es">Imagen WebP</comment> - <comment xml:lang="et">WebP pilt</comment> - <comment xml:lang="eu">WebP irudia</comment> - <comment xml:lang="fi">WebP-kuva</comment> - <comment xml:lang="fr">Image WebP</comment> - <comment xml:lang="gd">dealbh WebP</comment> - <comment xml:lang="gl">Imaxe WebP</comment> - <comment xml:lang="hu">WebP-kép</comment> - <comment xml:lang="ia">Imagine de WebP</comment> - <comment xml:lang="id">Citra WebP</comment> - <comment xml:lang="it">immagine WebP</comment> - <comment xml:lang="ko">WebP 그림</comment> - <comment xml:lang="lt">WebP paveikslėlis</comment> - <comment xml:lang="mr">WebP प्रतिमा</comment> - <comment xml:lang="nb">WebP-bilde</comment> - <comment xml:lang="nds">WebP-Bild</comment> - <comment xml:lang="nl">WebP-image</comment> - <comment xml:lang="nn">WebP-bilete</comment> - <comment xml:lang="pa">WebP ਚਿੱਤਰ</comment> - <comment xml:lang="pl">Obraz WebP</comment> - <comment xml:lang="pt">Imagem WebP</comment> - <comment xml:lang="pt_BR">Imagem WebP</comment> - <comment xml:lang="ro">Imagine WebP</comment> - <comment xml:lang="ru">изображение WebP</comment> - <comment xml:lang="sk">WebP obrázok</comment> - <comment xml:lang="sl">Slika WebP</comment> - <comment xml:lang="sr">вебП слика</comment> - <comment xml:lang="sr@ijekavian">вебП слика</comment> - <comment xml:lang="sr@ijekavianlatin">WebP slika</comment> - <comment xml:lang="sr@latin">WebP slika</comment> - <comment xml:lang="sv">WebP-bild</comment> - <comment xml:lang="tr">WebP resmi</comment> - <comment xml:lang="uk">зображення WebP</comment> - <comment xml:lang="zh_CN">WebP 图像</comment> - <comment xml:lang="zh_TW">WebP 影像</comment> - <magic priority="50"> - <match type="string" value="RIFF" offset="0"> - <match type="string" value="WEBP" offset="8"/> - </match> - </magic> - <glob pattern="*.webp"/> - </mime-type> <mime-type type="application/vnd.kde.kcfg"> <comment>KConfigXT Configuration Options</comment> <comment xml:lang="ca">Opcions de configuració del KConfigXT</comment> @@ -3834,10 +3353,11 @@ <comment xml:lang="fi">KConfigXT Configuration Options</comment> <comment xml:lang="fr">Options de configuration de KConfigXT</comment> <comment xml:lang="gl">Opcións de configuración de KConfigXT</comment> - <comment xml:lang="id">Pilihan Konfigurasi KConfigXT</comment> + <comment xml:lang="id">Opsi Konfigurasi KConfigXT</comment> <comment xml:lang="it">Opzioni di configurazione KConfigXT</comment> <comment xml:lang="ko">KConfigXT 설정 옵션</comment> <comment xml:lang="nl">Configuratie-opties van KConfigXT</comment> + <comment xml:lang="nn">KConfigXT-oppsett</comment> <comment xml:lang="pl">Opcje KConfigXT</comment> <comment xml:lang="pt">Opções de Configuração do KConfigXT</comment> <comment xml:lang="pt_BR">Opções de configuração do KConfigXT</comment> @@ -3850,6 +3370,7 @@ <comment xml:lang="sv">KConfigXT-inställningsalternativ</comment> <comment xml:lang="uk">параметри налаштування KConfigXT</comment> <comment xml:lang="zh_CN">KConfigXT 配置选项</comment> + <comment xml:lang="zh_TW">KConfigXT 設定選項</comment> <generic-icon name="application-xml"/> <!-- placeholder until there is an own icon --> <sub-class-of type="application/xml"/> <magic priority="80"> @@ -3869,10 +3390,11 @@ <comment xml:lang="fi">KConfigXT Code Generation Options</comment> <comment xml:lang="fr">Options de génération de code de KConfigXT</comment> <comment xml:lang="gl">Opcións de xeración de código de KConfigXT</comment> - <comment xml:lang="id">Pilihan Penghasilan Kode KConfigXT</comment> + <comment xml:lang="id">Opsi Penghasilan Kode KConfigXT</comment> <comment xml:lang="it">Opzioni di generazione codice KConfigXT</comment> <comment xml:lang="ko">KConfigXT 코드 생성 옵션</comment> <comment xml:lang="nl">Codegeneratie-opties van KConfigXT</comment> + <comment xml:lang="nn">KConfigXT-kodegeneringsval</comment> <comment xml:lang="pl">Opcje tworzenia kodu KConfigXT</comment> <comment xml:lang="pt">Opções de Geração de Código do KConfigXT</comment> <comment xml:lang="pt_BR">Opções de geração de código do KConfigXT</comment> @@ -3885,6 +3407,7 @@ <comment xml:lang="sv">KConfigXT-kodgenereringsalternativ</comment> <comment xml:lang="uk">параметри створення коду KConfigXT</comment> <comment xml:lang="zh_CN">KConfigXT 代码生成选项</comment> + <comment xml:lang="zh_TW">KConfigXT 代碼產生選項</comment> <generic-icon name="text-plain"/> <sub-class-of type="text/plain"/> <glob pattern="*.kcfgc"/> @@ -3904,6 +3427,7 @@ <comment xml:lang="it">Dichiarazione UI KXMLGUI</comment> <comment xml:lang="ko">KXMLGUI UI 선언</comment> <comment xml:lang="nl">Declaratie van KXMLGUI UI</comment> + <comment xml:lang="nn">KXMLGUI UI-deklarasjon</comment> <comment xml:lang="pl">Dklaracja KXMLGUI UI</comment> <comment xml:lang="pt">Declaração de UI do KXMLGUI</comment> <comment xml:lang="pt_BR">Declaração UI do KXMLGUI</comment> @@ -3916,6 +3440,7 @@ <comment xml:lang="sv">KXMLGUI-användargränssnittsdeklaration</comment> <comment xml:lang="uk">оголошення інтерфейсу KXMLGUI</comment> <comment xml:lang="zh_CN">KXMLGUI 用户界面声明</comment> + <comment xml:lang="zh_TW">KXMLGUI UI 宣告</comment> <generic-icon name="application-xml"/> <!-- placeholder until there is an own icon --> <sub-class-of type="application/xml"/> <magic priority="80"> @@ -3940,6 +3465,7 @@ <comment xml:lang="it">Dichiarazione KNotification</comment> <comment xml:lang="ko">KNotification 선언</comment> <comment xml:lang="nl">Declaratie van KNotification</comment> + <comment xml:lang="nn">KNotification-deklarasjon</comment> <comment xml:lang="pl">Deklaracja KNotification</comment> <comment xml:lang="pt">Declaração do KNotification</comment> <comment xml:lang="pt_BR">Declaração do KNotification</comment> @@ -3952,6 +3478,7 @@ <comment xml:lang="sv">KNotification-deklaration</comment> <comment xml:lang="uk">оголошення KNotification</comment> <comment xml:lang="zh_CN">Knotification 声明</comment> + <comment xml:lang="zh_TW">KNotification 宣告</comment> <generic-icon name="text-plain"/> <!-- placeholder until there is an own icon --> <sub-class-of type="text/plain"/> <glob pattern="*.notifyrc"/>
