Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2016-02-24 18:53:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-01-20 09:41:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new/kcoreaddons.changes 2016-02-24 18:54:01.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Feb 6 18:00:02 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.19.0 (boo#967668) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.19.0.php + +------------------------------------------------------------------- Old: ---- kcoreaddons-5.18.0.tar.xz New: ---- kcoreaddons-5.19.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.J5UM8t/_old 2016-02-24 18:54:02.000000000 +0100 +++ /var/tmp/diff_new_pack.J5UM8t/_new 2016-02-24 18:54:02.000000000 +0100 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5CoreAddons5 -%define _tar_path 5.18 +%define _tar_path 5.19 Name: kcoreaddons -Version: 5.18.0 +Version: 5.19.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kcoreaddons-5.18.0.tar.xz -> kcoreaddons-5.19.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.18.0/CMakeLists.txt new/kcoreaddons-5.19.0/CMakeLists.txt --- old/kcoreaddons-5.18.0/CMakeLists.txt 2016-01-02 17:27:51.000000000 +0100 +++ new/kcoreaddons-5.19.0/CMakeLists.txt 2016-02-06 14:39:47.000000000 +0100 @@ -3,7 +3,7 @@ project(KCoreAddons) include(FeatureSummary) -find_package(ECM 5.18.0 NO_MODULE) +find_package(ECM 5.19.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) @@ -17,7 +17,7 @@ include(ECMGenerateHeaders) include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) set(REQUIRED_QT_VERSION 5.3.0) @@ -41,7 +41,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.18.0") # handled by release scripts +set(KF5_VERSION "5.19.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.18.0/KF5CoreAddonsConfig.cmake.in new/kcoreaddons-5.19.0/KF5CoreAddonsConfig.cmake.in --- old/kcoreaddons-5.18.0/KF5CoreAddonsConfig.cmake.in 2016-01-02 17:27:51.000000000 +0100 +++ new/kcoreaddons-5.19.0/KF5CoreAddonsConfig.cmake.in 2016-02-06 14:39:47.000000000 +0100 @@ -8,6 +8,9 @@ include("${TARGETSFILE}") else() include("${CMAKE_CURRENT_LIST_DIR}/KF5CoreAddonsToolingTargets.cmake") + if(CMAKE_CROSSCOMPILING AND DESKTOPTOJSON_EXECUTABLE) + set_target_properties(KF5::desktoptojson PROPERTIES IMPORTED_LOCATION_NONE ${DESKTOPTOJSON_EXECUTABLE}) + endif() endif() include("${CMAKE_CURRENT_LIST_DIR}/KF5CoreAddonsTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/KF5CoreAddonsMacros.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.18.0/KF5CoreAddonsMacros.cmake new/kcoreaddons-5.19.0/KF5CoreAddonsMacros.cmake --- old/kcoreaddons-5.18.0/KF5CoreAddonsMacros.cmake 2016-01-02 17:27:51.000000000 +0100 +++ new/kcoreaddons-5.19.0/KF5CoreAddonsMacros.cmake 2016-02-06 14:39:47.000000000 +0100 @@ -104,6 +104,8 @@ # # Example: # kcoreaddons_add_plugin(kdeconnect_share JSON kdeconnect_share.json SOURCES ${kdeconnect_share_SRCS}) +# +# Since 5.10.0 function(kcoreaddons_add_plugin plugin) set(options) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.18.0/autotests/data/servicetypes/bool-servicetype.desktop new/kcoreaddons-5.19.0/autotests/data/servicetypes/bool-servicetype.desktop --- old/kcoreaddons-5.18.0/autotests/data/servicetypes/bool-servicetype.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kcoreaddons-5.19.0/autotests/data/servicetypes/bool-servicetype.desktop 2016-02-06 14:39:47.000000000 +0100 @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=ServiceType + +[PropertyDef::X-Test-Bool] +Type=bool + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.18.0/autotests/data/servicetypes/fake-kdedmodule.desktop new/kcoreaddons-5.19.0/autotests/data/servicetypes/fake-kdedmodule.desktop --- old/kcoreaddons-5.18.0/autotests/data/servicetypes/fake-kdedmodule.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kcoreaddons-5.19.0/autotests/data/servicetypes/fake-kdedmodule.desktop 2016-02-06 14:39:47.000000000 +0100 @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=ServiceType +X-KDE-ServiceType=KDEDModule +[PropertyDef::X-KDE-FactoryName] +Type=QString +[PropertyDef::X-KDE-DBus-ModuleName] +Type=QString +[PropertyDef::X-KDE-Kded-autoload] +Type=bool +[PropertyDef::X-KDE-Kded-load-on-demand] +Type=bool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.18.0/autotests/data/servicetypes/invalid-missing-servicetype.desktop new/kcoreaddons-5.19.0/autotests/data/servicetypes/invalid-missing-servicetype.desktop --- old/kcoreaddons-5.18.0/autotests/data/servicetypes/invalid-missing-servicetype.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kcoreaddons-5.19.0/autotests/data/servicetypes/invalid-missing-servicetype.desktop 2016-02-06 14:39:47.000000000 +0100 @@ -0,0 +1,7 @@ +[Desktop Entry] +# Type must be ServiceType otherwise this file is invalid +Type=Service + +# as this file is invalid check that this property is not converted +[PropertyDef::ShouldNotBeConvertedToInt] +Type=int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.18.0/autotests/desktoptojsontest.cpp new/kcoreaddons-5.19.0/autotests/desktoptojsontest.cpp --- old/kcoreaddons-5.18.0/autotests/desktoptojsontest.cpp 2016-01-02 17:27:51.000000000 +0100 +++ new/kcoreaddons-5.19.0/autotests/desktoptojsontest.cpp 2016-02-06 14:39:47.000000000 +0100 @@ -255,8 +255,55 @@ QCOMPARE(e.error, QJsonParseError::NoError); QTest::newRow("authors") << authorInput << authorsExpected << false << QStringList(); + // test case-insensitive conversion of boolean keys + const QString boolServiceType = QFINDTESTDATA("data/servicetypes/bool-servicetype.desktop"); + QVERIFY(!boolServiceType.isEmpty()); + + QByteArray boolInput1 = "[Desktop Entry]\nType=Service\nX-Test-Bool=true\n"; + QByteArray boolInput2 = "[Desktop Entry]\nType=Service\nX-Test-Bool=TRue\n"; + QByteArray boolInput3 = "[Desktop Entry]\nType=Service\nX-Test-Bool=false\n"; + QByteArray boolInput4 = "[Desktop Entry]\nType=Service\nX-Test-Bool=FALse\n"; + + auto boolResultTrue = QJsonDocument::fromJson("{\"KPlugin\":{},\"X-Test-Bool\": true}", &e).object(); + QCOMPARE(e.error, QJsonParseError::NoError); + auto boolResultFalse = QJsonDocument::fromJson("{\"KPlugin\":{},\"X-Test-Bool\": false}", &e).object(); + QCOMPARE(e.error, QJsonParseError::NoError); + QTest::newRow("bool true") << boolInput1 << boolResultTrue << false << QStringList(boolServiceType); + QTest::newRow("bool TRue") << boolInput2 << boolResultTrue << false << QStringList(boolServiceType); + QTest::newRow("bool false") << boolInput3 << boolResultFalse << false << QStringList(boolServiceType); + QTest::newRow("bool FALse") << boolInput4 << boolResultFalse << false << QStringList(boolServiceType); + + // test conversion of kcookiejar.desktop (for some reason the wrong boolean values were committed) + QByteArray kcookiejarInput = + "[Desktop Entry]\n" + "Type=Service\n" + "Name=Cookie Jar\n" + "Comment=Stores network cookies\n" + "X-KDE-ServiceTypes=KDEDModule\n" + "X-KDE-Library=kf5/kded/kcookiejar\n" + "X-KDE-DBus-ModuleName=kcookiejar\n" + "X-KDE-Kded-autoload=false\n" + "X-KDE-Kded-load-on-demand=true\n"; + auto kcookiejarResult = QJsonDocument::fromJson( + "{\n" + " \"KPlugin\": {\n" + " \"Description\": \"Stores network cookies\",\n" + " \"Name\": \"Cookie Jar\",\n" + " \"ServiceTypes\": [\n" + " \"KDEDModule\"\n" + " ]\n" + " },\n" + "\"X-KDE-DBus-ModuleName\": \"kcookiejar\",\n" + "\"X-KDE-Kded-autoload\": false,\n" + "\"X-KDE-Kded-load-on-demand\": true\n" + "}\n", &e).object(); + const QString kdedmoduleServiceType = QFINDTESTDATA("data/servicetypes/fake-kdedmodule.desktop"); + QVERIFY(!kdedmoduleServiceType.isEmpty()); + QTest::newRow("kcookiejar") << kcookiejarInput << kcookiejarResult << false << QStringList(kdedmoduleServiceType); + } + void testDesktopToJson() { QTemporaryFile output; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.18.0/po/ast/kcoreaddons5_qt.po new/kcoreaddons-5.19.0/po/ast/kcoreaddons5_qt.po --- old/kcoreaddons-5.18.0/po/ast/kcoreaddons5_qt.po 2016-01-02 17:27:51.000000000 +0100 +++ new/kcoreaddons-5.19.0/po/ast/kcoreaddons5_qt.po 2016-02-06 14:39:47.000000000 +0100 @@ -1,15 +1,15 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# enolp <en...@softastur.org>, 2015. +# enolp <en...@softastur.org>, 2015, 2016. 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: 2015-11-16 02:08+0100\n" -"Last-Translator: enolp <en...@softastur.org>\n" -"Language-Team: Asturian <kde-i18n-...@kde.org>\n" +"PO-Revision-Date: 2016-02-05 12:10+0100\n" +"Last-Translator: enolp <en...@sofastur.org>\n" +"Language-Team: Asturian <>\n" "Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,20 +20,15 @@ "X-Generator: Lokalize 2.0\n" #: lib/kaboutdata.cpp:242 -#, fuzzy -#| msgid "" -#| "No licensing terms for this program have been specified.\n" -#| "Please check the documentation or the source for any\n" -#| "licensing terms.\n" 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 "" -"Los términos de llicencia pa esti programa nun s'especificaron.\n" -"Por favor, llei la documentación o'l códigu fonte si quies ver los\n" -"términos de llicencia.\n" +"Nun s'especificaron los términos de llicencia pa esti programa.\n" +"Comprueba la documentación o'l códigu fonte si quies ver\n" +"cualesquier términu de llicencia, por favor.\n" #: lib/kaboutdata.cpp:250 #, qt-format @@ -134,48 +129,34 @@ "de KDE, visita <a href=\"http://l10n.kde.org\";>http://l10n.kde.org</a></p>" #: lib/kaboutdata.cpp:977 -#, fuzzy -#| msgid "Show author information" msgctxt "KAboutData CLI|" msgid "Show author information." -msgstr "Amosar información tocante al autor" +msgstr "Amuesa información del autor." #: lib/kaboutdata.cpp:978 -#, fuzzy -#| msgid "Show license information" msgctxt "KAboutData CLI|" msgid "Show license information." -msgstr "Amosar información de la llicencia" +msgstr "Amuesa información de la llicencia." #: lib/kaboutdata.cpp:980 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." -msgstr "" +msgstr "El nome de ficheru de la entrada d'escritoriu pa esta aplicación." #: lib/kaboutdata.cpp:981 msgctxt "KAboutData CLI|" msgid "file name" -msgstr "" +msgstr "nome de ficheru" #: lib/kaboutdata.cpp:990 -#, fuzzy -#| msgid "" -#| "This application was written by somebody who wants to remain anonymous." msgctxt "KAboutData CLI|" msgid "This application was written by somebody who wants to remain anonymous." -msgstr "Esta aplicación escribióla daquién que quier ser anónimu." +msgstr "Esta aplicación escribióla daquién que quier tar nel anonimatu." #: lib/kaboutdata.cpp:992 -#, fuzzy -#| msgctxt "the 2nd argument is a list of name+address, one on each line" -#| msgid "" -#| "%1 was written by\n" -#| "%2" msgctxt "KAboutData CLI|" msgid "%s was written by:\n" -msgstr "" -"%1 escritu por\n" -"%2" +msgstr "%1 escritu por:\n" #: lib/kaboutdata.cpp:1003 msgctxt "KAboutData CLI|" @@ -185,7 +166,7 @@ #: lib/kaboutdata.cpp:1005 msgctxt "KAboutData CLI|" msgid "Please report bugs to %s.\n" -msgstr "Por favor, informa de fallos a %1.\n" +msgstr "Informa de fallos a %1, por favor.\n" #: lib/plugin/kpluginloader.cpp:122 #, qt-format @@ -387,42 +368,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 "%1h%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 "%1h%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 "%1h%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 #. ---------- @@ -431,21 +412,21 @@ #, 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 @@ -548,26 +529,20 @@ msgstr "Ayeri" #: lib/util/kformatprivate.cpp:384 -#, fuzzy, qt-format -#| msgctxt "@option last week" -#| msgid "Last Week" +#, qt-format msgctxt "KFormat|" msgid "Last %1" -msgstr "Última selmana" +msgstr "Cabera %1" #: lib/util/kformatprivate.cpp:389 -#, fuzzy, qt-format -#| msgctxt "Opposite to Back" -#| msgid "Next" +#, qt-format msgctxt "KFormat|" msgid "Next %1" -msgstr "Siguiente" +msgstr "Siguiente %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 -#| msgctxt "City, Country" -#| msgid "%1, %2" +#, qt-format msgctxt "KFormat|" msgid "%1, %2" msgstr "%1, %2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.18.0/po/nb/kcoreaddons5_qt.po new/kcoreaddons-5.19.0/po/nb/kcoreaddons5_qt.po --- old/kcoreaddons-5.18.0/po/nb/kcoreaddons5_qt.po 2016-01-02 17:27:51.000000000 +0100 +++ new/kcoreaddons-5.19.0/po/nb/kcoreaddons5_qt.po 2016-02-06 14:39:47.000000000 +0100 @@ -4,7 +4,7 @@ # Bjørn Steensrud <bjor...@skogkatt.homelinux.org>, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Eskild Hustvedt <zerod...@skolelinux.no>, 2004, 2005. # Gaute Hvoslef Kvalnes <ga...@verdsveven.com>, 2004, 2005. -# Axel Bojer <a...@bojer.no>, 2005, 2006. +# Axel Bojer <fri_programv...@bojer.no>, 2005, 2006. # Nils Kristian Tomren <s...@nilsk.net>, 2005, 2007. # Øyvind A. Holm <su...@sunbase.org>, 2009. msgid "" @@ -26,7 +26,7 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: lib/kaboutdata.cpp:229 +#: lib/kaboutdata.cpp:242 msgctxt "KAboutLicense|" msgid "" "No licensing terms for this program have been specified.\n" @@ -36,93 +36,93 @@ "Det er ikke oppgitt lisensbetingelser for dette programmet.\n" "Lisensbetingelsene kan være i dokumentasjonen eller kildekoden.\n" -#: lib/kaboutdata.cpp:237 +#: lib/kaboutdata.cpp:250 #, qt-format msgctxt "KAboutLicense|" msgid "This program is distributed under the terms of the %1." msgstr "Dette programmet er gitt ut under betingelsene i %1." -#: lib/kaboutdata.cpp:263 +#: lib/kaboutdata.cpp:276 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v2" msgstr "GPL v2" -#: lib/kaboutdata.cpp:264 +#: lib/kaboutdata.cpp:277 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 2" msgstr "GNU General Public License Version 2" -#: lib/kaboutdata.cpp:267 +#: lib/kaboutdata.cpp:280 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2" msgstr "LGPL v2" -#: lib/kaboutdata.cpp:268 +#: lib/kaboutdata.cpp:281 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2" msgstr "GNU Lesser General Public License Version 2" -#: lib/kaboutdata.cpp:271 +#: lib/kaboutdata.cpp:284 msgctxt "KAboutLicense|@item license (short name)" msgid "BSD License" msgstr "BSD-lisens" -#: lib/kaboutdata.cpp:272 +#: lib/kaboutdata.cpp:285 msgctxt "KAboutLicense|@item license" msgid "BSD License" msgstr "BSD-lisens" -#: lib/kaboutdata.cpp:275 +#: lib/kaboutdata.cpp:288 msgctxt "KAboutLicense|@item license (short name)" msgid "Artistic License" msgstr "Kunstnerisk lisens" -#: lib/kaboutdata.cpp:276 +#: lib/kaboutdata.cpp:289 msgctxt "KAboutLicense|@item license" msgid "Artistic License" msgstr "Kunstnerisk lisens" -#: lib/kaboutdata.cpp:279 +#: lib/kaboutdata.cpp:292 msgctxt "KAboutLicense|@item license (short name)" msgid "QPL v1.0" msgstr "QPL v1.0" -#: lib/kaboutdata.cpp:280 +#: lib/kaboutdata.cpp:293 msgctxt "KAboutLicense|@item license" msgid "Q Public License" msgstr "Q Public License" -#: lib/kaboutdata.cpp:283 +#: lib/kaboutdata.cpp:296 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v3" msgstr "GPL v3" -#: lib/kaboutdata.cpp:284 +#: lib/kaboutdata.cpp:297 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 3" msgstr "GNU General Public License Version 3" -#: lib/kaboutdata.cpp:287 +#: lib/kaboutdata.cpp:300 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v3" msgstr "LGPL v3" -#: lib/kaboutdata.cpp:288 +#: lib/kaboutdata.cpp:301 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 3" msgstr "GNU Lesser General Public License Version 3" -#: lib/kaboutdata.cpp:292 +#: lib/kaboutdata.cpp:305 msgctxt "KAboutLicense|@item license" msgid "Custom" msgstr "Tilpasset" -#: lib/kaboutdata.cpp:295 +#: lib/kaboutdata.cpp:308 msgctxt "KAboutLicense|@item license" msgid "Not specified" msgstr "Ikke oppgitt" -#: lib/kaboutdata.cpp:791 +#: lib/kaboutdata.cpp:824 msgctxt "KAboutData|replace this with information about your translation team" msgid "" "<p>KDE is translated into many languages thanks to the work of the " @@ -136,42 +136,42 @@ "org</a> eller <a href=\"http://www.skolelinux.org/no\";>http://www.skolelinux."; "org/no</a></p>" -#: lib/kaboutdata.cpp:944 +#: lib/kaboutdata.cpp:977 msgctxt "KAboutData CLI|" msgid "Show author information." msgstr "Vis forfatterinformasjon" -#: lib/kaboutdata.cpp:945 +#: lib/kaboutdata.cpp:978 msgctxt "KAboutData CLI|" msgid "Show license information." msgstr "Viser lisensinformasjon" -#: lib/kaboutdata.cpp:947 +#: lib/kaboutdata.cpp:980 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." msgstr "" -#: lib/kaboutdata.cpp:948 +#: lib/kaboutdata.cpp:981 msgctxt "KAboutData CLI|" msgid "file name" msgstr "" -#: lib/kaboutdata.cpp:957 +#: lib/kaboutdata.cpp:990 msgctxt "KAboutData CLI|" msgid "This application was written by somebody who wants to remain anonymous." msgstr "Dette programmet ble skrevet av noen som ønsker å være anonyme." -#: lib/kaboutdata.cpp:959 +#: lib/kaboutdata.cpp:992 msgctxt "KAboutData CLI|" msgid "%s was written by:\n" msgstr "%s ble skrevet av: \n" -#: lib/kaboutdata.cpp:970 +#: lib/kaboutdata.cpp:1003 msgctxt "KAboutData CLI|" msgid "Please use http://bugs.kde.org to report bugs." msgstr "Bruk http://bugs.kde.org for å rapportere feil." -#: lib/kaboutdata.cpp:972 +#: lib/kaboutdata.cpp:1005 msgctxt "KAboutData CLI|" msgid "Please report bugs to %s.\n" msgstr "Send denne feilrapporten til %s.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.18.0/po/nn/kcoreaddons5_qt.po new/kcoreaddons-5.19.0/po/nn/kcoreaddons5_qt.po --- old/kcoreaddons-5.18.0/po/nn/kcoreaddons5_qt.po 2016-01-02 17:27:51.000000000 +0100 +++ new/kcoreaddons-5.19.0/po/nn/kcoreaddons5_qt.po 2016-02-06 14:39:47.000000000 +0100 @@ -23,7 +23,7 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: lib/kaboutdata.cpp:229 +#: lib/kaboutdata.cpp:242 msgctxt "KAboutLicense|" msgid "" "No licensing terms for this program have been specified.\n" @@ -34,93 +34,93 @@ "Du finn kanskje lisensvilkåra i hjelpeteksten\n" "eller kjeldekoden.\n" -#: lib/kaboutdata.cpp:237 +#: lib/kaboutdata.cpp:250 #, qt-format msgctxt "KAboutLicense|" msgid "This program is distributed under the terms of the %1." msgstr "Dette programmet er distribuert etter vilkåra i %1." -#: lib/kaboutdata.cpp:263 +#: lib/kaboutdata.cpp:276 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v2" msgstr "GPL v2" -#: lib/kaboutdata.cpp:264 +#: lib/kaboutdata.cpp:277 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 2" msgstr "GNU General Public License versjon 2" -#: lib/kaboutdata.cpp:267 +#: lib/kaboutdata.cpp:280 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2" msgstr "LGPL v2" -#: lib/kaboutdata.cpp:268 +#: lib/kaboutdata.cpp:281 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2" msgstr "GNU Lesser General Public License versjon 2" -#: lib/kaboutdata.cpp:271 +#: lib/kaboutdata.cpp:284 msgctxt "KAboutLicense|@item license (short name)" msgid "BSD License" msgstr "BSD-lisensen" -#: lib/kaboutdata.cpp:272 +#: lib/kaboutdata.cpp:285 msgctxt "KAboutLicense|@item license" msgid "BSD License" msgstr "BSD-lisensen" -#: lib/kaboutdata.cpp:275 +#: lib/kaboutdata.cpp:288 msgctxt "KAboutLicense|@item license (short name)" msgid "Artistic License" msgstr "Artistic-lisensen" -#: lib/kaboutdata.cpp:276 +#: lib/kaboutdata.cpp:289 msgctxt "KAboutLicense|@item license" msgid "Artistic License" msgstr "Artistic-lisensen" -#: lib/kaboutdata.cpp:279 +#: lib/kaboutdata.cpp:292 msgctxt "KAboutLicense|@item license (short name)" msgid "QPL v1.0" msgstr "QPL v1.0" -#: lib/kaboutdata.cpp:280 +#: lib/kaboutdata.cpp:293 msgctxt "KAboutLicense|@item license" msgid "Q Public License" msgstr "Q Public License" -#: lib/kaboutdata.cpp:283 +#: lib/kaboutdata.cpp:296 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v3" msgstr "GPL v3" -#: lib/kaboutdata.cpp:284 +#: lib/kaboutdata.cpp:297 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 3" msgstr "GNU General Public License versjon 3" -#: lib/kaboutdata.cpp:287 +#: lib/kaboutdata.cpp:300 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v3" msgstr "LGPL v3" -#: lib/kaboutdata.cpp:288 +#: lib/kaboutdata.cpp:301 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 3" msgstr "GNU Lesser General Public License versjon 3" -#: lib/kaboutdata.cpp:292 +#: lib/kaboutdata.cpp:305 msgctxt "KAboutLicense|@item license" msgid "Custom" msgstr "Tilpassa" -#: lib/kaboutdata.cpp:295 +#: lib/kaboutdata.cpp:308 msgctxt "KAboutLicense|@item license" msgid "Not specified" msgstr "Ikkje oppgjevne" -#: lib/kaboutdata.cpp:791 +#: lib/kaboutdata.cpp:824 msgctxt "KAboutData|replace this with information about your translation team" msgid "" "<p>KDE is translated into many languages thanks to the work of the " @@ -142,42 +142,42 @@ "korrekturlesarar!</p><p>Du finn meir informasjon om internasjonaliseringa av " "KDE på <a href=\"http://l10n.kde.org/\";>http://l10n.kde.org/</a>.</p>" -#: lib/kaboutdata.cpp:944 +#: lib/kaboutdata.cpp:977 msgctxt "KAboutData CLI|" msgid "Show author information." msgstr "Vis forfattarinformasjon." -#: lib/kaboutdata.cpp:945 +#: lib/kaboutdata.cpp:978 msgctxt "KAboutData CLI|" msgid "Show license information." msgstr "Vis lisensinformasjon." -#: lib/kaboutdata.cpp:947 +#: lib/kaboutdata.cpp:980 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." msgstr "Filnamn-stamme til skrivebordsoppføringa til programmet." -#: lib/kaboutdata.cpp:948 +#: lib/kaboutdata.cpp:981 msgctxt "KAboutData CLI|" msgid "file name" msgstr "filnamn" -#: lib/kaboutdata.cpp:957 +#: lib/kaboutdata.cpp:990 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:959 +#: lib/kaboutdata.cpp:992 msgctxt "KAboutData CLI|" msgid "%s was written by:\n" msgstr "%s er skrive av:\n" -#: lib/kaboutdata.cpp:970 +#: lib/kaboutdata.cpp:1003 msgctxt "KAboutData CLI|" msgid "Please use http://bugs.kde.org to report bugs." msgstr "Bruk http://bugs.kde.org/ for å melda frå om feil." -#: lib/kaboutdata.cpp:972 +#: lib/kaboutdata.cpp:1005 msgctxt "KAboutData CLI|" msgid "Please report bugs to %s.\n" msgstr "Meld frå om feil til %1.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.18.0/src/mimetypes/kde5.xml new/kcoreaddons-5.19.0/src/mimetypes/kde5.xml --- old/kcoreaddons-5.18.0/src/mimetypes/kde5.xml 2016-01-02 17:27:51.000000000 +0100 +++ new/kcoreaddons-5.19.0/src/mimetypes/kde5.xml 2016-02-06 14:39:47.000000000 +0100 @@ -2255,6 +2255,7 @@ <mime-type type="application/x-tuberling"> <comment>potato</comment> <comment xml:lang="ar">بطاطا</comment> + <comment xml:lang="ast">potato</comment> <comment xml:lang="bs">Krompirkova datoteka</comment> <comment xml:lang="ca">Patata</comment> <comment xml:lang="ca@valencia">Patata</comment> @@ -2376,6 +2377,7 @@ <mime-type type="application/x-kourse"> <comment>Kolf course</comment> <comment xml:lang="ar">دورة Kolf</comment> + <comment xml:lang="ast">Campu de 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> @@ -2983,6 +2985,7 @@ <mime-type type="application/x-kcachegrind"> <comment>Cachegrind/Callgrind profile dump</comment> <comment xml:lang="ar">تشكيلة تفريغ Cachegrind/Callgrind </comment> + <comment xml:lang="ast">Volquiáu de perfiles de Cachegrind/Callgrind</comment> <comment xml:lang="bs">Cachegrindov/Callgrindov profilni popis</comment> <comment xml:lang="ca">Bolcat de l'anàlisi de rendiment del Cachegrind/Callgrind</comment> <comment xml:lang="ca@valencia">Bolcat de l'anàlisi de rendiment del Cachegrind/Callgrind</comment> @@ -3042,6 +3045,7 @@ <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>
