Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2015-06-23 12:06:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-11 19:47:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new/kcoreaddons.changes 2015-06-23 12:06:57.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Jun 7 19:07:15 UTC 2015 - [email protected] + +- Update to 5.11.0 + * New KPluginLoader::findPluginById() convenience API + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.11.0.php + +------------------------------------------------------------------- Old: ---- kcoreaddons-5.10.0.tar.xz New: ---- kcoreaddons-5.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.rfYlN1/_old 2015-06-23 12:06:57.000000000 +0200 +++ /var/tmp/diff_new_pack.rfYlN1/_new 2015-06-23 12:06:57.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5CoreAddons5 -%define _tar_path 5.10 +%define _tar_path 5.11 Name: kcoreaddons -Version: 5.10.0 +Version: 5.11.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kcoreaddons-5.10.0.tar.xz -> kcoreaddons-5.11.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.10.0/CMakeLists.txt new/kcoreaddons-5.11.0/CMakeLists.txt --- old/kcoreaddons-5.10.0/CMakeLists.txt 2015-05-03 17:07:03.000000000 +0200 +++ new/kcoreaddons-5.11.0/CMakeLists.txt 2015-06-06 23:11:15.000000000 +0200 @@ -2,11 +2,15 @@ project(KCoreAddons) -find_package(ECM 5.10.0 REQUIRED NO_MODULE) +include(FeatureSummary) +find_package(ECM 5.11.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) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -include(FeatureSummary) + include(GenerateExportHeader) include(ECMPackageConfigHelpers) include(ECMSetupVersion) @@ -37,7 +41,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.10.0") # handled by release scripts +set(KF5_VERSION "5.11.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.10.0/autotests/data/fakeplugin.desktop new/kcoreaddons-5.11.0/autotests/data/fakeplugin.desktop --- old/kcoreaddons-5.10.0/autotests/data/fakeplugin.desktop 2015-05-03 17:07:03.000000000 +0200 +++ new/kcoreaddons-5.11.0/autotests/data/fakeplugin.desktop 2015-06-06 23:11:15.000000000 +0200 @@ -14,6 +14,7 @@ Name[ko]=NSA 플러그인 Name[nb]=NSA programtillegg Name[nl]=NSA-plug-in +Name[nn]=NSA-tillegg Name[pl]=Wtyczka NSA Name[pt]='Plugin' da NSA Name[pt_BR]=Plugin NSA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.10.0/autotests/data/hiddenplugin.desktop new/kcoreaddons-5.11.0/autotests/data/hiddenplugin.desktop --- old/kcoreaddons-5.10.0/autotests/data/hiddenplugin.desktop 2015-05-03 17:07:03.000000000 +0200 +++ new/kcoreaddons-5.11.0/autotests/data/hiddenplugin.desktop 2015-06-06 23:11:15.000000000 +0200 @@ -14,6 +14,7 @@ Name[ko]=NSA 플러그인 Name[nb]=NSA programtillegg Name[nl]=NSA-plug-in +Name[nn]=NSA-tillegg Name[pl]=Wtyczka NSA Name[pt]='Plugin' da NSA Name[pt_BR]=Plugin NSA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.10.0/autotests/kpluginloadertest.cpp new/kcoreaddons-5.11.0/autotests/kpluginloadertest.cpp --- old/kcoreaddons-5.10.0/autotests/kpluginloadertest.cpp 2015-05-03 17:07:03.000000000 +0200 +++ new/kcoreaddons-5.11.0/autotests/kpluginloadertest.cpp 2015-06-06 23:11:15.000000000 +0200 @@ -348,6 +348,15 @@ QCOMPARE(plugins[0].description(), QStringLiteral("This is another plugin")); QCOMPARE(plugins[1].description(), QStringLiteral("This is a plugin")); + // by plugin id + plugins = KPluginLoader::findPluginsById(dir.absolutePath(), "foobar"); + QCOMPARE(plugins.size(), 1); + QCOMPARE(plugins[0].description(), QStringLiteral("This is another plugin")); + + // by plugin invalid id + plugins = KPluginLoader::findPluginsById(dir.absolutePath(), "invalidid"); + QCOMPARE(plugins.size(), 0); + // absolute path, no filter plugins = KPluginLoader::findPlugins(dir.absolutePath()); std::sort(plugins.begin(), plugins.end(), sortPlugins); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.10.0/autotests/kusertest.cpp new/kcoreaddons-5.11.0/autotests/kusertest.cpp --- old/kcoreaddons-5.10.0/autotests/kusertest.cpp 2015-05-03 17:07:03.000000000 +0200 +++ new/kcoreaddons-5.11.0/autotests/kusertest.cpp 2015-06-06 23:11:15.000000000 +0200 @@ -100,12 +100,12 @@ QVERIFY(user != invalidKUser); // now test the other way around QCOMPARE(user, user); - // make sure we don't crash when accessing properties of an invalid instace + // make sure we don't crash when accessing properties of an invalid instance QCOMPARE(invalidKUser.faceIconPath(), QString()); QCOMPARE(invalidKUser.fullName(), QString()); QCOMPARE(invalidKUser.groupId(), KGroupId()); - QCOMPARE(invalidKUser.groupNames(), QStringList()); - QCOMPARE(invalidKUser.groups(), QList<KUserGroup>()); + invalidKUser.groupNames(); // could be empty, or "nogroup", so no checks here + invalidKUser.groups(); // same as above QCOMPARE(invalidKUser.homeDir(), QString()); QCOMPARE(invalidKUser.isSuperUser(), false); QCOMPARE(invalidKUser.loginName(), QString()); @@ -166,7 +166,7 @@ // make sure we don't crash when accessing an invalid KUserGroup QCOMPARE(invalidKUserGroup.groupId(), KGroupId()); - QCOMPARE(invalidKUserGroup.name(), QString()); + invalidKUserGroup.name(); // could be empty, or "nogroup", so no checks here QCOMPARE(invalidKUserGroup.userNames(), QStringList()); QCOMPARE(invalidKUserGroup.users(), QList<KUser>()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.10.0/po/nb/kcoreaddons5_qt.po new/kcoreaddons-5.11.0/po/nb/kcoreaddons5_qt.po --- old/kcoreaddons-5.10.0/po/nb/kcoreaddons5_qt.po 2015-05-03 17:07:03.000000000 +0200 +++ new/kcoreaddons-5.11.0/po/nb/kcoreaddons5_qt.po 2015-06-06 23:11:15.000000000 +0200 @@ -1,10 +1,10 @@ # Translation of kcoreaddons5_qt to Norwegian Bokmål # -# Knut Yrvin <[email protected]>, 2002, 2003, 2004, 2005. +# Knut Yrvin <[email protected]>, 2002, 2003, 2004, 2005. # Bjørn Steensrud <[email protected]>, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Eskild Hustvedt <[email protected]>, 2004, 2005. # Gaute Hvoslef Kvalnes <[email protected]>, 2004, 2005. -# Axel Bojer <[email protected]>, 2005, 2006. +# Axel Bojer <[email protected]>, 2005, 2006. # Nils Kristian Tomren <[email protected]>, 2005, 2007. # Øyvind A. Holm <[email protected]>, 2009. msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.10.0/po/nn/kcoreaddons5_qt.po new/kcoreaddons-5.11.0/po/nn/kcoreaddons5_qt.po --- old/kcoreaddons-5.10.0/po/nn/kcoreaddons5_qt.po 2015-05-03 17:07:03.000000000 +0200 +++ new/kcoreaddons-5.11.0/po/nn/kcoreaddons5_qt.po 2015-06-06 23:11:15.000000000 +0200 @@ -2,21 +2,21 @@ # # Gaute Hvoslef Kvalnes <[email protected]>, 2003, 2004, 2005, 2006. # Håvard Korsvoll <[email protected]>, 2003, 2005. -# Karl Ove Hufthammer <[email protected]>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Karl Ove Hufthammer <[email protected]>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Eirik U. Birkeland <[email protected]>, 2008, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-02-28 03:44+0000\n" -"PO-Revision-Date: 2013-05-12 14:38+0200\n" +"PO-Revision-Date: 2015-06-03 18:59+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" @@ -24,7 +24,6 @@ "X-Qt-Contexts: true\n" #: lib/kaboutdata.cpp:226 -#, fuzzy msgctxt "KAboutLicense|" msgid "" "No licensing terms for this program have been specified.\n" @@ -36,109 +35,92 @@ "eller kjeldekoden.\n" #: lib/kaboutdata.cpp:234 -#, fuzzy, qt-format +#, qt-format msgctxt "KAboutLicense|" msgid "This program is distributed under the terms of the %1." -msgstr "Dette programmet er distribuert ifølgje vilkåra i %1." +msgstr "Dette programmet er distribuert etter vilkåra i %1." #: lib/kaboutdata.cpp:260 -#, fuzzy msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v2" msgstr "GPL v2" #: lib/kaboutdata.cpp:261 -#, fuzzy msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 2" msgstr "GNU General Public License versjon 2" #: lib/kaboutdata.cpp:264 -#, fuzzy msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2" msgstr "LGPL v2" #: lib/kaboutdata.cpp:265 -#, fuzzy msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2" msgstr "GNU Lesser General Public License versjon 2" #: lib/kaboutdata.cpp:268 -#, fuzzy msgctxt "KAboutLicense|@item license (short name)" msgid "BSD License" msgstr "BSD-lisensen" #: lib/kaboutdata.cpp:269 -#, fuzzy msgctxt "KAboutLicense|@item license" msgid "BSD License" msgstr "BSD-lisensen" #: lib/kaboutdata.cpp:272 -#, fuzzy msgctxt "KAboutLicense|@item license (short name)" msgid "Artistic License" msgstr "Artistic-lisensen" #: lib/kaboutdata.cpp:273 -#, fuzzy msgctxt "KAboutLicense|@item license" msgid "Artistic License" msgstr "Artistic-lisensen" #: lib/kaboutdata.cpp:276 -#, fuzzy msgctxt "KAboutLicense|@item license (short name)" msgid "QPL v1.0" msgstr "QPL v1.0" #: lib/kaboutdata.cpp:277 -#, fuzzy msgctxt "KAboutLicense|@item license" msgid "Q Public License" msgstr "Q Public License" #: lib/kaboutdata.cpp:280 -#, fuzzy msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v3" msgstr "GPL v3" #: lib/kaboutdata.cpp:281 -#, fuzzy msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 3" msgstr "GNU General Public License versjon 3" #: lib/kaboutdata.cpp:284 -#, fuzzy msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v3" msgstr "LGPL v3" #: lib/kaboutdata.cpp:285 -#, fuzzy msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 3" msgstr "GNU Lesser General Public License versjon 3" #: lib/kaboutdata.cpp:289 -#, fuzzy msgctxt "KAboutLicense|@item license" msgid "Custom" -msgstr "Sjølvvald" +msgstr "Tilpassa" #: lib/kaboutdata.cpp:292 -#, fuzzy msgctxt "KAboutLicense|@item license" msgid "Not specified" -msgstr "Ikkje oppgjeven" +msgstr "Ikkje oppgjevne" #: lib/kaboutdata.cpp:809 -#, 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 " @@ -160,232 +142,226 @@ "kde.org/</a>.</p>" #: lib/kaboutdata.cpp:949 -#, fuzzy msgctxt "KAboutData CLI|" msgid "Show author information." -msgstr "Vis forfattarinformasjon" +msgstr "Vis forfattarinformasjon." #: lib/kaboutdata.cpp:950 -#, fuzzy msgctxt "KAboutData CLI|" msgid "Show license information." -msgstr "Vis lisensinformasjon" +msgstr "Vis lisensinformasjon." #: lib/kaboutdata.cpp:959 -#, fuzzy msgctxt "KAboutData CLI|" msgid "This application was written by somebody who wants to remain anonymous." msgstr "Dette programmet er skrive av nokon som vil vera anonyme." #: lib/kaboutdata.cpp:961 -#, fuzzy msgctxt "KAboutData CLI|" msgid "%s was written by:\n" -msgstr "" -"%1 er skrive av\n" -"%2" +msgstr "%s er skrive av:\n" #: lib/kaboutdata.cpp:972 msgctxt "KAboutData CLI|" msgid "Please use http://bugs.kde.org to report bugs." -msgstr "" +msgstr "Bruk http://bugs.kde.org/ for å melda frå om feil." #: lib/kaboutdata.cpp:974 msgctxt "KAboutData CLI|" msgid "Please report bugs to %s.\n" -msgstr "" +msgstr "Meld frå om feil til %1.\n" #: lib/plugin/kpluginloader.cpp:122 #, qt-format msgctxt "KPluginLoader|" msgid "The library %1 does not offer a KPluginFactory." -msgstr "" +msgstr "Biblioteket %1 tilbyr ikkje ein KPluginFactory." #. MetricBinaryDialect size in bytes #: lib/util/kformatprivate.cpp:88 -#, fuzzy, qt-format +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 B" msgstr "%1 B" #. MetricBinaryDialect size in 1000 bytes #: lib/util/kformatprivate.cpp:91 -#, fuzzy, qt-format +#, 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 +#, 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 +#, 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 +#, 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 +#, 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 +#, 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 +#, 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 +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 YB" msgstr "%1 YB" #. JEDECBinaryDialect memory size in bytes #: lib/util/kformatprivate.cpp:118 -#, fuzzy, qt-format +#, 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 +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 KB" -msgstr "%1 KiB" +msgstr "%1 KB" #. JEDECBinaryDialect memory size in 10^20 bytes #: lib/util/kformatprivate.cpp:124 -#, fuzzy, qt-format +#, 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 +#, 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 +#, 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 +#, 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 +#, 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 +#, 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 +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 YB" msgstr "%1 YB" #. IECBinaryDialect size in bytes #: lib/util/kformatprivate.cpp:148 -#, fuzzy, qt-format +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 B" msgstr "%1 B" #. IECBinaryDialect size in 1024 bytes #: lib/util/kformatprivate.cpp:151 -#, fuzzy, qt-format +#, 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 +#, 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 +#, 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 +#, 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 +#, 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 +#, 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 +#, 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 +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 YiB" msgstr "%1 YiB" @@ -395,42 +371,42 @@ #, qt-format msgctxt "KFormat|" msgid "%1m%2.%3s" -msgstr "" +msgstr "%1m%2,%3s" #. @item:intext Duration format minutes and seconds #: lib/util/kformatprivate.cpp:210 #, qt-format msgctxt "KFormat|" msgid "%1m%2s" -msgstr "" +msgstr "%1m%2s" #. @item:intext Duration format hours and minutes #: lib/util/kformatprivate.cpp:214 #, qt-format msgctxt "KFormat|" msgid "%1h%2m" -msgstr "" +msgstr "%1t%2m" #. @item:intext Duration format hours, minutes, seconds, milliseconds #: lib/util/kformatprivate.cpp:218 #, qt-format msgctxt "KFormat|" msgid "%1h%2m%3.%4s" -msgstr "" +msgstr "%1t%2m%3,%4s" #. @item:intext Duration format hours, minutes, seconds #: lib/util/kformatprivate.cpp:224 #, qt-format msgctxt "KFormat|" msgid "%1h%2m%3s" -msgstr "" +msgstr "%1t%2m%3s" #. @item:intext Duration format minutes, seconds and milliseconds #: lib/util/kformatprivate.cpp:234 #, qt-format msgctxt "KFormat|" msgid "%1:%2.%3" -msgstr "" +msgstr "%1.%2,%3" #. @item:intext Duration format minutes and seconds #. ---------- @@ -439,46 +415,46 @@ #, qt-format msgctxt "KFormat|" msgid "%1:%2" -msgstr "" +msgstr "%1.%2" #. @item:intext Duration format hours, minutes, seconds, milliseconds #: lib/util/kformatprivate.cpp:247 #, qt-format msgctxt "KFormat|" msgid "%1:%2:%3.%4" -msgstr "" +msgstr "%1.%2.%3,%4" #. @item:intext Duration format hours, minutes, seconds #: lib/util/kformatprivate.cpp:253 #, qt-format msgctxt "KFormat|" msgid "%1:%2:%3" -msgstr "" +msgstr "%1.%2.%3" #. @item:intext %1 is a real number, e.g. 1.23 days #: lib/util/kformatprivate.cpp:269 -#, fuzzy, qt-format +#, qt-format msgctxt "KFormat|" msgid "%1 days" msgstr "%1 dagar" #. @item:intext %1 is a real number, e.g. 1.23 hours #: lib/util/kformatprivate.cpp:272 -#, fuzzy, qt-format +#, qt-format msgctxt "KFormat|" msgid "%1 hours" msgstr "%1 timar" #. @item:intext %1 is a real number, e.g. 1.23 minutes #: lib/util/kformatprivate.cpp:275 -#, fuzzy, qt-format +#, qt-format msgctxt "KFormat|" msgid "%1 minutes" msgstr "%1 minutt" #. @item:intext %1 is a real number, e.g. 1.23 seconds #: lib/util/kformatprivate.cpp:278 -#, fuzzy, qt-format +#, qt-format msgctxt "KFormat|" msgid "%1 seconds" msgstr "%1 sekund" @@ -489,44 +465,44 @@ msgctxt "KFormat|" msgid "%n millisecond(s)" msgid_plural "%n millisecond(s)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%n millisekund" +msgstr[1] "%n millisekund" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:301 -#, fuzzy, qt-format +#, qt-format msgctxt "KFormat|" msgid "%n day(s)" msgid_plural "%n day(s)" -msgstr[0] "%1 dagar" -msgstr[1] "%1 dagar" +msgstr[0] "%n dag" +msgstr[1] "%n dagar" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:306 -#, fuzzy, qt-format +#, qt-format msgctxt "KFormat|" msgid "%n hour(s)" msgid_plural "%n hour(s)" -msgstr[0] "%1 timar" -msgstr[1] "%1 timar" +msgstr[0] "%n time" +msgstr[1] "%n timar" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:311 -#, fuzzy, qt-format +#, qt-format msgctxt "KFormat|" msgid "%n minute(s)" msgid_plural "%n minute(s)" -msgstr[0] "%1 minutt" -msgstr[1] "%1 minutt" +msgstr[0] "%n minutt" +msgstr[1] "%n minutt" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:316 -#, fuzzy, qt-format +#, qt-format msgctxt "KFormat|" msgid "%n second(s)" msgid_plural "%n second(s)" -msgstr[0] "%1 sekund" -msgstr[1] "%1 sekund" +msgstr[0] "%n sekund" +msgstr[1] "%n sekund" #. @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 #. ---------- @@ -535,44 +511,41 @@ #. @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 +#, qt-format msgctxt "KFormat|" msgid "%1 and %2" msgstr "%1 og %2" #: lib/util/kformatprivate.cpp:373 -#, fuzzy msgctxt "KFormat|" msgid "Tomorrow" msgstr "I morgon" #: lib/util/kformatprivate.cpp:375 -#, fuzzy msgctxt "KFormat|" msgid "Today" msgstr "I dag" #: lib/util/kformatprivate.cpp:377 -#, fuzzy msgctxt "KFormat|" msgid "Yesterday" msgstr "I går" #: lib/util/kformatprivate.cpp:384 -#, fuzzy, qt-format +#, qt-format msgctxt "KFormat|" msgid "Last %1" -msgstr "Førre veke" +msgstr "Siste %1" #: lib/util/kformatprivate.cpp:389 -#, fuzzy, qt-format +#, qt-format msgctxt "KFormat|" msgid "Next %1" -msgstr "Neste" +msgstr "Neste %1" #. 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:404 -#, fuzzy, qt-format +#, qt-format msgctxt "KFormat|" msgid "%1, %2" msgstr "%1, %2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.10.0/src/lib/plugin/kpluginloader.cpp new/kcoreaddons-5.11.0/src/lib/plugin/kpluginloader.cpp --- old/kcoreaddons-5.10.0/src/lib/plugin/kpluginloader.cpp 2015-05-03 17:07:03.000000000 +0200 +++ new/kcoreaddons-5.11.0/src/lib/plugin/kpluginloader.cpp 2015-06-06 23:11:15.000000000 +0200 @@ -275,6 +275,15 @@ return ret; } +QVector< KPluginMetaData > KPluginLoader::findPluginsById(const QString& directory, const QString& pluginId) +{ + auto filter = [&pluginId](const KPluginMetaData &md) -> bool + { + return md.pluginId() == pluginId; + }; + return KPluginLoader::findPlugins(directory, filter); +} + QList<QObject *> KPluginLoader::instantiatePlugins(const QString &directory, std::function<bool(const KPluginMetaData &)> filter, QObject* parent) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.10.0/src/lib/plugin/kpluginloader.h new/kcoreaddons-5.11.0/src/lib/plugin/kpluginloader.h --- old/kcoreaddons-5.10.0/src/lib/plugin/kpluginloader.h 2015-05-03 17:07:03.000000000 +0200 +++ new/kcoreaddons-5.11.0/src/lib/plugin/kpluginloader.h 2015-06-06 23:11:15.000000000 +0200 @@ -330,6 +330,23 @@ std::function<bool(const KPluginMetaData &)> filter = std::function<bool(const KPluginMetaData &)>()); /** + * Find all plugins inside @p directory with a given pluginId. Only plugins which have JSON metadata will be considered. + * + * @param directory The directory to search for plugins. If a relative path is given for @p directory, + * all entries of QCoreApplication::libraryPaths() will be checked with @p directory appended as a + * subdirectory. If an absolute path is given only that directory will be searched. + * + * @param pluginId The Id of the plugin, for example KPluginMetaData.pluginId(). + * + * @return all plugins found in @p directory with the given pluginId. + * + * @see KPluginLoader::instantiatePlugins() + * + * @since 5.11 + */ + static QVector<KPluginMetaData> findPluginsById(const QString &directory, const QString &pluginId); + + /** * Invokes @p callback for each valid plugin found inside @p directory. This is useful if * your application needs to customize the behaviour of KPluginLoader::findPlugins() or * KPluginLoader::instantiatePlugins(). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.10.0/src/mimetypes/kde5.xml new/kcoreaddons-5.11.0/src/mimetypes/kde5.xml --- old/kcoreaddons-5.10.0/src/mimetypes/kde5.xml 2015-05-03 17:07:03.000000000 +0200 +++ new/kcoreaddons-5.11.0/src/mimetypes/kde5.xml 2015-06-06 23:11:15.000000000 +0200 @@ -869,6 +869,7 @@ <comment xml:lang="nb">Calligra Plan prosjekstyringsdokument</comment> <comment xml:lang="nds">Projektpleeg-Dokment för Calligra-Plan</comment> <comment xml:lang="nl">Calligra-plan projectbeheer-document</comment> + <comment xml:lang="nn">Prosjekthandsamingsdokument for Calligra Plan</comment> <comment xml:lang="pa">Calligra ਸਕੀਮ ਪ੍ਰੋਜੈਕਟ ਪਰਬੰਧ ਡੌਕੂਮੈਂਟ</comment> <comment xml:lang="pl">Dokument zarządzania projektami w Calligra Plan</comment> <comment xml:lang="pt">Documento de gestão de projectos do Plan para o Calligra</comment> @@ -922,6 +923,7 @@ <comment xml:lang="nb">Calligra Plan arbeidspakkedokument</comment> <comment xml:lang="nds">Arbeitpaket-Dokment för Calligra-Plan</comment> <comment xml:lang="nl">Calligra-plan werkpakket document</comment> + <comment xml:lang="nn">Arbeidspakkedokument for Calligra Plan</comment> <comment xml:lang="pl">Dokument zawierający pakiet zadań Calligra Plan</comment> <comment xml:lang="pt">Documento de pacote de trabalho do Plan para o Calligra</comment> <comment xml:lang="pt_BR">Documento do pacote de trabalho do Calligra Plan</comment> @@ -3449,6 +3451,7 @@ <comment xml:lang="nb">Softimage PIC-bilde</comment> <comment xml:lang="nds">PIC-Bild vun Softimage</comment> <comment xml:lang="nl">Softimage PIC-image</comment> + <comment xml:lang="nn">Softimage PIC-bilete</comment> <comment xml:lang="pl">Plik obrazu Softimage PIC</comment> <comment xml:lang="pt">Imagem PIC da Softimage</comment> <comment xml:lang="pt_BR">Imagem PIC da Softimage</comment> @@ -3505,6 +3508,7 @@ <comment xml:lang="nb">FIl for Qt oppmerkingsspråk</comment> <comment xml:lang="nds">Qt-Schriftsatzspraakdatei</comment> <comment xml:lang="nl">Qt Markup Language-bestand</comment> + <comment xml:lang="nn">Fil for Qt-oppmerkingsspråk</comment> <comment xml:lang="pl">Plik języka znaczników dla Qt</comment> <comment xml:lang="pt">Ficheiro na Qt Markup Language</comment> <comment xml:lang="pt_BR">Arquivo da Qt Markup Language</comment> @@ -3562,6 +3566,7 @@ <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> @@ -3615,6 +3620,7 @@ <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>
