Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2015-09-02 07:44:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcoreaddons (Old) and /work/SRC/openSUSE:Factory/.kcoreaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcoreaddons" Changes: -------- --- /work/SRC/openSUSE:Factory/kcoreaddons/kcoreaddons.changes 2015-07-14 17:22:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new/kcoreaddons.changes 2015-09-02 07:44:29.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Aug 4 19:20:17 UTC 2015 - [email protected] + +- Update to 5.13.0 + * The Qt version requirement has been bumped from 5.2 to 5.3 + * Debug output has been ported to categorized output, for less + noise by default + * Docbook documentation has been reviewed and updated + * Add Kdelibs4Migration::kdeHome() for cases not covered by resources + * Fix tr() warning + * Fix KCoreAddons build on Clang+ARM + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.13.0.php + +------------------------------------------------------------------- Old: ---- kcoreaddons-5.12.0.tar.xz New: ---- kcoreaddons-5.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.DtaU8g/_old 2015-09-02 07:44:30.000000000 +0200 +++ /var/tmp/diff_new_pack.DtaU8g/_new 2015-09-02 07:44:30.000000000 +0200 @@ -18,19 +18,19 @@ %bcond_without lang %define lname libKF5CoreAddons5 -%define _tar_path 5.12 +%define _tar_path 5.13 Name: kcoreaddons -Version: 5.12.0 +Version: 5.13.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: kf5-filesystem %if %{with lang} -BuildRequires: libqt5-linguist-devel >= 5.2.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.3.0 %endif BuildRequires: shared-mime-info -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 +BuildRequires: cmake(Qt5Core) >= 5.3.0 Requires: shared-mime-info %if %{with lang} Recommends: %{name}-lang = %{version} @@ -67,7 +67,7 @@ Requires: %lname = %{version} Requires: %{name} = %{version} Requires: extra-cmake-modules -Requires: pkgconfig(Qt5Core) >= 5.2.0 +Requires: cmake(Qt5Core) >= 5.3.0 %description devel KCoreAddons provides classes built on top of QtCore to perform various tasks ++++++ kcoreaddons-5.12.0.tar.xz -> kcoreaddons-5.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.12.0/CMakeLists.txt new/kcoreaddons-5.13.0/CMakeLists.txt --- old/kcoreaddons-5.12.0/CMakeLists.txt 2015-07-05 10:55:25.000000000 +0200 +++ new/kcoreaddons-5.13.0/CMakeLists.txt 2015-08-04 12:49:20.000000000 +0200 @@ -3,7 +3,7 @@ project(KCoreAddons) include(FeatureSummary) -find_package(ECM 5.12.0 NO_MODULE) +find_package(ECM 5.13.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) @@ -20,7 +20,7 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(REQUIRED_QT_VERSION 5.2.0) +set(REQUIRED_QT_VERSION 5.3.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core) # Configure checks for kdirwatch @@ -41,7 +41,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.12.0") # handled by release scripts +set(KF5_VERSION "5.13.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCOREADDONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.12.0/README.md new/kcoreaddons-5.13.0/README.md --- old/kcoreaddons-5.12.0/README.md 2015-07-05 10:55:25.000000000 +0200 +++ new/kcoreaddons-5.13.0/README.md 2015-08-04 12:49:20.000000000 +0200 @@ -1,5 +1,7 @@ # KCoreAddons +Qt addon library with a collection of non-GUI utilities + ## Introduction KCoreAddons provides classes built on top of QtCore to perform various tasks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.12.0/po/ast/kcoreaddons5_qt.po new/kcoreaddons-5.13.0/po/ast/kcoreaddons5_qt.po --- old/kcoreaddons-5.12.0/po/ast/kcoreaddons5_qt.po 2015-07-05 10:55:25.000000000 +0200 +++ new/kcoreaddons-5.13.0/po/ast/kcoreaddons5_qt.po 2015-08-04 12:49:20.000000000 +0200 @@ -1,23 +1,23 @@ -# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# enolp <[email protected]>, 2015. msgid "" msgstr "" "Project-Id-Version: kdelibs4-1\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2012-12-28 17:14+0100\n" -"Last-Translator: ivarela <[email protected]>\n" -"Language-Team: asturian <[email protected]>\n" -"Language: \n" +"PO-Revision-Date: 2015-07-11 16:22+0100\n" +"Last-Translator: enolp <[email protected]>\n" +"Language-Team: Asturian <[email protected]>\n" +"Language: ast\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-Poedit-Language: asturian\n" "X-Qt-Contexts: true\n" +"X-Generator: Lokalize 2.0\n" #: lib/kaboutdata.cpp:226 #, fuzzy @@ -36,148 +36,92 @@ "términos de llicencia.\n" #: lib/kaboutdata.cpp:234 -#, fuzzy, qt-format -#| msgid "This program is distributed under the terms of the %1." +#, qt-format msgctxt "KAboutLicense|" msgid "This program is distributed under the terms of the %1." -msgstr "Esti programa úfrese embaxo los términos de %1." +msgstr "Esti programa distribúise so los términos de la %1." #: lib/kaboutdata.cpp:260 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "GPL v2" msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v2" msgstr "GPL v2" #: lib/kaboutdata.cpp:261 -#, fuzzy -#| msgctxt "@item license" -#| msgid "GNU General Public License Version 2" msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 2" msgstr "GNU General Public License Version 2" #: lib/kaboutdata.cpp:264 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "LGPL v2" msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2" msgstr "LGPL v2" #: lib/kaboutdata.cpp:265 -#, fuzzy -#| msgctxt "@item license" -#| msgid "GNU Lesser General Public License Version 2" msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2" msgstr "GNU Lesser General Public License Version 2" #: lib/kaboutdata.cpp:268 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "BSD License" msgctxt "KAboutLicense|@item license (short name)" msgid "BSD License" msgstr "BSD License" #: lib/kaboutdata.cpp:269 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "BSD License" msgctxt "KAboutLicense|@item license" msgid "BSD License" msgstr "BSD License" #: lib/kaboutdata.cpp:272 -#, fuzzy -#| msgctxt "@item license" -#| msgid "Artistic License" msgctxt "KAboutLicense|@item license (short name)" msgid "Artistic License" msgstr "Artistic License" #: lib/kaboutdata.cpp:273 -#, fuzzy -#| msgctxt "@item license" -#| msgid "Artistic License" msgctxt "KAboutLicense|@item license" msgid "Artistic License" msgstr "Artistic License" #: lib/kaboutdata.cpp:276 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "QPL v1.0" msgctxt "KAboutLicense|@item license (short name)" msgid "QPL v1.0" msgstr "QPL v1.0" #: lib/kaboutdata.cpp:277 -#, fuzzy -#| msgctxt "@item license" -#| msgid "Q Public License" msgctxt "KAboutLicense|@item license" msgid "Q Public License" msgstr "Q Public License" #: lib/kaboutdata.cpp:280 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "GPL v3" msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v3" msgstr "GPL v3" #: lib/kaboutdata.cpp:281 -#, fuzzy -#| msgctxt "@item license" -#| msgid "GNU General Public License Version 3" msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 3" msgstr "GNU General Public License Version 3" #: lib/kaboutdata.cpp:284 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "LGPL v3" msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v3" msgstr "LGPL v3" #: lib/kaboutdata.cpp:285 -#, fuzzy -#| msgctxt "@item license" -#| msgid "GNU Lesser General Public License Version 3" msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 3" msgstr "GNU Lesser General Public License Version 3" #: lib/kaboutdata.cpp:289 -#, fuzzy -#| msgctxt "@item license" -#| msgid "Custom" msgctxt "KAboutLicense|@item license" msgid "Custom" msgstr "Personal" #: lib/kaboutdata.cpp:292 -#, fuzzy -#| msgctxt "@item license" -#| msgid "Not specified" msgctxt "KAboutLicense|@item license" msgid "Not specified" msgstr "Ensin especificar" #: lib/kaboutdata.cpp:809 -#, fuzzy -#| msgctxt "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 " @@ -186,9 +130,8 @@ "org</a></p>" msgstr "" "<p>KDE traduzse a munches llingües gracies al trabayu de los equipos de " -"traducción de tol mundu.</p><p>Pa más información sobre la " -"internacionalización de KDE, visite <a href=\"http://l10n.kde.org\";>http://"; -"l10n.kde.org</a></p>" +"traducción de tol mundiu.</p><p>Pa más información na internacionalización " +"de KDE, visita <a href=\"http://l10n.kde.org\";>http://l10n.kde.org</a></p>" #: lib/kaboutdata.cpp:949 #, fuzzy @@ -225,265 +168,206 @@ "%2" #: lib/kaboutdata.cpp:972 -#, fuzzy -#| msgid "Please use http://bugs.kde.org to report bugs.\n" msgctxt "KAboutData CLI|" msgid "Please use http://bugs.kde.org to report bugs." -msgstr "Por favor usa http://bugs.kde.org pa informar de fallos.\n" +msgstr "Por favor, usa http://bugs.kde.org pa informar de fallos." #: lib/kaboutdata.cpp:974 -#, fuzzy -#| msgid "Please report bugs to %1.\n" msgctxt "KAboutData CLI|" msgid "Please report bugs to %s.\n" -msgstr "Por favor informa de fallos a %1.\n" +msgstr "Por favor, informa de fallos a %1.\n" #: lib/plugin/kpluginloader.cpp:122 -#, fuzzy, qt-format -#| msgid "The library %1 does not offer a KDE 4 compatible factory." +#, qt-format msgctxt "KPluginLoader|" msgid "The library %1 does not offer a KPluginFactory." -msgstr "La biblioteca %1 nun ufierta denguna «factory» compatible con KDE 4." +msgstr "La biblioteca %1 nun ufre un KPluginFactory." #. MetricBinaryDialect size in bytes #: lib/util/kformatprivate.cpp:88 -#, fuzzy, qt-format -#| msgctxt "size in bytes" -#| msgid "%1 B" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 B" msgstr "%1 B" #. MetricBinaryDialect size in 1000 bytes #: lib/util/kformatprivate.cpp:91 -#, fuzzy, qt-format -#| msgctxt "size in 1000 bytes" -#| msgid "%1 kB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 kB" msgstr "%1 kB" #. MetricBinaryDialect size in 10^6 bytes #: lib/util/kformatprivate.cpp:94 -#, fuzzy, qt-format -#| msgctxt "size in 10^6 bytes" -#| msgid "%1 MB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 MB" msgstr "%1 MB" #. MetricBinaryDialect size in 10^9 bytes #: lib/util/kformatprivate.cpp:97 -#, fuzzy, qt-format -#| msgctxt "size in 10^9 bytes" -#| msgid "%1 GB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 GB" msgstr "%1 GB" #. MetricBinaryDialect size in 10^12 bytes #: lib/util/kformatprivate.cpp:100 -#, fuzzy, qt-format -#| msgctxt "size in 10^12 bytes" -#| msgid "%1 TB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 TB" msgstr "%1 TB" #. MetricBinaryDialect size in 10^15 bytes #: lib/util/kformatprivate.cpp:103 -#, fuzzy, qt-format -#| msgctxt "size in 10^15 bytes" -#| msgid "%1 PB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 PB" msgstr "%1 PB" #. MetricBinaryDialect size in 10^18 byte #: lib/util/kformatprivate.cpp:106 -#, fuzzy, qt-format -#| msgctxt "size in 10^18 bytes" -#| msgid "%1 EB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 EB" msgstr "%1 EB" #. MetricBinaryDialect size in 10^21 bytes #: lib/util/kformatprivate.cpp:109 -#, fuzzy, qt-format -#| msgctxt "size in 10^21 bytes" -#| msgid "%1 ZB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 ZB" msgstr "%1 ZB" #. MetricBinaryDialect size in 10^24 bytes #: lib/util/kformatprivate.cpp:112 -#, fuzzy, qt-format -#| msgctxt "size in 10^24 bytes" -#| msgid "%1 YB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 YB" msgstr "%1 YB" #. JEDECBinaryDialect memory size in bytes #: lib/util/kformatprivate.cpp:118 -#, fuzzy, qt-format -#| msgctxt "size in bytes" -#| msgid "%1 B" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 B" msgstr "%1 B" #. JEDECBinaryDialect memory size in 1024 bytes #: lib/util/kformatprivate.cpp:121 -#, fuzzy, qt-format -#| msgctxt "memory size in 1024 bytes" -#| msgid "%1 KB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 KB" msgstr "%1 KB" #. JEDECBinaryDialect memory size in 10^20 bytes #: lib/util/kformatprivate.cpp:124 -#, fuzzy, qt-format -#| msgctxt "size in 10^6 bytes" -#| msgid "%1 MB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 MB" msgstr "%1 MB" #. JEDECBinaryDialect memory size in 10^30 bytes #: lib/util/kformatprivate.cpp:127 -#, fuzzy, qt-format -#| msgctxt "size in 10^9 bytes" -#| msgid "%1 GB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 GB" msgstr "%1 GB" #. JEDECBinaryDialect memory size in 10^40 bytes #: lib/util/kformatprivate.cpp:130 -#, fuzzy, qt-format -#| msgctxt "size in 10^12 bytes" -#| msgid "%1 TB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 TB" msgstr "%1 TB" #. JEDECBinaryDialect memory size in 10^50 bytes #: lib/util/kformatprivate.cpp:133 -#, fuzzy, qt-format -#| msgctxt "size in 10^15 bytes" -#| msgid "%1 PB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 PB" msgstr "%1 PB" #. JEDECBinaryDialect memory size in 10^60 bytes #: lib/util/kformatprivate.cpp:136 -#, fuzzy, qt-format -#| msgctxt "size in 10^18 bytes" -#| msgid "%1 EB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 EB" msgstr "%1 EB" #. JEDECBinaryDialect memory size in 10^70 bytes #: lib/util/kformatprivate.cpp:139 -#, fuzzy, qt-format -#| msgctxt "size in 10^21 bytes" -#| msgid "%1 ZB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 ZB" msgstr "%1 ZB" #. JEDECBinaryDialect memory size in 10^80 bytes #: lib/util/kformatprivate.cpp:142 -#, fuzzy, qt-format -#| msgctxt "size in 10^24 bytes" -#| msgid "%1 YB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 YB" msgstr "%1 YB" #. IECBinaryDialect size in bytes #: lib/util/kformatprivate.cpp:148 -#, fuzzy, qt-format -#| msgctxt "size in bytes" -#| msgid "%1 B" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 B" msgstr "%1 B" #. IECBinaryDialect size in 1024 bytes #: lib/util/kformatprivate.cpp:151 -#, fuzzy, qt-format -#| msgctxt "size in 1024 bytes" -#| msgid "%1 KiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 KiB" msgstr "%1 KiB" #. IECBinaryDialect size in 10^20 bytes #: lib/util/kformatprivate.cpp:154 -#, fuzzy, qt-format -#| msgctxt "size in 2^20 bytes" -#| msgid "%1 MiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 MiB" msgstr "%1 MiB" #. IECBinaryDialect size in 10^30 bytes #: lib/util/kformatprivate.cpp:157 -#, fuzzy, qt-format -#| msgctxt "size in 2^30 bytes" -#| msgid "%1 GiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 GiB" msgstr "%1 GiB" #. IECBinaryDialect size in 10^40 bytes #: lib/util/kformatprivate.cpp:160 -#, fuzzy, qt-format -#| msgctxt "size in 2^40 bytes" -#| msgid "%1 TiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 TiB" msgstr "%1 TiB" #. IECBinaryDialect size in 10^50 bytes #: lib/util/kformatprivate.cpp:163 -#, fuzzy, qt-format -#| msgctxt "size in 2^50 bytes" -#| msgid "%1 PiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 PiB" msgstr "%1 PiB" #. IECBinaryDialect size in 10^60 bytes #: lib/util/kformatprivate.cpp:166 -#, fuzzy, qt-format -#| msgctxt "size in 2^60 bytes" -#| msgid "%1 EiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 EiB" msgstr "%1 EiB" #. IECBinaryDialect size in 10^70 bytes #: lib/util/kformatprivate.cpp:169 -#, fuzzy, qt-format -#| msgctxt "size in 2^70 bytes" -#| msgid "%1 ZiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 ZiB" msgstr "%1 ZiB" #. IECBinaryDialect size in 10^80 bytes #: lib/util/kformatprivate.cpp:172 -#, fuzzy, qt-format -#| msgctxt "size in 2^80 bytes" -#| msgid "%1 YiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 YiB" msgstr "%1 YiB" @@ -555,95 +439,76 @@ #. @item:intext %1 is a real number, e.g. 1.23 days #: lib/util/kformatprivate.cpp:269 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 days" -#| msgid "%1 days" +#, 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:272 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 hours" -#| msgid "%1 hours" +#, 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:275 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 minutes" -#| msgid "%1 minutes" +#, 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:278 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 seconds" -#| msgid "%1 seconds" +#, qt-format msgctxt "KFormat|" msgid "%1 seconds" msgstr "%1 segundos" #. @item:intext %1 is a whole number #: lib/util/kformatprivate.cpp:283 -#, fuzzy, qt-format -#| msgctxt "@item:intext" -#| msgid "%1 millisecond" -#| msgid_plural "%1 milliseconds" +#, qt-format msgctxt "KFormat|" msgid "%n millisecond(s)" msgid_plural "%n millisecond(s)" -msgstr[0] "%1 milisegundu" -msgstr[1] "%1 milisegundos" +msgstr[0] "%n milisegundu" +msgstr[1] "%n milisegundos" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:301 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 days" -#| msgid "%1 days" +#, qt-format msgctxt "KFormat|" msgid "%n day(s)" msgid_plural "%n day(s)" -msgstr[0] "%1 díes" -msgstr[1] "%1 díes" +msgstr[0] "%n día" +msgstr[1] "%n díes" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:306 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 hours" -#| msgid "%1 hours" +#, qt-format msgctxt "KFormat|" msgid "%n hour(s)" msgid_plural "%n hour(s)" -msgstr[0] "%1 hores" -msgstr[1] "%1 hores" +msgstr[0] "%n hora" +msgstr[1] "%n hores" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:311 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 minutes" -#| msgid "%1 minutes" +#, qt-format msgctxt "KFormat|" msgid "%n minute(s)" msgid_plural "%n minute(s)" -msgstr[0] "%1 minutos" -msgstr[1] "%1 minutos" +msgstr[0] "%n minutu" +msgstr[1] "%n minutos" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:316 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 seconds" -#| msgid "%1 seconds" +#, qt-format msgctxt "KFormat|" msgid "%n second(s)" msgid_plural "%n second(s)" -msgstr[0] "%1 segundos" -msgstr[1] "%1 segundos" +msgstr[0] "%n segundu" +msgstr[1] "%n segundos" #. @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 #. ---------- @@ -652,34 +517,22 @@ #. @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:341 lib/util/kformatprivate.cpp:348 #: lib/util/kformatprivate.cpp:355 -#, fuzzy, qt-format -#| msgctxt "" -#| "@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" -#| msgid "%1 and %2" +#, qt-format msgctxt "KFormat|" msgid "%1 and %2" msgstr "%1 y %2" #: lib/util/kformatprivate.cpp:373 -#, fuzzy -#| msgctxt "@option tomorrow" -#| msgid "Tomorrow" msgctxt "KFormat|" msgid "Tomorrow" msgstr "Mañana" #: lib/util/kformatprivate.cpp:375 -#, fuzzy -#| msgid "Today" msgctxt "KFormat|" msgid "Today" msgstr "Güei" #: lib/util/kformatprivate.cpp:377 -#, fuzzy -#| msgid "Yesterday" msgctxt "KFormat|" msgid "Yesterday" msgstr "Ayeri" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.12.0/po/fr/kcoreaddons5_qt.po new/kcoreaddons-5.13.0/po/fr/kcoreaddons5_qt.po --- old/kcoreaddons-5.12.0/po/fr/kcoreaddons5_qt.po 2015-07-05 10:55:25.000000000 +0200 +++ new/kcoreaddons-5.13.0/po/fr/kcoreaddons5_qt.po 2015-08-04 12:49:20.000000000 +0200 @@ -24,10 +24,10 @@ "PO-Revision-Date: 2014-07-02 13:50+0200\n" "Last-Translator: Sebastien Renard <[email protected]>\n" "Language-Team: French <[email protected]>\n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" "X-Environment: kde\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.12.0/src/lib/io/kdirwatch.cpp new/kcoreaddons-5.13.0/src/lib/io/kdirwatch.cpp --- old/kcoreaddons-5.12.0/src/lib/io/kdirwatch.cpp 2015-07-05 10:55:25.000000000 +0200 +++ new/kcoreaddons-5.13.0/src/lib/io/kdirwatch.cpp 2015-08-04 12:49:20.000000000 +0200 @@ -82,7 +82,12 @@ #endif // HAVE_SYS_INOTIFY_H +#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) +// logging category for this framework, default: log stuff >= warning +Q_LOGGING_CATEGORY(KDIRWATCH, "kf5.kcoreaddons.kdirwatch", QtWarningMsg) +#else Q_LOGGING_CATEGORY(KDIRWATCH, "kf5.kcoreaddons.kdirwatch") +#endif // set this to true for much more verbose debug output static const bool s_verboseDebug = false; @@ -223,7 +228,7 @@ availableMethods << "QFileSystemWatcher"; fsWatcher = 0; #endif - + if (s_verboseDebug) { qCDebug(KDIRWATCH) << "Available methods: " << availableMethods << "preferred=" << methodToString(m_preferredMethod); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.12.0/src/lib/io/kfilesystemtype.cpp new/kcoreaddons-5.13.0/src/lib/io/kfilesystemtype.cpp --- old/kcoreaddons-5.12.0/src/lib/io/kfilesystemtype.cpp 2015-07-05 10:55:25.000000000 +0200 +++ new/kcoreaddons-5.13.0/src/lib/io/kfilesystemtype.cpp 2015-08-04 12:49:20.000000000 +0200 @@ -99,7 +99,7 @@ //qDebug() << path << errno << strerror(errno); return KFileSystemType::Unknown; } - switch (buf.f_type) { + switch (static_cast<unsigned long>(buf.f_type)) { case NFS_SUPER_MAGIC: case AUTOFS_SUPER_MAGIC: case AUTOFSNG_SUPER_MAGIC: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.12.0/src/lib/jobs/kjob_p.h new/kcoreaddons-5.13.0/src/lib/jobs/kjob_p.h --- old/kcoreaddons-5.12.0/src/lib/jobs/kjob_p.h 2015-07-05 10:55:25.000000000 +0200 +++ new/kcoreaddons-5.13.0/src/lib/jobs/kjob_p.h 2015-08-04 12:49:20.000000000 +0200 @@ -50,8 +50,8 @@ unsigned long percentage; QTimer *speedTimer; QEventLoop *eventLoop; - // evenLoopLocker prevents QCoreApplication from exiting when last window is - // closed until the job has finished running + // eventLoopLocker prevents QCoreApplication from exiting when the last + // window is closed until the job has finished running QEventLoopLocker eventLoopLocker; KJob::Capabilities capabilities; bool suspended; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.12.0/src/lib/util/kdelibs4migration.cpp new/kcoreaddons-5.13.0/src/lib/util/kdelibs4migration.cpp --- old/kcoreaddons-5.12.0/src/lib/util/kdelibs4migration.cpp 2015-07-05 10:55:25.000000000 +0200 +++ new/kcoreaddons-5.13.0/src/lib/util/kdelibs4migration.cpp 2015-08-04 12:49:20.000000000 +0200 @@ -68,6 +68,11 @@ return !d->m_kdeHome.isEmpty() && QDir(d->m_kdeHome).exists(); } +QString Kdelibs4Migration::kdeHome() const +{ + return d->m_kdeHome; +} + QString Kdelibs4Migration::locateLocal(const char *type, const QString &filename) const { if (d->m_kdeHome.isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.12.0/src/lib/util/kdelibs4migration.h new/kcoreaddons-5.13.0/src/lib/util/kdelibs4migration.h --- old/kcoreaddons-5.12.0/src/lib/util/kdelibs4migration.h 2015-07-05 10:55:25.000000000 +0200 +++ new/kcoreaddons-5.13.0/src/lib/util/kdelibs4migration.h 2015-08-04 12:49:20.000000000 +0200 @@ -36,8 +36,8 @@ * Kdelibs4Migration provides support for locating config files * and application data files saved by kdelibs 4 in the user's home directory * ($KDEHOME, i.e. typically ~/.kde). - * - * distributions that built kdelibs4 with a custom KDE home with + * + * Distributions that built kdelibs4 with a custom KDE home with * the CMake option _KDE_DEFAULT_HOME_POSTFIX should use the same option * here with _KDE4_DEFAULT_HOME_POSTFIX * @@ -50,6 +50,18 @@ * Files from the "data" resource should be migrated to a subdirectory of * QStandardPaths::writableLocation(QStandardPaths::DataLocation) * + * The following resources are supported: + <ul> + <li>config</li> + <li>data</li> + <li>services</li> + <li>servicetypes</li> + <li>wallpaper</li> + <li>emoticons</li> + <li>templates</li> + </ul> + * Use kdeHome() for anything else. + * * @short Class for migration of config files from kdelibs4 * @since 5.0 */ @@ -74,6 +86,13 @@ bool kdeHomeFound() const; /** + * Returns the kdehome that was found. + * Don't use this method if you can use locateLocal or saveLocation + * @since 5.13 + */ + QString kdeHome() const; + + /** * Finds a local file in a resource. * This API is inspired by KStandardDirs::locateLocal for ease of porting. * @param type The type of wanted resource. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.12.0/src/lib/util/kformatprivate.cpp new/kcoreaddons-5.13.0/src/lib/util/kformatprivate.cpp --- old/kcoreaddons-5.12.0/src/lib/util/kformatprivate.cpp 2015-07-05 10:55:25.000000000 +0200 +++ new/kcoreaddons-5.13.0/src/lib/util/kformatprivate.cpp 2015-08-04 12:49:20.000000000 +0200 @@ -280,7 +280,7 @@ //: @item:intext %1 is a whole number //~ singular %n millisecond //~ plural %n milliseconds - return tr("%n millisecond(s)", 0, msecs).arg(msecs); + return tr("%n millisecond(s)", 0, msecs); } enum DurationUnits {
