Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2018-11-14 14:32:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcoreaddons (Old) and /work/SRC/openSUSE:Factory/.kcoreaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcoreaddons" Wed Nov 14 14:32:11 2018 rev:62 rq:648501 version:5.52.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcoreaddons/kcoreaddons.changes 2018-10-22 11:10:07.871933822 +0200 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new/kcoreaddons.changes 2018-11-14 14:32:34.827373518 +0100 @@ -1,0 +2,13 @@ +Sun Nov 11 19:48:03 UTC 2018 - lbeltr...@kde.org + +- Update to 5.52.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.52.0.php +- Changes since 5.51.0: + * autotests: repair "detecting hardlink change" with stat/qfswatch + * Minor: Use nullptr + * Add to categories files. Use new syntax + * Use qEnvironmentVariableIntValue + +------------------------------------------------------------------- Old: ---- kcoreaddons-5.51.0.tar.xz New: ---- kcoreaddons-5.52.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.O8nYsQ/_old 2018-11-14 14:32:36.059372321 +0100 +++ /var/tmp/diff_new_pack.O8nYsQ/_new 2018-11-14 14:32:36.063372318 +0100 @@ -17,14 +17,14 @@ %define lname libKF5CoreAddons5 -%define _tar_path 5.51 +%define _tar_path 5.52 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kcoreaddons -Version: 5.51.0 +Version: 5.52.0 Release: 0 Summary: Utilities for core application functionality and accessing the OS License: LGPL-2.1-or-later @@ -41,8 +41,8 @@ Requires: shared-mime-info %if %{with lang} BuildRequires: cmake(Qt5LinguistTools) >= 5.6.0 -Recommends: %{name}-lang = %{version} %endif +Recommends: %{name}-lang = %{version} %description KCoreAddons provides classes built on top of QtCore to perform various tasks @@ -115,6 +115,7 @@ %license COPYING* %doc README* %{_kf5_libdir}/libKF5CoreAddons.so.* +%{_kf5_debugdir}/kcoreaddons.categories %files devel %{_kf5_bindir}/desktoptojson ++++++ kcoreaddons-5.51.0.tar.xz -> kcoreaddons-5.52.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.51.0/CMakeLists.txt new/kcoreaddons-5.52.0/CMakeLists.txt --- old/kcoreaddons-5.51.0/CMakeLists.txt 2018-10-08 10:11:36.000000000 +0200 +++ new/kcoreaddons-5.52.0/CMakeLists.txt 2018-11-03 18:59:12.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.51.0") # handled by release scripts +set(KF5_VERSION "5.52.0") # handled by release scripts project(KCoreAddons VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.51.0 NO_MODULE) +find_package(ECM 5.52.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) @@ -78,7 +78,7 @@ kde_enable_exceptions() -add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) + #add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) @@ -118,4 +118,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) +install(FILES kcoreaddons.categories DESTINATION ${KDE_INSTALL_CONFDIR}) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.51.0/autotests/kdirwatch_unittest.cpp new/kcoreaddons-5.52.0/autotests/kdirwatch_unittest.cpp --- old/kcoreaddons-5.51.0/autotests/kdirwatch_unittest.cpp 2018-10-08 10:11:36.000000000 +0200 +++ new/kcoreaddons-5.52.0/autotests/kdirwatch_unittest.cpp 2018-11-03 18:59:12.000000000 +0100 @@ -729,6 +729,10 @@ //KDirWatch::statistics(); + // The mtime of the existing file is the one of "TestFile", so it's old. + // We won't detect the change then, if we use that as baseline for waiting. + // We really need msec granularity, but that requires using statx which isn't available everywhere... + waitUntilNewSecond(); appendToFile(existingFile); QVERIFY(waitForOneSignal(watch, SIGNAL(dirty(QString)), existingFile)); #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.51.0/kcoreaddons.categories new/kcoreaddons-5.52.0/kcoreaddons.categories --- old/kcoreaddons-5.51.0/kcoreaddons.categories 1970-01-01 01:00:00.000000000 +0100 +++ new/kcoreaddons-5.52.0/kcoreaddons.categories 2018-11-03 18:59:12.000000000 +0100 @@ -0,0 +1,6 @@ +kf5.kcoreaddons.kdirwatch KDirWatch (KCoreAddons) DEFAULT_SEVERITY [WARNING] IDENTIFIER [KDIRWATCH] +kf5.kcoreaddons.kaboutdata KAboutData (KCoreAddons) IDENTIFIER [KABOUTDATA] +kf5.kcoreaddons.desktopparser DesktopParser (KCoreAddons) DEFAULT_SEVERITY [WARNING] IDENTIFIER [DESKTOPPARSER] +kf5.kcoreaddons.kdelibs4configmigrator Kdelibs4ConfigMigrator (KCoreAddons) DEFAULT_SEVERITY [WARNING] IDENTIFIER [MIGRATOR] +org.kde.kcoreaddons kcoreaddons (kcoreaddons lib) IDENTIFIER [KCOREADDONS_DEBUG] + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.51.0/po/ast/kcoreaddons5_qt.po new/kcoreaddons-5.52.0/po/ast/kcoreaddons5_qt.po --- old/kcoreaddons-5.51.0/po/ast/kcoreaddons5_qt.po 2018-10-08 10:11:36.000000000 +0200 +++ new/kcoreaddons-5.52.0/po/ast/kcoreaddons5_qt.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,661 +0,0 @@ -# enolp <en...@softastur.org>, 2016. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"PO-Revision-Date: 2016-12-30 00:59+0100\n" -"Last-Translator: enolp <en...@softastur.org>\n" -"Language-Team: Asturian <alministrado...@softastur.org>\n" -"Language: ast\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Qt-Contexts: true\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" - -#: lib/kaboutdata.cpp:292 -msgctxt "KAboutLicense|" -msgid "" -"No licensing terms for this program have been specified.\n" -"Please check the documentation or the source for any\n" -"licensing terms.\n" -msgstr "" -"Nun s'especificaron los términos de llicencia pa esti programa.\n" -"Compueba la documentación o la fonte de cualesquier términu de llicencia, " -"por favor.\n" - -#: lib/kaboutdata.cpp:302 -#, qt-format -msgctxt "KAboutLicense|" -msgid "This program is distributed under the terms of the %1." -msgstr "Esti programa distribúise so los términos de la %1" - -#: lib/kaboutdata.cpp:348 -msgctxt "KAboutLicense|@item license (short name)" -msgid "GPL v2" -msgstr "GPL v2" - -#: lib/kaboutdata.cpp:349 -msgctxt "KAboutLicense|@item license" -msgid "GNU General Public License Version 2" -msgstr "Versión 2 de la llicencia pública xeneral de GNU" - -#: lib/kaboutdata.cpp:352 -msgctxt "KAboutLicense|@item license (short name)" -msgid "LGPL v2" -msgstr "LGPL v2" - -#: lib/kaboutdata.cpp:353 -msgctxt "KAboutLicense|@item license" -msgid "GNU Lesser General Public License Version 2" -msgstr "Versión 2 de la llicencia pública menos xeneral de GNU" - -#: lib/kaboutdata.cpp:356 -msgctxt "KAboutLicense|@item license (short name)" -msgid "BSD License" -msgstr "Llicencia BSD" - -#: lib/kaboutdata.cpp:357 -msgctxt "KAboutLicense|@item license" -msgid "BSD License" -msgstr "Llicencia BSD" - -#: lib/kaboutdata.cpp:360 -msgctxt "KAboutLicense|@item license (short name)" -msgid "Artistic License" -msgstr "Llicencia artística" - -#: lib/kaboutdata.cpp:361 -msgctxt "KAboutLicense|@item license" -msgid "Artistic License" -msgstr "Llicencia artística" - -#: lib/kaboutdata.cpp:364 -msgctxt "KAboutLicense|@item license (short name)" -msgid "QPL v1.0" -msgstr "QPL v1.0" - -#: lib/kaboutdata.cpp:365 -msgctxt "KAboutLicense|@item license" -msgid "Q Public License" -msgstr "Llicencia pública Q" - -#: lib/kaboutdata.cpp:368 -msgctxt "KAboutLicense|@item license (short name)" -msgid "GPL v3" -msgstr "GPL v3" - -#: lib/kaboutdata.cpp:369 -msgctxt "KAboutLicense|@item license" -msgid "GNU General Public License Version 3" -msgstr "Versión 3 de la llicencia pública xeneral de GNU" - -#: lib/kaboutdata.cpp:372 -msgctxt "KAboutLicense|@item license (short name)" -msgid "LGPL v3" -msgstr "LGPL v3" - -#: lib/kaboutdata.cpp:373 -msgctxt "KAboutLicense|@item license" -msgid "GNU Lesser General Public License Version 3" -msgstr "Versión 3 de la llicencia pública menos xeneral de GNU" - -#: lib/kaboutdata.cpp:376 -msgctxt "KAboutLicense|@item license (short name)" -msgid "LGPL v2.1" -msgstr "LGPL v2.1" - -#: lib/kaboutdata.cpp:377 -msgctxt "KAboutLicense|@item license" -msgid "GNU Lesser General Public License Version 2.1" -msgstr "Versión 2.1 de la llicencia pública menos menos xeneral de GNU" - -#: lib/kaboutdata.cpp:381 -msgctxt "KAboutLicense|@item license" -msgid "Custom" -msgstr "Personalizada" - -#: lib/kaboutdata.cpp:384 -msgctxt "KAboutLicense|@item license" -msgid "Not specified" -msgstr "Ensin especificar" - -#: lib/kaboutdata.cpp:933 -#, fuzzy -#| 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.org</a></p>" -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=\"https://l10n.kde.org\";>https://l10n.kde."; -"org</a></p>" -msgstr "" -"<p>KDE traduzse a munches llingües gracies al trabayu de los equipos " -"mundiales de traducción.</p><p>Pa más información tocante a la " -"internacionalización de KDE, visita <a href=\"http://l10n.kde.org\";>http://"; -"l10n.kde.org</a></p>" - -#: lib/kaboutdata.cpp:1160 -msgctxt "KAboutData CLI|" -msgid "Show author information." -msgstr "Amuesa la información del autor." - -#: lib/kaboutdata.cpp:1161 -msgctxt "KAboutData CLI|" -msgid "Show license information." -msgstr "Amuesa la información de la llicencia." - -#: lib/kaboutdata.cpp:1163 -msgctxt "KAboutData CLI|" -msgid "The base file name of the desktop entry for this application." -msgstr "" -"El nome del ficheru base de la entrada d'escritoriu pa esta aplicación." - -#: lib/kaboutdata.cpp:1164 -msgctxt "KAboutData CLI|" -msgid "file name" -msgstr "nome de ficheru" - -#: lib/kaboutdata.cpp:1173 -msgctxt "KAboutData CLI|" -msgid "This application was written by somebody who wants to remain anonymous." -msgstr "L'aplicación escribióla daquién que quier tar nel anonimatu" - -#: lib/kaboutdata.cpp:1175 -#, qt-format -msgctxt "KAboutData CLI|" -msgid "%1 was written by:" -msgstr "%1 escribiólu:" - -#: lib/kaboutdata.cpp:1186 -#, fuzzy -#| msgctxt "KAboutData CLI|" -#| msgid "Please use http://bugs.kde.org to report bugs." -msgctxt "KAboutData CLI|" -msgid "Please use https://bugs.kde.org to report bugs." -msgstr "Usa http://bugs.kde.org pa informar fallos, por favor." - -#: lib/kaboutdata.cpp:1188 -#, qt-format -msgctxt "KAboutData CLI|" -msgid "Please report bugs to %1." -msgstr "Por favor, informa fallos a %1." - -#: lib/plugin/kpluginloader.cpp:122 -#, qt-format -msgctxt "KPluginLoader|" -msgid "The library %1 does not offer a KPluginFactory." -msgstr "La biblioteca %1 nun ufre un KPluginFactory." - -#. value without prefix, format "<val> <unit>" -#: lib/util/kformatprivate.cpp:158 -#, qt-format -msgctxt "KFormat|no Prefix" -msgid "%1 %2" -msgstr "" - -#. value with prefix, format "<val> <prefix><unit>" -#: lib/util/kformatprivate.cpp:176 -#, qt-format -msgctxt "KFormat|MetricBinaryDialect" -msgid "%1 %2%3" -msgstr "" - -#. MetricBinaryDialect size in bytes -#: lib/util/kformatprivate.cpp:227 -#, qt-format -msgctxt "KFormat|MetricBinaryDialect" -msgid "%1 B" -msgstr "%1 B" - -#. MetricBinaryDialect size in 1000 bytes -#: lib/util/kformatprivate.cpp:230 -#, qt-format -msgctxt "KFormat|MetricBinaryDialect" -msgid "%1 kB" -msgstr "%1 KB" - -#. MetricBinaryDialect size in 10^6 bytes -#: lib/util/kformatprivate.cpp:233 -#, qt-format -msgctxt "KFormat|MetricBinaryDialect" -msgid "%1 MB" -msgstr "%1 MB" - -#. MetricBinaryDialect size in 10^9 bytes -#: lib/util/kformatprivate.cpp:236 -#, qt-format -msgctxt "KFormat|MetricBinaryDialect" -msgid "%1 GB" -msgstr "%1 GB" - -#. MetricBinaryDialect size in 10^12 bytes -#: lib/util/kformatprivate.cpp:239 -#, qt-format -msgctxt "KFormat|MetricBinaryDialect" -msgid "%1 TB" -msgstr "%1 TB" - -#. MetricBinaryDialect size in 10^15 bytes -#: lib/util/kformatprivate.cpp:242 -#, qt-format -msgctxt "KFormat|MetricBinaryDialect" -msgid "%1 PB" -msgstr "%1 PB" - -#. MetricBinaryDialect size in 10^18 byte -#: lib/util/kformatprivate.cpp:245 -#, qt-format -msgctxt "KFormat|MetricBinaryDialect" -msgid "%1 EB" -msgstr "%1 EB" - -#. MetricBinaryDialect size in 10^21 bytes -#: lib/util/kformatprivate.cpp:248 -#, qt-format -msgctxt "KFormat|MetricBinaryDialect" -msgid "%1 ZB" -msgstr "%1 ZB" - -#. MetricBinaryDialect size in 10^24 bytes -#: lib/util/kformatprivate.cpp:251 -#, qt-format -msgctxt "KFormat|MetricBinaryDialect" -msgid "%1 YB" -msgstr "%1 YB" - -#. JEDECBinaryDialect memory size in bytes -#: lib/util/kformatprivate.cpp:257 -#, qt-format -msgctxt "KFormat|JEDECBinaryDialect" -msgid "%1 B" -msgstr "%1 B" - -#. JEDECBinaryDialect memory size in 1024 bytes -#: lib/util/kformatprivate.cpp:260 -#, qt-format -msgctxt "KFormat|JEDECBinaryDialect" -msgid "%1 KB" -msgstr "%1 KB" - -#. JEDECBinaryDialect memory size in 10^20 bytes -#: lib/util/kformatprivate.cpp:263 -#, qt-format -msgctxt "KFormat|JEDECBinaryDialect" -msgid "%1 MB" -msgstr "%1 MB" - -#. JEDECBinaryDialect memory size in 10^30 bytes -#: lib/util/kformatprivate.cpp:266 -#, qt-format -msgctxt "KFormat|JEDECBinaryDialect" -msgid "%1 GB" -msgstr "%1 GB" - -#. JEDECBinaryDialect memory size in 10^40 bytes -#: lib/util/kformatprivate.cpp:269 -#, qt-format -msgctxt "KFormat|JEDECBinaryDialect" -msgid "%1 TB" -msgstr "%1 TB" - -#. JEDECBinaryDialect memory size in 10^50 bytes -#: lib/util/kformatprivate.cpp:272 -#, qt-format -msgctxt "KFormat|JEDECBinaryDialect" -msgid "%1 PB" -msgstr "%1 PB" - -#. JEDECBinaryDialect memory size in 10^60 bytes -#: lib/util/kformatprivate.cpp:275 -#, qt-format -msgctxt "KFormat|JEDECBinaryDialect" -msgid "%1 EB" -msgstr "%1 EB" - -#. JEDECBinaryDialect memory size in 10^70 bytes -#: lib/util/kformatprivate.cpp:278 -#, qt-format -msgctxt "KFormat|JEDECBinaryDialect" -msgid "%1 ZB" -msgstr "%1 ZB" - -#. JEDECBinaryDialect memory size in 10^80 bytes -#: lib/util/kformatprivate.cpp:281 -#, qt-format -msgctxt "KFormat|JEDECBinaryDialect" -msgid "%1 YB" -msgstr "%1 YB" - -#. IECBinaryDialect size in bytes -#: lib/util/kformatprivate.cpp:287 -#, qt-format -msgctxt "KFormat|IECBinaryDialect" -msgid "%1 B" -msgstr "%1 B" - -#. IECBinaryDialect size in 1024 bytes -#: lib/util/kformatprivate.cpp:290 -#, qt-format -msgctxt "KFormat|IECBinaryDialect" -msgid "%1 KiB" -msgstr "%1 KiB" - -#. IECBinaryDialect size in 10^20 bytes -#: lib/util/kformatprivate.cpp:293 -#, qt-format -msgctxt "KFormat|IECBinaryDialect" -msgid "%1 MiB" -msgstr "%1 MiB" - -#. IECBinaryDialect size in 10^30 bytes -#: lib/util/kformatprivate.cpp:296 -#, qt-format -msgctxt "KFormat|IECBinaryDialect" -msgid "%1 GiB" -msgstr "%1 GiB" - -#. IECBinaryDialect size in 10^40 bytes -#: lib/util/kformatprivate.cpp:299 -#, qt-format -msgctxt "KFormat|IECBinaryDialect" -msgid "%1 TiB" -msgstr "%1 TiB" - -#. IECBinaryDialect size in 10^50 bytes -#: lib/util/kformatprivate.cpp:302 -#, qt-format -msgctxt "KFormat|IECBinaryDialect" -msgid "%1 PiB" -msgstr "%1 PiB" - -#. IECBinaryDialect size in 10^60 bytes -#: lib/util/kformatprivate.cpp:305 -#, qt-format -msgctxt "KFormat|IECBinaryDialect" -msgid "%1 EiB" -msgstr "%1 EiB" - -#. IECBinaryDialect size in 10^70 bytes -#: lib/util/kformatprivate.cpp:308 -#, qt-format -msgctxt "KFormat|IECBinaryDialect" -msgid "%1 ZiB" -msgstr "%1 ZiB" - -#. IECBinaryDialect size in 10^80 bytes -#: lib/util/kformatprivate.cpp:311 -#, qt-format -msgctxt "KFormat|IECBinaryDialect" -msgid "%1 YiB" -msgstr "%1 YiB" - -#. @item:intext Duration format minutes, seconds and milliseconds -#: lib/util/kformatprivate.cpp:350 -#, qt-format -msgctxt "KFormat|" -msgid "%1m%2.%3s" -msgstr "%1m%2.%3s" - -#. @item:intext Duration format minutes and seconds -#: lib/util/kformatprivate.cpp:355 -#, qt-format -msgctxt "KFormat|" -msgid "%1m%2s" -msgstr "%1m%2s" - -#. @item:intext Duration format hours and minutes -#: lib/util/kformatprivate.cpp:359 -#, qt-format -msgctxt "KFormat|" -msgid "%1h%2m" -msgstr "%1h%2m" - -#. @item:intext Duration format hours, minutes, seconds, milliseconds -#: lib/util/kformatprivate.cpp:363 -#, qt-format -msgctxt "KFormat|" -msgid "%1h%2m%3.%4s" -msgstr "%1h%2m%3.%4s" - -#. @item:intext Duration format hours, minutes, seconds -#: lib/util/kformatprivate.cpp:369 -#, qt-format -msgctxt "KFormat|" -msgid "%1h%2m%3s" -msgstr "%1h%2m%3s" - -#. @item:intext Duration format minutes, seconds and milliseconds -#: lib/util/kformatprivate.cpp:379 -#, qt-format -msgctxt "KFormat|" -msgid "%1:%2.%3" -msgstr "%1:%2.%3" - -#. @item:intext Duration format minutes and seconds -#. ---------- -#. @item:intext Duration format hours and minutes -#: lib/util/kformatprivate.cpp:384 lib/util/kformatprivate.cpp:388 -#, qt-format -msgctxt "KFormat|" -msgid "%1:%2" -msgstr "%1:%2" - -#. @item:intext Duration format hours, minutes, seconds, milliseconds -#: lib/util/kformatprivate.cpp:392 -#, qt-format -msgctxt "KFormat|" -msgid "%1:%2:%3.%4" -msgstr "%1:%2:%3.%4" - -#. @item:intext Duration format hours, minutes, seconds -#: lib/util/kformatprivate.cpp:398 -#, qt-format -msgctxt "KFormat|" -msgid "%1:%2:%3" -msgstr "%1:%2:%3" - -#. @item:intext %1 is a real number, e.g. 1.23 days -#: lib/util/kformatprivate.cpp:413 -#, qt-format -msgctxt "KFormat|" -msgid "%1 days" -msgstr "%1 díes" - -#. @item:intext %1 is a real number, e.g. 1.23 hours -#: lib/util/kformatprivate.cpp:416 -#, qt-format -msgctxt "KFormat|" -msgid "%1 hours" -msgstr "%1 hores" - -#. @item:intext %1 is a real number, e.g. 1.23 minutes -#: lib/util/kformatprivate.cpp:419 -#, qt-format -msgctxt "KFormat|" -msgid "%1 minutes" -msgstr "%1 minutos" - -#. @item:intext %1 is a real number, e.g. 1.23 seconds -#: lib/util/kformatprivate.cpp:422 -#, qt-format -msgctxt "KFormat|" -msgid "%1 seconds" -msgstr "%1 segundos" - -#. @item:intext %1 is a whole number -#: lib/util/kformatprivate.cpp:427 -#, fuzzy, qt-format -#| msgctxt "KFormat|" -#| msgid "%n millisecond(s)" -#| msgid_plural "%n millisecond(s)" -msgctxt "KFormat|" -msgid "%n millisecond(s)" -msgid_plural "%n millisecond(s)" -msgstr[0] "%n milisegundu" -msgstr[1] "%n milisegundu" - -#. @item:intext %n is a whole number -#: lib/util/kformatprivate.cpp:445 -#, fuzzy, qt-format -#| msgctxt "KFormat|" -#| msgid "%n day(s)" -#| msgid_plural "%n day(s)" -msgctxt "KFormat|" -msgid "%n day(s)" -msgid_plural "%n day(s)" -msgstr[0] "%n día" -msgstr[1] "%n día" - -#. @item:intext %n is a whole number -#: lib/util/kformatprivate.cpp:450 -#, fuzzy, qt-format -#| msgctxt "KFormat|" -#| msgid "%n hour(s)" -#| msgid_plural "%n hour(s)" -msgctxt "KFormat|" -msgid "%n hour(s)" -msgid_plural "%n hour(s)" -msgstr[0] "%n hora" -msgstr[1] "%n hora" - -#. @item:intext %n is a whole number -#: lib/util/kformatprivate.cpp:455 -#, fuzzy, qt-format -#| msgctxt "KFormat|" -#| msgid "%n minute(s)" -#| msgid_plural "%n minute(s)" -msgctxt "KFormat|" -msgid "%n minute(s)" -msgid_plural "%n minute(s)" -msgstr[0] "%n minutu" -msgstr[1] "%n minutu" - -#. @item:intext %n is a whole number -#: lib/util/kformatprivate.cpp:460 -#, fuzzy, qt-format -#| msgctxt "KFormat|" -#| msgid "%n second(s)" -#| msgid_plural "%n second(s)" -msgctxt "KFormat|" -msgid "%n second(s)" -msgid_plural "%n second(s)" -msgstr[0] "%n segundu" -msgstr[1] "%n segundu" - -#. @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 -#. ---------- -#. @item:intext hours and minutes. 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 -#. ---------- -#. @item:intext minutes and seconds. 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 -#: lib/util/kformatprivate.cpp:485 lib/util/kformatprivate.cpp:491 -#: lib/util/kformatprivate.cpp:497 -#, qt-format -msgctxt "KFormat|" -msgid "%1 and %2" -msgstr "%1 y %2" - -#: lib/util/kformatprivate.cpp:508 -msgctxt "" -"KFormat|used when a relative date string can't be generated because the date " -"is invalid" -msgid "Invalid date" -msgstr "" - -#: lib/util/kformatprivate.cpp:518 -msgctxt "KFormat|" -msgid "Tomorrow" -msgstr "Mañana" - -#: lib/util/kformatprivate.cpp:520 -msgctxt "KFormat|" -msgid "Today" -msgstr "Güei" - -#: lib/util/kformatprivate.cpp:522 -msgctxt "KFormat|" -msgid "Yesterday" -msgstr "Ayeri" - -#: lib/util/kformatprivate.cpp:528 -msgctxt "KFormat|most recent such day before today" -msgid "Last Monday" -msgstr "" - -#: lib/util/kformatprivate.cpp:530 -msgctxt "KFormat|most recent such day before today" -msgid "Last Tuesday" -msgstr "" - -#: lib/util/kformatprivate.cpp:532 -msgctxt "KFormat|most recent such day before today" -msgid "Last Wednesday" -msgstr "" - -#: lib/util/kformatprivate.cpp:534 -msgctxt "KFormat|most recent such day before today" -msgid "Last Thursday" -msgstr "" - -#: lib/util/kformatprivate.cpp:536 -msgctxt "KFormat|most recent such day before today" -msgid "Last Friday" -msgstr "" - -#: lib/util/kformatprivate.cpp:538 -msgctxt "KFormat|most recent such day before today" -msgid "Last Saturday" -msgstr "" - -#: lib/util/kformatprivate.cpp:540 -msgctxt "KFormat|most recent such day before today" -msgid "Last Sunday" -msgstr "" - -#: lib/util/kformatprivate.cpp:545 -msgctxt "KFormat|the next such day after today" -msgid "Next Monday" -msgstr "" - -#: lib/util/kformatprivate.cpp:547 -msgctxt "KFormat|the next such day after today" -msgid "Next Tuesday" -msgstr "" - -#: lib/util/kformatprivate.cpp:549 -msgctxt "KFormat|the next such day after today" -msgid "Next Wednesday" -msgstr "" - -#: lib/util/kformatprivate.cpp:551 -msgctxt "KFormat|the next such day after today" -msgid "Next Thursday" -msgstr "" - -#: lib/util/kformatprivate.cpp:553 -msgctxt "KFormat|the next such day after today" -msgid "Next Friday" -msgstr "" - -#: lib/util/kformatprivate.cpp:555 -msgctxt "KFormat|the next such day after today" -msgid "Next Saturday" -msgstr "" - -#: lib/util/kformatprivate.cpp:557 -msgctxt "KFormat|the next such day after today" -msgid "Next Sunday" -msgstr "" - -#. relative datetime with %1 result of formatReleativeDate() and %2 the formatted time If this does not fit the grammar of your language please contact the i18n team to solve the problem -#: lib/util/kformatprivate.cpp:572 -#, qt-format -msgctxt "KFormat|" -msgid "%1, %2" -msgstr "%1, %2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.51.0/po/gl/kcoreaddons5_qt.po new/kcoreaddons-5.52.0/po/gl/kcoreaddons5_qt.po --- old/kcoreaddons-5.51.0/po/gl/kcoreaddons5_qt.po 2018-10-08 10:11:36.000000000 +0200 +++ new/kcoreaddons-5.52.0/po/gl/kcoreaddons5_qt.po 2018-11-03 18:59:12.000000000 +0100 @@ -16,7 +16,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-11 21:23+0100\n" +"PO-Revision-Date: 2018-10-20 13:17+0100\n" "Last-Translator: Adrián Chaves (Gallaecio) <adr...@chaves.io>\n" "Language-Team: Galician <kde-i18n-...@kde.org>\n" "Language: gl\n" @@ -199,20 +199,17 @@ #. value without prefix, format "<val> <unit>" #: lib/util/kformatprivate.cpp:158 -#, fuzzy, qt-format -#| msgctxt "concatenation of dates and time" -#| msgid "%1 %2" +#, qt-format msgctxt "KFormat|no Prefix" msgid "%1 %2" msgstr "%1 %2" #. value with prefix, format "<val> <prefix><unit>" #: lib/util/kformatprivate.cpp:176 -#, fuzzy, qt-format -#| msgid "%1 %2, %3" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 %2%3" -msgstr "%1 %2, %3" +msgstr "%1 %2%3" #. MetricBinaryDialect size in bytes #: lib/util/kformatprivate.cpp:227 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.51.0/po/hu/kcoreaddons5_qt.po new/kcoreaddons-5.52.0/po/hu/kcoreaddons5_qt.po --- old/kcoreaddons-5.51.0/po/hu/kcoreaddons5_qt.po 2018-10-08 10:11:36.000000000 +0200 +++ new/kcoreaddons-5.52.0/po/hu/kcoreaddons5_qt.po 2018-11-03 18:59:12.000000000 +0100 @@ -1,20 +1,21 @@ # Kiszel Kristóf <ulys...@kubuntu.org>, 2010. # Kristóf Kiszel <ulys...@kubuntu.org>, 2010, 2011, 2012, 2014. # Balázs Úr <urbal...@gmail.com>, 2012, 2013. +# Kristof Kiszel <kiszel.kris...@gmail.com>, 2018. msgid "" msgstr "" "Project-Id-Version: KDE 4.4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2014-09-02 10:09+0200\n" -"Last-Translator: Kristóf Kiszel <ulys...@kubuntu.org>\n" +"PO-Revision-Date: 2018-10-14 15:44+0200\n" +"Last-Translator: Kristof Kiszel <kiszel.kris...@gmail.com>\n" "Language-Team: Hungarian <kde-l10n...@kde.org>\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "X-Qt-Contexts: true\n" #: lib/kaboutdata.cpp:292 @@ -105,20 +106,14 @@ msgstr "GNU Lesser General Public License 3-as verzió" #: lib/kaboutdata.cpp:376 -#, fuzzy -#| msgctxt "KAboutLicense|@item license (short name)" -#| msgid "LGPL v2" msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2.1" -msgstr "LGPL v2" +msgstr "LGPL v2.1" #: lib/kaboutdata.cpp:377 -#, fuzzy -#| msgctxt "KAboutLicense|@item license" -#| msgid "GNU Lesser General Public License Version 2" msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2.1" -msgstr "GNU Lesser General Public License 2-es verzió" +msgstr "GNU Lesser General Public License 2.1-es verzió" #: lib/kaboutdata.cpp:381 msgctxt "KAboutLicense|@item license" @@ -131,14 +126,6 @@ msgstr "Nincs megadva" #: lib/kaboutdata.cpp:933 -#, fuzzy -#| 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.org</a></p>" msgctxt "KAboutData|replace this with information about your translation team" msgid "" "<p>KDE is translated into many languages thanks to the work of the " @@ -146,11 +133,11 @@ "internationalization visit <a href=\"https://l10n.kde.org\";>https://l10n.kde."; "org</a></p>" msgstr "" -"<p>A KDE grafikus környezet már több mint 60 nyelven használható. A " -"projektben közreműködő magyar fordítók munkájának köszönhetően a KDE teljes " -"egészében le van fordítva magyarra.</p><p>A KDE magyar fordításáról és az " -"alkalmazások lokalizációjáról további információ található itt: <a href=" -"\"http://l10n.kde.org\";>http://l10n.kde.org</a></p>" +"<p>A KDE grafikus környezet számos nyelven használható. A projektben " +"közreműködő magyar fordítók munkájának köszönhetően a KDE teljes egészében " +"le van fordítva magyarra.</p><p>A KDE magyar fordításáról és az alkalmazások " +"lokalizációjáról további információ található itt: <a href=\"https://l10n."; +"kde.org\">https://l10n.kde.org</a></p>" #: lib/kaboutdata.cpp:1160 msgctxt "KAboutData CLI|" @@ -165,12 +152,12 @@ #: lib/kaboutdata.cpp:1163 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." -msgstr "" +msgstr "Az alkamazás asztali bejegyzésének fájlneve." #: lib/kaboutdata.cpp:1164 msgctxt "KAboutData CLI|" msgid "file name" -msgstr "" +msgstr "fájlnév" #: lib/kaboutdata.cpp:1173 msgctxt "KAboutData CLI|" @@ -178,27 +165,22 @@ msgstr "Az alkalmazás szerzője nem kívánta feltüntetni a nevét." #: lib/kaboutdata.cpp:1175 -#, fuzzy, qt-format -#| msgctxt "KAboutData CLI|" -#| msgid "%s was written by:\n" +#, qt-format msgctxt "KAboutData CLI|" msgid "%1 was written by:" -msgstr "A(z) %s készítőinek névsora:\n" +msgstr "A(z) %1 készítőinek névsora:" #: lib/kaboutdata.cpp:1186 -#, fuzzy -#| msgid "Please use http://bugs.kde.org to report bugs.\n" msgctxt "KAboutData CLI|" msgid "Please use https://bugs.kde.org to report bugs." msgstr "" -"Kérjük, hogy a talált hibákat jelentse be a http://bugs.kde.org címen.\n" +"Kérjük, hogy a talált hibákat jelentse be a https://bugs.kde.org címen." #: lib/kaboutdata.cpp:1188 -#, fuzzy, qt-format -#| msgid "Please report bugs to %1.\n" +#, qt-format msgctxt "KAboutData CLI|" msgid "Please report bugs to %1." -msgstr "Kérjük, hogy a talált hibákat jelentse be itt: %1.\n" +msgstr "Kérjük, hogy a talált hibákat jelentse be itt: %1." #: lib/plugin/kpluginloader.cpp:122 #, qt-format @@ -208,20 +190,17 @@ #. value without prefix, format "<val> <unit>" #: lib/util/kformatprivate.cpp:158 -#, fuzzy, qt-format -#| msgctxt "concatenation of dates and time" -#| msgid "%1 %2" +#, qt-format msgctxt "KFormat|no Prefix" msgid "%1 %2" msgstr "%1 %2" #. value with prefix, format "<val> <prefix><unit>" #: lib/util/kformatprivate.cpp:176 -#, fuzzy, qt-format -#| msgid "%1 %2, %3" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 %2%3" -msgstr "%1 %2, %3" +msgstr "%1 %2%3" #. MetricBinaryDialect size in bytes #: lib/util/kformatprivate.cpp:227 @@ -507,10 +486,7 @@ #. @item:intext %1 is a whole number #: lib/util/kformatprivate.cpp:427 -#, fuzzy, qt-format -#| msgctxt "KFormat|" -#| msgid "%n millisecond(s)" -#| msgid_plural "%n millisecond(s)" +#, qt-format msgctxt "KFormat|" msgid "%n millisecond(s)" msgid_plural "%n millisecond(s)" @@ -519,10 +495,7 @@ #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:445 -#, fuzzy, qt-format -#| msgctxt "KFormat|" -#| msgid "%n day(s)" -#| msgid_plural "%n day(s)" +#, qt-format msgctxt "KFormat|" msgid "%n day(s)" msgid_plural "%n day(s)" @@ -531,10 +504,7 @@ #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:450 -#, fuzzy, qt-format -#| msgctxt "KFormat|" -#| msgid "%n hour(s)" -#| msgid_plural "%n hour(s)" +#, qt-format msgctxt "KFormat|" msgid "%n hour(s)" msgid_plural "%n hour(s)" @@ -543,10 +513,7 @@ #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:455 -#, fuzzy, qt-format -#| msgctxt "KFormat|" -#| msgid "%n minute(s)" -#| msgid_plural "%n minute(s)" +#, qt-format msgctxt "KFormat|" msgid "%n minute(s)" msgid_plural "%n minute(s)" @@ -555,10 +522,7 @@ #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:460 -#, fuzzy, qt-format -#| msgctxt "KFormat|" -#| msgid "%n second(s)" -#| msgid_plural "%n second(s)" +#, qt-format msgctxt "KFormat|" msgid "%n second(s)" msgid_plural "%n second(s)" @@ -578,13 +542,11 @@ msgstr "%1 és %2" #: lib/util/kformatprivate.cpp:508 -#, fuzzy -#| msgid "Invalid item." msgctxt "" "KFormat|used when a relative date string can't be generated because the date " "is invalid" msgid "Invalid date" -msgstr "Érvénytelen elem." +msgstr "Érvénytelen dátum" #: lib/util/kformatprivate.cpp:518 msgctxt "KFormat|" @@ -602,102 +564,74 @@ msgstr "Tegnap" #: lib/util/kformatprivate.cpp:528 -#, fuzzy -#| msgctxt "@option last month" -#| msgid "Last Month" msgctxt "KFormat|most recent such day before today" msgid "Last Monday" -msgstr "Előző hónapban" +msgstr "Előző hétfő" #: lib/util/kformatprivate.cpp:530 -#, fuzzy -#| msgctxt "@option last year" -#| msgid "Last Year" msgctxt "KFormat|most recent such day before today" msgid "Last Tuesday" -msgstr "Előző évben" +msgstr "Előző kedd" #: lib/util/kformatprivate.cpp:532 -#, fuzzy -#| msgctxt "" -#| "referring to a filter on the modification and usage date of files/" -#| "resources" -#| msgid "Last Week" msgctxt "KFormat|most recent such day before today" msgid "Last Wednesday" -msgstr "Előző héten" +msgstr "Előző szerda" #: lib/util/kformatprivate.cpp:534 msgctxt "KFormat|most recent such day before today" msgid "Last Thursday" -msgstr "" +msgstr "Előző csütörtök" #: lib/util/kformatprivate.cpp:536 msgctxt "KFormat|most recent such day before today" msgid "Last Friday" -msgstr "" +msgstr "Előző péntek" #: lib/util/kformatprivate.cpp:538 -#, fuzzy -#| msgctxt "@option last year" -#| msgid "Last Year" msgctxt "KFormat|most recent such day before today" msgid "Last Saturday" -msgstr "Előző évben" +msgstr "Előző szombat" #: lib/util/kformatprivate.cpp:540 msgctxt "KFormat|most recent such day before today" msgid "Last Sunday" -msgstr "" +msgstr "Előző vasárnap" #: lib/util/kformatprivate.cpp:545 -#, fuzzy -#| msgctxt "@option next month" -#| msgid "Next Month" msgctxt "KFormat|the next such day after today" msgid "Next Monday" -msgstr "Következő hónap" +msgstr "Következő hétfő" #: lib/util/kformatprivate.cpp:547 -#, fuzzy -#| msgid "Next year" msgctxt "KFormat|the next such day after today" msgid "Next Tuesday" -msgstr "Következő év" +msgstr "Következő kedd" #: lib/util/kformatprivate.cpp:549 -#, fuzzy -#| msgctxt "@option next week" -#| msgid "Next Week" msgctxt "KFormat|the next such day after today" msgid "Next Wednesday" -msgstr "Következő hét" +msgstr "Következő szerda" #: lib/util/kformatprivate.cpp:551 msgctxt "KFormat|the next such day after today" msgid "Next Thursday" -msgstr "" +msgstr "Következő csütörtök" #: lib/util/kformatprivate.cpp:553 -#, fuzzy -#| msgid "Next year" msgctxt "KFormat|the next such day after today" msgid "Next Friday" -msgstr "Következő év" +msgstr "Következő péntek" #: lib/util/kformatprivate.cpp:555 -#, fuzzy -#| msgid "Next year" msgctxt "KFormat|the next such day after today" msgid "Next Saturday" -msgstr "Következő év" +msgstr "Következő szombat" #: lib/util/kformatprivate.cpp:557 -#, fuzzy -#| msgid "Next year" msgctxt "KFormat|the next such day after today" msgid "Next Sunday" -msgstr "Következő év" +msgstr "Következő vasárnap" #. relative datetime with %1 result of formatReleativeDate() and %2 the formatted time If this does not fit the grammar of your language please contact the i18n team to solve the problem #: lib/util/kformatprivate.cpp:572 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.51.0/po/zh_CN/kcoreaddons5_qt.po new/kcoreaddons-5.52.0/po/zh_CN/kcoreaddons5_qt.po --- old/kcoreaddons-5.51.0/po/zh_CN/kcoreaddons5_qt.po 2018-10-08 10:11:36.000000000 +0200 +++ new/kcoreaddons-5.52.0/po/zh_CN/kcoreaddons5_qt.po 2018-11-03 18:59:12.000000000 +0100 @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-09-28 19:46\n" -"Last-Translator: guoyunhe <yunhe....@protonmail.com>\n" +"PO-Revision-Date: 2018-10-09 18:38\n" +"Last-Translator: guoyunhe <i...@guoyunhe.me>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.51.0/src/lib/io/kdirwatch.cpp new/kcoreaddons-5.52.0/src/lib/io/kdirwatch.cpp --- old/kcoreaddons-5.51.0/src/lib/io/kdirwatch.cpp 2018-10-08 10:11:36.000000000 +0200 +++ new/kcoreaddons-5.52.0/src/lib/io/kdirwatch.cpp 2018-11-03 18:59:12.000000000 +0100 @@ -187,8 +187,8 @@ timer.setObjectName(QStringLiteral("KDirWatchPrivate::timer")); connect(&timer, SIGNAL(timeout()), this, SLOT(slotRescan())); - m_nfsPollInterval = qEnvironmentVariableIsSet(s_envNfsPoll) ? qgetenv(s_envNfsPoll).toInt() : 5000; - m_PollInterval = qEnvironmentVariableIsSet(s_envPoll) ? qgetenv(s_envPoll).toInt() : 500; + m_nfsPollInterval = qEnvironmentVariableIsSet(s_envNfsPoll) ? qEnvironmentVariableIntValue(s_envNfsPoll) : 5000; + m_PollInterval = qEnvironmentVariableIsSet(s_envPoll) ? qEnvironmentVariableIntValue(s_envPoll) : 500; m_preferredMethod = methodFromString(qEnvironmentVariableIsSet(s_envMethod) ? qgetenv(s_envMethod) : "inotify"); // The nfs method defaults to the normal (local) method @@ -206,7 +206,7 @@ #if HAVE_FAM availableMethods << "FAM"; use_fam = true; - sn = 0; + sn = nullptr; #endif #if HAVE_SYS_INOTIFY_H @@ -642,7 +642,7 @@ if (e->isDir) { if (e->m_status == NonExistent) { // If the directory does not exist we watch the parent directory - addEntry(0, e->parentDirectory(), e, true); + addEntry(nullptr, e->parentDirectory(), e, true); } else { int res = FAMMonitorDirectory(&fc, QFile::encodeName(e->path).data(), &(e->fr), e); @@ -651,7 +651,7 @@ e->m_mode = UnknownMode; use_fam = false; delete sn; - sn = 0; + sn = nullptr; return false; } qCDebug(KDIRWATCH).nospace() << " Setup FAM (Req " << FAMREQUEST_GETREQNUM(&(e->fr)) @@ -660,7 +660,7 @@ } else { if (e->m_status == NonExistent) { // If the file does not exist we watch the directory - addEntry(0, QFileInfo(e->path).absolutePath(), e, true); + addEntry(nullptr, QFileInfo(e->path).absolutePath(), e, true); } else { int res = FAMMonitorFile(&fc, QFile::encodeName(e->path).data(), &(e->fr), e); @@ -669,7 +669,7 @@ e->m_mode = UnknownMode; use_fam = false; delete sn; - sn = 0; + sn = nullptr; return false; } @@ -1599,7 +1599,7 @@ if (FAMNextEvent(&fc, &fe) == -1) { qCWarning(KCOREADDONS_DEBUG) << "FAM connection problem, switching to polling."; use_fam = false; - delete sn; sn = 0; + delete sn; sn = nullptr; // Replace all FAMMode entries with INotify/Stat EntryMap::Iterator it = m_mapEntries.begin(); @@ -1620,7 +1620,7 @@ { //qCDebug(KDIRWATCH); - Entry *e = 0; + Entry *e = nullptr; EntryMap::Iterator it = m_mapEntries.begin(); for (; it != m_mapEntries.end(); ++it) if (FAMREQUEST_GETREQNUM(&((*it).fr)) == @@ -1695,7 +1695,7 @@ parentEntry->dirty = true; } // Add entry to parent dir to notice if the entry gets recreated - addEntry(0, e->parentDirectory(), e, true /*isDir*/); + addEntry(nullptr, e->parentDirectory(), e, true /*isDir*/); } else { // A file in this directory has been removed, and wasn't explicitly watched. // We could still inform clients, like inotify does? But stat can't. @@ -1720,7 +1720,7 @@ bool isDir = false; const QList<const Client *> clients = e->clientsForFileOrDir(tpath, &isDir); Q_FOREACH (const Client *client, clients) { - addEntry(client->instance, tpath, 0, isDir, + addEntry(client->instance, tpath, nullptr, isDir, isDir ? client->m_watchModes : KDirWatch::WatchDirOnly); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.51.0/src/mimetypes/kde5.xml new/kcoreaddons-5.52.0/src/mimetypes/kde5.xml --- old/kcoreaddons-5.51.0/src/mimetypes/kde5.xml 2018-10-08 10:11:36.000000000 +0200 +++ new/kcoreaddons-5.52.0/src/mimetypes/kde5.xml 2018-11-03 18:59:12.000000000 +0100 @@ -25,7 +25,6 @@ <sub-class-of type="application/xml"/> <comment>RELAX NG</comment> <comment xml:lang="ar">RELAX NG</comment> - <comment xml:lang="ast">RELAX NG</comment> <comment xml:lang="bs">Relax NG</comment> <comment xml:lang="ca">RELAX NG</comment> <comment xml:lang="ca@valencia">RELAX NG</comment> @@ -86,7 +85,6 @@ <mime-type type="application/x-cda"> <comment>CD audio</comment> <comment xml:lang="ar">صوت CD</comment> - <comment xml:lang="ast">Audiu CD</comment> <comment xml:lang="bs">CD audio</comment> <comment xml:lang="ca">CD àudio</comment> <comment xml:lang="ca@valencia">CD àudio</comment> @@ -148,7 +146,6 @@ <mime-type type="application/x-font-snf"> <comment>SNF bitmap font</comment> <comment xml:lang="ar">خط SNF bitmap</comment> - <comment xml:lang="ast">Fonte de mapa de bits SNF</comment> <comment xml:lang="bs">SNF bitmapski font</comment> <comment xml:lang="ca">Tipus de lletra de mapa de bits SNF</comment> <comment xml:lang="ca@valencia">Tipus de lletra de mapa de bits SNF</comment> @@ -210,7 +207,6 @@ <mime-type type="application/x-java-applet"> <comment>Java applet</comment> <comment xml:lang="ar">بريمج جافا</comment> - <comment xml:lang="ast">Applet de Java</comment> <comment xml:lang="bg">Аплет на Java</comment> <comment xml:lang="bs">JAVA aplet</comment> <comment xml:lang="ca">Miniaplicació Java</comment> @@ -271,7 +267,6 @@ <mime-type type="application/x-khtml-adaptor"> <comment>KHTML Extension Adaptor</comment> <comment xml:lang="ar">مكيف الامتدادات KHTML</comment> - <comment xml:lang="ast">Adautador d'estensión KHTML</comment> <comment xml:lang="bs">KHTML‑ov adapter proširenja</comment> <comment xml:lang="ca">Adaptador de l'extensió KHTML</comment> <comment xml:lang="ca@valencia">Adaptador de l'extensió KHTML</comment> @@ -329,7 +324,6 @@ <mime-type type="application/x-kcsrc"> <comment>KDE color scheme</comment> <comment xml:lang="ar">مخطط ألوان كدي</comment> - <comment xml:lang="ast">Esquema de color de KDE</comment> <comment xml:lang="bg">Цветова схема за KDE</comment> <comment xml:lang="bs">KDE šema boja</comment> <comment xml:lang="ca">Esquema de color del KDE</comment> @@ -393,7 +387,6 @@ <sub-class-of type="application/zip"/> <comment>KNewStuff package</comment> <comment xml:lang="ar">حزمة KNewStuff</comment> - <comment xml:lang="ast">Paquete KNewStuff</comment> <comment xml:lang="bs">paket K‑svežih-novotarija</comment> <comment xml:lang="ca">Paquet del KNewStuff</comment> <comment xml:lang="ca@valencia">Paquet del KNewStuff</comment> @@ -453,7 +446,6 @@ <mime-type type="application/x-kwallet"> <!-- fdo #6326 rejected, will stay KDE-specific --> <comment>KWallet wallet</comment> <comment xml:lang="ar">حافظة KWallet</comment> - <comment xml:lang="ast">Cartera KWallet</comment> <comment xml:lang="bg">Портфейл KWallet</comment> <comment xml:lang="bs">K‑novčanikov novčanik</comment> <comment xml:lang="ca">Cartera del KWallet</comment> @@ -517,7 +509,6 @@ <mime-type type="application/x-kudesigner"> <comment>Kugar report template</comment> <comment xml:lang="ar">قالب تقرير Kugar</comment> - <comment xml:lang="ast">Plantía d'informes de Kugar</comment> <comment xml:lang="bs">Kugarov šablon izvještaja</comment> <comment xml:lang="ca">Plantilla d'informe del Kugar</comment> <comment xml:lang="ca@valencia">Plantilla d'informe del Kugar</comment> @@ -578,7 +569,6 @@ <sub-class-of type="application/zip"/> <comment>plasmoid</comment> <comment xml:lang="ar">بلازمود</comment> - <comment xml:lang="ast">plasmoide</comment> <comment xml:lang="bs">plazmoid</comment> <comment xml:lang="ca">Plasmoide</comment> <comment xml:lang="ca@valencia">Plasmoide</comment> @@ -640,7 +630,6 @@ <sub-class-of type="application/zip"/> <comment>SuperKaramba theme</comment> <comment xml:lang="ar">سمة SuperKaramba</comment> - <comment xml:lang="ast">Tema de SuperKaramba</comment> <comment xml:lang="bg">Тема за SuperKaramba</comment> <comment xml:lang="bs">superkaramba tema</comment> <comment xml:lang="ca">Tema del SuperKaramba</comment> @@ -813,7 +802,6 @@ <mime-type type="application/x-vnd.kde.kplato"> <comment>KPlato project management document</comment> <comment xml:lang="ar">وثيقة إدارة مشاريع KPlato</comment> - <comment xml:lang="ast">Documentu de xestión de proyeutos de KPlato</comment> <comment xml:lang="bs">KPlatoov dokument upravljanja projektom</comment> <comment xml:lang="ca">Document per a la gestió de projectes del KPlato</comment> <comment xml:lang="ca@valencia">Document per a la gestió de projectes del KPlato</comment> @@ -872,7 +860,6 @@ <mime-type type="application/x-vnd.kde.kplato.work"> <comment>KPlato project management work package</comment> <comment xml:lang="ar">حزمة عمل إدارة مشاريع KPlato</comment> - <comment xml:lang="ast">Paquete de trabayu de xestión de proyeutos de KPlato</comment> <comment xml:lang="bs">KPlatoov radni paket upravljanja projektom</comment> <comment xml:lang="ca">Paquet de treball per a la gestió de projectes del KPlato</comment> <comment xml:lang="ca@valencia">Paquet de treball per a la gestió de projectes del KPlato</comment> @@ -931,7 +918,6 @@ <mime-type type="application/x-vnd.kde.kugar.mixed"> <comment>Kugar archive</comment> <comment xml:lang="ar">أرشيف Kugar</comment> - <comment xml:lang="ast">Archivu Kugar</comment> <comment xml:lang="bs">Kugarova arhiva</comment> <comment xml:lang="ca">Arxiu del Kugar</comment> <comment xml:lang="ca@valencia">Arxiu del Kugar</comment> @@ -992,7 +978,6 @@ <sub-class-of type="application/x-gzip"/> <!-- only necessary because x-compressed-tar is not specifying this sub-class-of (shared-mime-info 0.8) --> <comment>web archive</comment> <comment xml:lang="ar">أرشيف ويب</comment> - <comment xml:lang="ast">archivu web</comment> <comment xml:lang="bs">veb arhiva</comment> <comment xml:lang="ca">Arxiu web</comment> <comment xml:lang="ca@valencia">Arxiu web</comment> @@ -1053,7 +1038,6 @@ <sub-class-of type="application/xml"/> <comment>W3C XML schema</comment> <comment xml:lang="ar">مخطط W3C XML</comment> - <comment xml:lang="ast">Esquema XML de W3C</comment> <comment xml:lang="bs">W3C‑ova XML šema</comment> <comment xml:lang="ca">Esquema XML de la W3C</comment> <comment xml:lang="ca@valencia">Esquema XML de la W3C</comment> @@ -1112,7 +1096,6 @@ <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> - <comment xml:lang="ast">Ficheru de complementu de RealAudio</comment> <comment xml:lang="bs">RealAudio priključak</comment> <comment xml:lang="ca">Fitxer del connector RealAudio</comment> <comment xml:lang="ca@valencia">Fitxer del connector RealAudio</comment> @@ -1171,7 +1154,6 @@ <mime-type type="application/vnd.kde.kphotoalbum-import"> <!-- fdo #12732 rejected, will stay KDE-specific --> <comment>KPhotoAlbum import</comment> <comment xml:lang="ar">استيراد KPhotoAlbum</comment> - <comment xml:lang="ast">Importación de KPhotoAlbum</comment> <comment xml:lang="bs">KPhotoAlbumov uvoz</comment> <comment xml:lang="ca">Importació del KPhotoAlbum</comment> <comment xml:lang="ca@valencia">Importació del KPhotoAlbum</comment> @@ -1231,7 +1213,6 @@ <mime-type type="image/x-hdr"> <!-- TODO fdo report --> <comment>HDR image</comment> <comment xml:lang="ar">صورة HDR</comment> - <comment xml:lang="ast">Imaxe HDR</comment> <comment xml:lang="bg">Изображение HDR</comment> <comment xml:lang="bs">HDR slika</comment> <comment xml:lang="ca">Imatge HDR</comment> @@ -1298,7 +1279,6 @@ <sub-class-of type="image/x-dcraw"/> <comment>KDE raw image formats</comment> <comment xml:lang="ar">تنسيقات صور خام لكدي</comment> - <comment xml:lang="ast">Formatos d'imaxe en bruto de KDE</comment> <comment xml:lang="bs">KDE formati sirovih slika</comment> <comment xml:lang="ca">Formats d'imatge RAW del KDE</comment> <comment xml:lang="ca@valencia">Formats d'imatge RAW del KDE</comment> @@ -1371,7 +1351,6 @@ <sub-class-of type="text/plain"/> <comment>Intel® hexadecimal object file</comment> <comment xml:lang="ar">ملف كائن سداسي عشر Intel®</comment> - <comment xml:lang="ast">Ficheru d'oxetu hexadecimal d'Intel®</comment> <comment xml:lang="bs">Intelova heksadekadna objektna datoteka</comment> <comment xml:lang="ca">Fitxer objecte hexadecimal d'Intel®</comment> <comment xml:lang="ca@valencia">Fitxer objecte hexadecimal d'Intel®</comment> @@ -1554,7 +1533,6 @@ <sub-class-of type="application/zip"/> <comment>fonts package</comment> <comment xml:lang="ar">حزمة خطوط</comment> - <comment xml:lang="ast">paquete de fontes</comment> <comment xml:lang="bs">paket fontova</comment> <comment xml:lang="ca">Paquet de tipus de lletres</comment> <comment xml:lang="ca@valencia">Paquet de tipus de lletres</comment> @@ -1616,7 +1594,6 @@ <sub-class-of type="inode/directory"/> <comment>Windows server</comment> <comment xml:lang="ar">خادم ويندوز</comment> - <comment xml:lang="ast">Sirvidor de Windows</comment> <comment xml:lang="bs">windows server</comment> <comment xml:lang="ca">Servidor Windows</comment> <comment xml:lang="ca@valencia">Servidor Windows</comment> @@ -1677,7 +1654,6 @@ <sub-class-of type="inode/directory"/> <comment>Windows workgroup</comment> <comment xml:lang="ar">مجموعة عمل ويندوز</comment> - <comment xml:lang="ast">Grupu de trabayu de Windows</comment> <comment xml:lang="bs">windows radna grupa</comment> <comment xml:lang="ca">Treball en grup de Windows</comment> <comment xml:lang="ca@valencia">Treball en grup de Windows</comment> @@ -1738,7 +1714,6 @@ <!-- <sub-class-of type="application/xml"/> --> <comment>KDE system monitor</comment> <comment xml:lang="ar">نظام مراقبة كدي</comment> - <comment xml:lang="ast">Monitor del sistema KDE</comment> <comment xml:lang="bg">Системен монитор за KDE</comment> <comment xml:lang="bs">KDE sistemski monitor</comment> <comment xml:lang="ca">Controlador del sistema del KDE</comment> @@ -1800,7 +1775,6 @@ <sub-class-of type="application/zip"/> <comment>KDE theme</comment> <comment xml:lang="ar">سمة كدي</comment> - <comment xml:lang="ast">Tema de KDE</comment> <comment xml:lang="bg">Тема за KDE</comment> <comment xml:lang="bs">KDE tema</comment> <comment xml:lang="ca">Tema del KDE</comment> @@ -1863,7 +1837,6 @@ <sub-class-of type="text/plain"/> <comment>Quanta project</comment> <comment xml:lang="ar">مشروع Quanta</comment> - <comment xml:lang="ast">Proyeutu Quanta</comment> <comment xml:lang="bg">Проект на Quanta</comment> <comment xml:lang="bs">Quantin projekat</comment> <comment xml:lang="ca">Projecte del Quanta</comment> @@ -1925,7 +1898,6 @@ <sub-class-of type="text/plain"/> <comment>Kommander file</comment> <comment xml:lang="ar">ملف Kommander</comment> - <comment xml:lang="ast">Ficheru de Kommander</comment> <comment xml:lang="bg">Файл на Kommander</comment> <comment xml:lang="bs">Kommanderov fajl</comment> <comment xml:lang="ca">Fitxer del Kommander</comment> @@ -2045,7 +2017,6 @@ <mime-type type="application/x-kolf"> <comment>Kolf saved game</comment> <comment xml:lang="ar">لعبة Kolf محفوظة</comment> - <comment xml:lang="ast">Partida guardada de Kolf</comment> <comment xml:lang="bg">Запазена игра на Kolf</comment> <comment xml:lang="bs">Kolfova sačuvana igra</comment> <comment xml:lang="ca">Joc desat del Kolf</comment> @@ -2109,7 +2080,6 @@ <mime-type type="application/x-kourse"> <comment>Kolf course</comment> <comment xml:lang="ar">دورة Kolf</comment> - <comment xml:lang="ast">Cursu Kolf</comment> <comment xml:lang="bs">Kolfov teren</comment> <comment xml:lang="ca">Camp del Kolf</comment> <comment xml:lang="ca@valencia">Camp del Kolf</comment> @@ -2175,7 +2145,6 @@ <mime-type type="application/vnd.kde.okular-archive"> <comment>Okular document archive</comment> <comment xml:lang="ar">أرشيف مستند أوكلار</comment> - <comment xml:lang="ast">Archivu de documentu Okular</comment> <comment xml:lang="bs">Okularova arhiva dokumenata</comment> <comment xml:lang="ca">Arxiu de document de l'Okular</comment> <comment xml:lang="ca@valencia">Arxiu de document de l'Okular</comment> @@ -2236,7 +2205,6 @@ <mime-type type="application/x-cabri"> <comment>Cabri figure</comment> <comment xml:lang="ar">صورة Cabri</comment> - <comment xml:lang="ast">Figura Cabri</comment> <comment xml:lang="bs">Cabrijev crtež</comment> <comment xml:lang="ca">Figura del Cabri</comment> <comment xml:lang="ca@valencia">Figura del Cabri</comment> @@ -2301,7 +2269,6 @@ <mime-type type="application/x-drgeo"> <comment>Dr. Geo figure</comment> <comment xml:lang="ar">صورة Dr. Geo</comment> - <comment xml:lang="ast">Figura de Dr. Geo</comment> <comment xml:lang="bs">Dr Geov crtež</comment> <comment xml:lang="ca">Figura del Dr. Geo</comment> <comment xml:lang="ca@valencia">Figura del Dr. Geo</comment> @@ -2365,7 +2332,6 @@ <mime-type type="application/x-kgeo"> <comment>KGeo figure</comment> <comment xml:lang="ar">صورة KGeo</comment> - <comment xml:lang="ast">Ficheru KGeo</comment> <comment xml:lang="bg">Фигура за KGeo</comment> <comment xml:lang="bs">KGeov crtež</comment> <comment xml:lang="ca">Figura del KGeo</comment> @@ -2425,7 +2391,6 @@ <mime-type type="application/x-kig"> <comment>Kig figure</comment> <comment xml:lang="ar">صورة Kig</comment> - <comment xml:lang="ast">Figura Kig</comment> <comment xml:lang="bg">Фигура за Kig</comment> <comment xml:lang="bs">KIG‑ov crtež</comment> <comment xml:lang="ca">Figura del Kig</comment> @@ -2486,7 +2451,6 @@ <mime-type type="application/x-kseg"> <comment>KSeg document</comment> <comment xml:lang="ar">وثيقة KSeg</comment> - <comment xml:lang="ast">Documentu Kseg</comment> <comment xml:lang="bg">Документ KSeg</comment> <comment xml:lang="bs">KSegov dokument</comment> <comment xml:lang="ca">Document del KSeg</comment> @@ -2606,7 +2570,6 @@ <mime-type type="application/x-kmplot"> <comment>KmPlot file</comment> <comment xml:lang="ar">ملف KmPlot</comment> - <comment xml:lang="ast">Ficheru de KmPlot</comment> <comment xml:lang="bg">Файл на KmPlot</comment> <comment xml:lang="bs">KmPlot datoteka</comment> <comment xml:lang="ca">Fitxer del KmPlot</comment> @@ -2666,7 +2629,6 @@ <mime-type type="application/x-kwordquiz"> <comment>KWordQuiz vocabulary</comment> <comment xml:lang="ar">مفردات KWordQuiz</comment> - <comment xml:lang="ast">Vocabulariu KWordQuiz</comment> <comment xml:lang="bg">Речник KWordQuiz</comment> <comment xml:lang="bs">rječnik K‑kviza-riječi</comment> <comment xml:lang="ca">Vocabulari del KWordQuiz</comment> @@ -2786,7 +2748,6 @@ <mime-type type="application/x-uml"> <comment>Umbrello UML Modeller file</comment> <comment xml:lang="ar">ملف Umbrello UML Modeller </comment> - <comment xml:lang="ast">Ficheru del modelador UML Umbrello</comment> <comment xml:lang="bs">Umbrello UML datoteka</comment> <comment xml:lang="ca">Fitxer del modelador UML Umbrello</comment> <comment xml:lang="ca@valencia">Fitxer del modelador UML Umbrello</comment> @@ -2847,7 +2808,6 @@ <mime-type type="application/x-ms-shortcut"> <comment>Windows link</comment> <comment xml:lang="ar">وصلة ويندوز</comment> - <comment xml:lang="ast">Enllaz de Windows</comment> <comment xml:lang="bs">windows veza</comment> <comment xml:lang="ca">Enllaç del Windows</comment> <comment xml:lang="ca@valencia">Enllaç del Windows</comment> @@ -2910,7 +2870,6 @@ <sub-class-of type="application/xml"/> <comment>KGet download list</comment> <comment xml:lang="ar">قائمة تنزيل KGet</comment> - <comment xml:lang="ast">Llistáu de descargues de KGet</comment> <comment xml:lang="bg">Списък за изтегляне на KGet</comment> <comment xml:lang="bs">KGetova spisak preuzimanja</comment> <comment xml:lang="ca">Llista de baixades del KGet</comment> @@ -2971,7 +2930,6 @@ <mime-type type="application/x-kopete-emoticons"> <comment>Kopete emoticons archive</comment> <comment xml:lang="ar">أرشف إبتسامات Kopete</comment> - <comment xml:lang="ast">Archivu de fustaxe de Kopete</comment> <comment xml:lang="bs">Kopeteova arhiva emotikona</comment> <comment xml:lang="ca">Arxiu de les emoticones del Kopete</comment> <comment xml:lang="ca@valencia">Arxiu de les emoticones del Kopete</comment> @@ -3030,7 +2988,6 @@ <mime-type type="application/x-icq"> <comment>ICQ contact</comment> <comment xml:lang="ar">جهة اتصال ICQ</comment> - <comment xml:lang="ast">Contautu d'ICQ</comment> <comment xml:lang="bg">Контакт в ICQ</comment> <comment xml:lang="bs">ICQ kontakt</comment> <comment xml:lang="ca">Contacte de l'ICQ</comment> @@ -3095,7 +3052,6 @@ <mime-type type="video/x-ms-wmp"> <!-- fdo #19671, rejected because "not a file type, only a plugin type" --> <comment>Microsoft Media Format</comment> <comment xml:lang="ar">تنسيق وسائط مايكروسوفت</comment> - <comment xml:lang="ast">Formatu de medios de Microsoft</comment> <comment xml:lang="bg">Формат Microsoft Media</comment> <comment xml:lang="bs">Microsoftov medija format</comment> <comment xml:lang="ca">Format de suports de Microsoft</comment> @@ -3162,7 +3118,6 @@ <mime-type xmlns="http://www.freedesktop.org/standards/shared-mime-info"; type="application/x-turtle"> <!-- fdo #18089, but not in followup #32812 --> <comment>Turtle RDF document</comment> <comment xml:lang="ar">وثيقة Turtle RDF</comment> - <comment xml:lang="ast">Documentu RDF de Turtle</comment> <comment xml:lang="bs">Turtle RDF dokument</comment> <comment xml:lang="ca">Document RDF del Turtle</comment> <comment xml:lang="ca@valencia">Document RDF del Turtle</comment> @@ -3222,7 +3177,6 @@ <mime-type type="image/x-pic"> <!-- fdo #26038, needs update --> <comment>Softimage PIC image</comment> <comment xml:lang="ar">صورة PIC</comment> - <comment xml:lang="ast">Imaxe PIC de Softimage</comment> <comment xml:lang="bs">Softimidžova PIC slika</comment> <comment xml:lang="ca">Imatge PIC de Softimage</comment> <comment xml:lang="ca@valencia">Imatge PIC de Softimage</comment> @@ -3284,7 +3238,6 @@ <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> <comment xml:lang="bs">Datoteka Qt jezika za označavanje</comment> <comment xml:lang="ca">Fitxer de llenguatge de marques de les Qt</comment> <comment xml:lang="ca@valencia">Fitxer de llenguatge de marques de les Qt</comment>
