Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2015-05-11 19:35:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-13 20:24:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new/kcoreaddons.changes 2015-05-11 19:47:56.000000000 +0200 @@ -1,0 +2,9 @@ +Sun May 3 19:46:05 UTC 2015 - [email protected] + +- Update to 5.10.0 + * New cmake macro kcoreaddons_add_plugin to create + KPluginLoader-based plugins more easily. + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.10.0.php + +------------------------------------------------------------------- Old: ---- kcoreaddons-5.9.0.tar.xz New: ---- kcoreaddons-5.10.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.7OznSS/_old 2015-05-11 19:47:56.000000000 +0200 +++ /var/tmp/diff_new_pack.7OznSS/_new 2015-05-11 19:47:56.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5CoreAddons5 -%define _tar_path 5.9 +%define _tar_path 5.10 Name: kcoreaddons -Version: 5.9.0 +Version: 5.10.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kcoreaddons-5.9.0.tar.xz -> kcoreaddons-5.10.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/CMakeLists.txt new/kcoreaddons-5.10.0/CMakeLists.txt --- old/kcoreaddons-5.9.0/CMakeLists.txt 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/CMakeLists.txt 2015-05-03 17:07:03.000000000 +0200 @@ -2,7 +2,7 @@ project(KCoreAddons) -find_package(ECM 5.9.0 REQUIRED NO_MODULE) +find_package(ECM 5.10.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -37,7 +37,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.9.0") # handled by release scripts +set(KF5_VERSION "5.10.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.9.0/KF5CoreAddonsMacros.cmake new/kcoreaddons-5.10.0/KF5CoreAddonsMacros.cmake --- old/kcoreaddons-5.9.0/KF5CoreAddonsMacros.cmake 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/KF5CoreAddonsMacros.cmake 2015-05-03 17:07:03.000000000 +0200 @@ -78,3 +78,50 @@ message(FATAL_ERROR "Generating ${json} failed") endif() endfunction() + +# +# kcoreaddons_add_plugin(plugin_name SOURCES... [JSON "pluginname.json"] [INSTALL_NAMESPACE "servicename"]) +# +# This macro helps simplifying the creation of plugins for KPluginFactory +# based systems. +# It will create a plugin given the SOURCES list, the name of the JSON file +# that will define the plugin's metadata and the INSTALL_NAMESPACE so that +# the plugin is installed with the rest of the plugins from the same sub-system, +# within ${PLUGIN_INSTALL_DIR}. +# +# Example: +# kcoreaddons_add_plugin(kdeconnect_share JSON kdeconnect_share.json SOURCES ${kdeconnect_share_SRCS}) + +function(kcoreaddons_add_plugin plugin) + set(options) + set(oneValueArgs JSON INSTALL_NAMESPACE) + set(multiValueArgs SOURCES) + cmake_parse_arguments(KCA_ADD_PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + + get_filename_component(json "${KCA_ADD_PLUGIN_JSON}" REALPATH) + + # ensure we recompile the corresponding object files when the json file changes + set(dependent_sources ) + foreach(source ${KCA_ADD_PLUGIN_SOURCES}) + get_filename_component(source "${source}" REALPATH) + if(EXISTS "${source}") + file(STRINGS "${source}" match REGEX "K_PLUGIN_FACTORY_WITH_JSON") + if(match) + list(APPEND dependent_sources "${source}") + endif() + endif() + endforeach() + if(NOT dependent_sources) + # fallback to all sources - better safe than sorry... + set(dependent_sources ${KCA_ADD_PLUGIN_SOURCES}) + endif() + set_property(SOURCE ${dependent_sources} APPEND PROPERTY OBJECT_DEPENDS ${json}) + + add_library(${plugin} MODULE ${KCA_ADD_PLUGIN_SOURCES}) + set_property(TARGET ${plugin} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${json}) + + if (NOT KCA_ADD_PLUGIN_INSTALL_NAMESPACE) + message(FATAL_ERROR "Must specify INSTALL_NAMESPACE for ${plugin}") + endif() + install(TARGETS ${plugin} DESTINATION ${PLUGIN_INSTALL_DIR}/${KCA_ADD_PLUGIN_INSTALL_NAMESPACE}) +endfunction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/autotests/data/fakeplugin.desktop new/kcoreaddons-5.10.0/autotests/data/fakeplugin.desktop --- old/kcoreaddons-5.9.0/autotests/data/fakeplugin.desktop 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/autotests/data/fakeplugin.desktop 2015-05-03 17:07:03.000000000 +0200 @@ -1,6 +1,5 @@ [Desktop Entry] Name=NSA Plugin -Name[ast]=Complementu NSA Name[bs]=NSA dodatak Name[ca]=Connector de la NSA Name[cs]=Modul NSA @@ -9,9 +8,11 @@ Name[es]=Complemento NSA Name[fi]=NSA-liitännäinen Name[gl]=Complemento de NSA +Name[he]=תוסף NSA Name[hu]=NSA bővítmény Name[it]=Estensione NSA Name[ko]=NSA 플러그인 +Name[nb]=NSA programtillegg Name[nl]=NSA-plug-in Name[pl]=Wtyczka NSA Name[pt]='Plugin' da NSA @@ -30,7 +31,6 @@ Name[zh_CN]=NSA 插件 Name[zh_TW]=NSA 外掛程式 Comment=Test Plugin Spy -Comment[ast]=Complementu de prueba qu'escucla Comment[bs]=Špijun provjere dodataka Comment[ca]=Connector de proves espia Comment[cs]=Testovací modul Spy @@ -39,9 +39,11 @@ Comment[es]=Probar espía de complementos Comment[fi]=Testivakoiluliitännäinen Comment[gl]=Complemento espía de proba +Comment[he]=בדיקת תוסף ריגול Comment[hu]=Kémbővítmény tesztelése Comment[it]=Estensione di prova Spy Comment[ko]=테스트 플러그인 첩자 +Comment[nb]=Test tilleggsspion Comment[nl]=Plug-in Spy testen Comment[pl]=Wypróbuj szpiega wtyczki Comment[pt]=Espião dos 'Plugins' de Testes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/autotests/data/hiddenplugin.desktop new/kcoreaddons-5.10.0/autotests/data/hiddenplugin.desktop --- old/kcoreaddons-5.9.0/autotests/data/hiddenplugin.desktop 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/autotests/data/hiddenplugin.desktop 2015-05-03 17:07:03.000000000 +0200 @@ -1,6 +1,5 @@ [Desktop Entry] Name=NSA Plugin -Name[ast]=Complementu NSA Name[bs]=NSA dodatak Name[ca]=Connector de la NSA Name[cs]=Modul NSA @@ -9,9 +8,11 @@ Name[es]=Complemento NSA Name[fi]=NSA-liitännäinen Name[gl]=Complemento de NSA +Name[he]=תוסף NSA Name[hu]=NSA bővítmény Name[it]=Estensione NSA Name[ko]=NSA 플러그인 +Name[nb]=NSA programtillegg Name[nl]=NSA-plug-in Name[pl]=Wtyczka NSA Name[pt]='Plugin' da NSA @@ -30,7 +31,6 @@ Name[zh_CN]=NSA 插件 Name[zh_TW]=NSA 外掛程式 Comment=Test Plugin Spy -Comment[ast]=Complementu de prueba qu'escucla Comment[bs]=Špijun provjere dodataka Comment[ca]=Connector de proves espia Comment[cs]=Testovací modul Spy @@ -39,9 +39,11 @@ Comment[es]=Probar espía de complementos Comment[fi]=Testivakoiluliitännäinen Comment[gl]=Complemento espía de proba +Comment[he]=בדיקת תוסף ריגול Comment[hu]=Kémbővítmény tesztelése Comment[it]=Estensione di prova Spy Comment[ko]=테스트 플러그인 첩자 +Comment[nb]=Test tilleggsspion Comment[nl]=Plug-in Spy testen Comment[pl]=Wypróbuj szpiega wtyczki Comment[pt]=Espião dos 'Plugins' de Testes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/autotests/kdelibs4configmigratortest.cpp new/kcoreaddons-5.10.0/autotests/kdelibs4configmigratortest.cpp --- old/kcoreaddons-5.9.0/autotests/kdelibs4configmigratortest.cpp 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/autotests/kdelibs4configmigratortest.cpp 2015-05-03 17:07:03.000000000 +0200 @@ -24,18 +24,29 @@ #include <QTemporaryDir> #include <QTest> #include <QDebug> +#include <QStandardPaths> class Kdelibs4ConfigMigratorTest : public QObject { Q_OBJECT private Q_SLOTS: + void initTestCase(); void shouldNotMigrateIfKde4HomeDirDoesntExist(); void shouldMigrateIfKde4HomeDirExist(); void shouldMigrateConfigFiles(); void shouldMigrateUiFiles(); }; +void Kdelibs4ConfigMigratorTest::initTestCase() +{ + QStandardPaths::setTestModeEnabled(true); + const QString configHome = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation); + QDir(configHome).removeRecursively(); + const QString dataHome = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); + QDir(dataHome).removeRecursively(); +} + void Kdelibs4ConfigMigratorTest::shouldNotMigrateIfKde4HomeDirDoesntExist() { qputenv("KDEHOME", ""); @@ -71,20 +82,18 @@ QVERIFY(fooConfigFile.exists()); const QString storedConfigFilePath = configPath + QLatin1Char('/') + config; QVERIFY(QFile::copy(fooConfigFile.fileName(), storedConfigFilePath)); + QCOMPARE(QStandardPaths::locate(QStandardPaths::ConfigLocation, config), QString()); } - QTemporaryDir xdgConfigDir; - const QString xdgConfighome = xdgConfigDir.path(); - QVERIFY(xdgConfigDir.isValid()); - qputenv("XDG_CONFIG_HOME", QFile::encodeName(xdgConfighome)); - Kdelibs4ConfigMigrator migration(QLatin1String("foo")); migration.setConfigFiles(QStringList() << listConfig); QVERIFY(migration.migrate()); Q_FOREACH (const QString &config, listConfig) { - const QString xdgConfigFile = xdgConfighome + QLatin1Char('/') + config; - QVERIFY(QFile(xdgConfigFile).exists()); + const QString migratedConfigFile = QStandardPaths::locate(QStandardPaths::ConfigLocation, config); + QVERIFY(!migratedConfigFile.isEmpty()); + QVERIFY(QFile(migratedConfigFile).exists()); + QFile::remove(migratedConfigFile); } } @@ -101,20 +110,20 @@ QDir().mkpath(dataPath); QVERIFY(QDir(dataPath).exists()); + const QString xdgDatahome = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); + QStringList listUi; listUi << QLatin1String("appuirc") << QLatin1String("appui1rc"); - Q_FOREACH (const QString &config, listUi) { - QFile fooConfigFile(QLatin1String(KDELIBS4CONFIGMIGRATOR_DATA_DIR) + QLatin1Char('/') + config); + Q_FOREACH (const QString &uifile, listUi) { + QFile fooConfigFile(QLatin1String(KDELIBS4CONFIGMIGRATOR_DATA_DIR) + QLatin1Char('/') + uifile); QVERIFY(fooConfigFile.exists()); QDir().mkpath(dataPath + QLatin1Char('/') + appName); - const QString storedConfigFilePath = dataPath + QLatin1Char('/') + appName + QLatin1Char('/') + config; + const QString storedConfigFilePath = dataPath + QLatin1Char('/') + appName + QLatin1Char('/') + uifile; QVERIFY(QFile::copy(fooConfigFile.fileName(), storedConfigFilePath)); - } - QTemporaryDir xdgDataDir; - const QString xdgDatahome = xdgDataDir.path(); - QVERIFY(xdgDataDir.isValid()); - qputenv("XDG_DATA_HOME", QFile::encodeName(xdgDatahome)); + const QString xdgUiFile = xdgDatahome + QLatin1String("/kxmlgui5/") + appName + QLatin1Char('/') + uifile; + QVERIFY(!QFile::exists(xdgUiFile)); + } Kdelibs4ConfigMigrator migration(appName); migration.setUiFiles(QStringList() << listUi); @@ -123,8 +132,8 @@ Q_FOREACH (const QString &uifile, listUi) { const QString xdgUiFile = xdgDatahome + QLatin1String("/kxmlgui5/") + appName + QLatin1Char('/') + uifile; QVERIFY(QFile(xdgUiFile).exists()); + QFile::remove(xdgUiFile); } - } QTEST_MAIN(Kdelibs4ConfigMigratorTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/autotests/kdirwatch_unittest.cpp new/kcoreaddons-5.10.0/autotests/kdirwatch_unittest.cpp --- old/kcoreaddons-5.9.0/autotests/kdirwatch_unittest.cpp 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/autotests/kdirwatch_unittest.cpp 2015-05-03 17:07:03.000000000 +0200 @@ -564,12 +564,16 @@ qDebug() << "Overwrite file1 with tempfile"; QSignalSpy spyCreated(&watch, SIGNAL(created(QString))); + QSignalSpy spyDirty(&watch, SIGNAL(dirty(QString))); QVERIFY(waitForOneSignal(watch, SIGNAL(dirty(QString)), m_path)); // Getting created() on an unwatched file is an inotify bonus, it's not part of the requirements. if (watch.internalMethod() == KDirWatch::INotify) { QCOMPARE(spyCreated.count(), 1); QCOMPARE(spyCreated[0][0].toString(), file1); + + QCOMPARE(spyDirty.size(), 2); + QCOMPARE(spyDirty[1][0].toString(), filetemp); } // make sure we're still watching it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/cmake/FindFAM.cmake new/kcoreaddons-5.10.0/cmake/FindFAM.cmake --- old/kcoreaddons-5.9.0/cmake/FindFAM.cmake 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/cmake/FindFAM.cmake 2015-05-03 17:07:03.000000000 +0200 @@ -7,8 +7,29 @@ # Copyright (c) 2006, Alexander Neundorf, <[email protected]> # -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. FIND_PATH(FAM_INCLUDE_DIR fam.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/po/fr/kcoreaddons5_qt.po new/kcoreaddons-5.10.0/po/fr/kcoreaddons5_qt.po --- old/kcoreaddons-5.9.0/po/fr/kcoreaddons5_qt.po 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/po/fr/kcoreaddons5_qt.po 2015-05-03 17:07:03.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.9.0/po/ko/kcoreaddons5_qt.po new/kcoreaddons-5.10.0/po/ko/kcoreaddons5_qt.po --- old/kcoreaddons-5.9.0/po/ko/kcoreaddons5_qt.po 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/po/ko/kcoreaddons5_qt.po 2015-05-03 17:07:03.000000000 +0200 @@ -1,7 +1,8 @@ # Korean messages for kdelibs. # Copyright (C) Free Software Foundation, Inc. # Cho Sung Jae <[email protected]>, 2007. -# Park Shinjo <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Shinjo Park <[email protected]>, 2007, 2008, 2009, 2010, 2011. +# Shinjo Park <[email protected]>, 2011, 2012, 2013, 2014, 2015. # msgid "" msgstr "" @@ -9,7 +10,7 @@ "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" "PO-Revision-Date: 2015-01-18 17:06+0900\n" -"Last-Translator: Park Shinjo <[email protected]>\n" +"Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/po/nb/kcoreaddons5_qt.po new/kcoreaddons-5.10.0/po/nb/kcoreaddons5_qt.po --- old/kcoreaddons-5.9.0/po/nb/kcoreaddons5_qt.po 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/po/nb/kcoreaddons5_qt.po 2015-05-03 17:07:03.000000000 +0200 @@ -1,7 +1,7 @@ # Translation of kcoreaddons5_qt to Norwegian Bokmål # # 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. +# 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. @@ -12,7 +12,7 @@ "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: 2014-04-28 15:00+0200\n" +"PO-Revision-Date: 2015-02-24 20:40+0100\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" "Language: nb\n" @@ -159,14 +159,14 @@ #: 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 å rapportere feil." #: lib/kaboutdata.cpp:974 msgctxt "KAboutData CLI|" msgid "Please report bugs to %s.\n" -msgstr "" +msgstr "Send denne feilrapporten til %s.\n" -#: lib/plugin/kpluginloader.cpp:117 +#: lib/plugin/kpluginloader.cpp:122 #, qt-format msgctxt "KPluginLoader|" msgid "The library %1 does not offer a KPluginFactory." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/po/nn/kcoreaddons5_qt.po new/kcoreaddons-5.10.0/po/nn/kcoreaddons5_qt.po --- old/kcoreaddons-5.9.0/po/nn/kcoreaddons5_qt.po 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/po/nn/kcoreaddons5_qt.po 2015-05-03 17:07:03.000000000 +0200 @@ -195,7 +195,7 @@ msgid "Please report bugs to %s.\n" msgstr "" -#: lib/plugin/kpluginloader.cpp:117 +#: lib/plugin/kpluginloader.cpp:122 #, qt-format msgctxt "KPluginLoader|" msgid "The library %1 does not offer a KPluginFactory." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/po/se/kcoreaddons5_qt.po new/kcoreaddons-5.10.0/po/se/kcoreaddons5_qt.po --- old/kcoreaddons-5.9.0/po/se/kcoreaddons5_qt.po 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/po/se/kcoreaddons5_qt.po 2015-05-03 17:07:03.000000000 +0200 @@ -190,7 +190,7 @@ msgid "Please report bugs to %s.\n" msgstr "" -#: lib/plugin/kpluginloader.cpp:117 +#: lib/plugin/kpluginloader.cpp:122 #, qt-format msgctxt "KPluginLoader|" msgid "The library %1 does not offer a KPluginFactory." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/src/lib/io/kdirwatch.cpp new/kcoreaddons-5.10.0/src/lib/io/kdirwatch.cpp --- old/kcoreaddons-5.9.0/src/lib/io/kdirwatch.cpp 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/src/lib/io/kdirwatch.cpp 2015-05-03 17:07:03.000000000 +0200 @@ -298,8 +298,14 @@ offsetCurrent += eventSize; QString path; - QByteArray cpath(event->name, event->len); - if (event->len) { + // strip trailing null chars, see inotify_event documentation + // these must not end up in the final QString version of path + int len = event->len; + while (len > 1 && !event->name[len - 1]) { + --len; + } + QByteArray cpath(event->name, len); + if (len) { path = QFile::decodeName(cpath); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/src/lib/jobs/kjob.h new/kcoreaddons-5.10.0/src/lib/jobs/kjob.h --- old/kcoreaddons-5.9.0/src/lib/jobs/kjob.h 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/src/lib/jobs/kjob.h 2015-05-03 17:07:03.000000000 +0200 @@ -90,6 +90,7 @@ Q_PROPERTY(QString errorText READ errorText NOTIFY result) Q_PROPERTY(QString errorString READ errorString NOTIFY result) Q_PROPERTY(unsigned long percent READ percent NOTIFY percent) + Q_PROPERTY(Capabilities capabilities READ capabilities CONSTANT) public: enum Unit { Bytes, Files, Directories }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/src/lib/util/kdelibs4migration.cpp new/kcoreaddons-5.10.0/src/lib/util/kdelibs4migration.cpp --- old/kcoreaddons-5.9.0/src/lib/util/kdelibs4migration.cpp 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/src/lib/util/kdelibs4migration.cpp 2015-05-03 17:07:03.000000000 +0200 @@ -52,7 +52,7 @@ d->m_kdeHome = homeDir.filePath(QStringLiteral(KDE4_DEFAULT_HOME)); } } - + if (!d->m_kdeHome.isEmpty() && !d->m_kdeHome.endsWith(QLatin1Char('/'))) { d->m_kdeHome.append(QLatin1Char('/')); } @@ -65,8 +65,7 @@ bool Kdelibs4Migration::kdeHomeFound() const { - QDir homeDir = QDir::home(); - return homeDir.exists(d->m_kdeHome); + return !d->m_kdeHome.isEmpty() && QDir(d->m_kdeHome).exists(); } QString Kdelibs4Migration::locateLocal(const char *type, const QString &filename) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.9.0/src/mimetypes/kde5.xml new/kcoreaddons-5.10.0/src/mimetypes/kde5.xml --- old/kcoreaddons-5.9.0/src/mimetypes/kde5.xml 2015-04-04 14:02:19.000000000 +0200 +++ new/kcoreaddons-5.10.0/src/mimetypes/kde5.xml 2015-05-03 17:07:03.000000000 +0200 @@ -25,7 +25,6 @@ <sub-class-of type="application/xml"/> <comment>Metalink download</comment> <comment xml:lang="ar">تنزيل Metalink</comment> - <comment xml:lang="ast">Descarga Metalink</comment> <comment xml:lang="bs">metalink preuzimanje</comment> <comment xml:lang="ca">Baixada de «Metalink»</comment> <comment xml:lang="ca@valencia">Baixada de «Metalink»</comment> @@ -83,7 +82,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> @@ -142,7 +140,6 @@ <mime-type type="application/x-cda"> <comment>CD audio</comment> <comment xml:lang="ar">صوت CD</comment> - <comment xml:lang="ast">Audio CD</comment> <comment xml:lang="bs">CD audio</comment> <comment xml:lang="ca">CD àudio</comment> <comment xml:lang="ca@valencia">CD àudio</comment> @@ -202,7 +199,6 @@ <mime-type type="application/x-font-snf"> <comment>SNF bitmap font</comment> <comment xml:lang="ar">خط SNF bitmap</comment> - <comment xml:lang="ast">Triba de lletra 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> @@ -262,7 +258,6 @@ <mime-type type="application/x-java-applet"> <comment>Java applet</comment> <comment xml:lang="ar">بريمج جافا</comment> - <comment xml:lang="ast">Miniaplicación Java</comment> <comment xml:lang="bg">Аплет на Java</comment> <comment xml:lang="bs">JAVA aplet</comment> <comment xml:lang="ca">miniaplicació Java</comment> @@ -321,7 +316,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 de 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 d'extensió KHTML</comment> @@ -377,7 +371,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> @@ -439,7 +432,6 @@ <sub-class-of type="application/zip"/> <comment>KNewStuff package</comment> <comment xml:lang="ar">حزمة KNewStuff</comment> - <comment xml:lang="ast">Paquete de 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> @@ -497,7 +489,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 de 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> @@ -559,7 +550,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'informe 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> @@ -617,7 +607,6 @@ <mime-type type="application/x-mimearchive"> <comment>mime encapsulated web archive</comment> <comment xml:lang="ar">نوع ملفات يغلف أرشف ويب</comment> - <comment xml:lang="ast">ficheru web encapsuláu mime</comment> <comment xml:lang="bs">MIME učaurena veb arhiva</comment> <comment xml:lang="ca">arxiu web encapsulat en MIME</comment> <comment xml:lang="ca@valencia">arxiu web encapsulat en MIME</comment> @@ -673,7 +662,6 @@ <mime-type type="application/x-nzb"> <!-- fdo #10029, released in s-m-i 0.91 --> <comment>NewzBin usenet index</comment> <comment xml:lang="ar">فهرس يوزنت NewzBin</comment> - <comment xml:lang="ast">Índiz usenet de NewzBin</comment> <comment xml:lang="bs">NewzBinov indeks Useneta</comment> <comment xml:lang="ca">índex usenet NewzBin</comment> <comment xml:lang="ca@valencia">índex usenet NewzBin</comment> @@ -734,7 +722,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> @@ -794,7 +781,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> @@ -959,7 +945,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 proyeutu de KPlato</comment> <comment xml:lang="bs">KPlatoov dokument upravljanja projektom</comment> <comment xml:lang="ca">document de gestió de projecte del KPlato</comment> <comment xml:lang="ca@valencia">document de gestió de projecte del KPlato</comment> @@ -1016,7 +1001,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 proyeutu de KPlato</comment> <comment xml:lang="bs">KPlatoov radni paket upravljanja projektom</comment> <comment xml:lang="ca">paquet de treball de gestió de projecte del KPlato</comment> <comment xml:lang="ca@valencia">paquet de treball de gestió de projecte del KPlato</comment> @@ -1073,7 +1057,6 @@ <mime-type type="application/x-vnd.kde.kugar.mixed"> <comment>Kugar archive</comment> <comment xml:lang="ar">أرشيف Kugar</comment> - <comment xml:lang="ast">Ficheru de 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> @@ -1132,7 +1115,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">ficheru web</comment> <comment xml:lang="bs">veb arhiva</comment> <comment xml:lang="ca">arxiu web</comment> <comment xml:lang="ca@valencia">arxiu web</comment> @@ -1191,7 +1173,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 del W3C</comment> <comment xml:lang="bs">W3C‑ova XML šema</comment> <comment xml:lang="ca">esquema XML W3C</comment> <comment xml:lang="ca@valencia">esquema XML W3C</comment> @@ -1248,7 +1229,6 @@ <mime-type type="audio/aac"> <!-- in fdo s-m-i since 1.1 --> <comment>AAC sound</comment> <comment xml:lang="ar">صوت AAC</comment> - <comment xml:lang="ast">Soníu AAC</comment> <comment xml:lang="bs">AAC zvuk</comment> <comment xml:lang="ca">so AAC</comment> <comment xml:lang="ca@valencia">so AAC</comment> @@ -1308,7 +1288,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 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> @@ -1365,7 +1344,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> @@ -1423,7 +1401,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> @@ -1488,7 +1465,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 brutu de KDE</comment> <comment xml:lang="bs">KDE formati sirovih slika</comment> <comment xml:lang="ca">formats d'imatge en brut del KDE</comment> <comment xml:lang="ca@valencia">formats d'imatge en brut del KDE</comment> @@ -1559,7 +1535,6 @@ <sub-class-of type="text/plain"/> <comment>Intel® hexadecimal object file</comment> <comment xml:lang="ar">ملف كائن سداسي عشر Intel®</comment> - <comment xml:lang="ast">Ficheru de códigu oxetu hexadecimal d'Intel®</comment> <comment xml:lang="bs">Intelova heksadekadna objektna datoteka</comment> <comment xml:lang="ca">fitxer objecte hexadecimal Intel®</comment> <comment xml:lang="ca@valencia">fitxer objecte hexadecimal Intel®</comment> @@ -1620,7 +1595,6 @@ <sub-class-of type="text/plain"/> <comment>Kate file list loader plugin list</comment> <comment xml:lang="ar">قائمة ملحقات محملات قائمة ملفات لكيت</comment> - <comment xml:lang="ast">Llista de complementos de carga de llistes de ficheros de Kate</comment> <comment xml:lang="bs">spisak Kateinog priključka za učitavanje datoteka</comment> <comment xml:lang="ca">llista del connector carregador de llista de fitxers del Kate</comment> <comment xml:lang="ca@valencia">llista del connector carregador de llista de fitxers del Kate</comment> @@ -1677,7 +1651,6 @@ <sub-class-of type="text/x-csrc"/> <comment>Objective-C header</comment> <comment xml:lang="ar">ترويسة Objective-C</comment> - <comment xml:lang="ast">Cabecera de Objective-C</comment> <comment xml:lang="bs">Objective‑c zaglavlje</comment> <comment xml:lang="ca">capçalera Objective-C</comment> <comment xml:lang="ca@valencia">capçalera Objective-C</comment> @@ -1735,7 +1708,6 @@ <sub-class-of type="text/plain"/> <comment>abc musical notation file</comment> <comment xml:lang="ar">ملف كراسة موسيقية abc</comment> - <comment xml:lang="ast">Ficheru de notación musical abc</comment> <comment xml:lang="bs">muzička notacija ABC</comment> <comment xml:lang="ca">fitxer de notació musical abc</comment> <comment xml:lang="ca@valencia">fitxer de notació musical abc</comment> @@ -1796,7 +1768,6 @@ <sub-class-of type="application/zip"/> <comment>fonts package</comment> <comment xml:lang="ar">حزمة خطوط</comment> - <comment xml:lang="ast">paquete de tribes de lletra</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> @@ -1856,7 +1827,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> @@ -1915,7 +1885,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 Windows</comment> <comment xml:lang="ca@valencia">treball en grup Windows</comment> @@ -1974,7 +1943,6 @@ <!-- <sub-class-of type="application/xml"/> --> <comment>KDE system monitor</comment> <comment xml:lang="ar">نظام مراقبة كدي</comment> - <comment xml:lang="ast">Monitor del sistema de 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> @@ -2034,7 +2002,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> @@ -2095,7 +2062,6 @@ <sub-class-of type="text/plain"/> <comment>Quanta project</comment> <comment xml:lang="ar">مشروع Quanta</comment> - <comment xml:lang="ast">Proyeutu de Quanta</comment> <comment xml:lang="bg">Проект на Quanta</comment> <comment xml:lang="bs">Quantin projekat</comment> <comment xml:lang="ca">projecte del Quanta</comment> @@ -2155,7 +2121,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> @@ -2214,7 +2179,6 @@ <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> @@ -2272,7 +2236,6 @@ <mime-type type="application/x-kolf"> <comment>Kolf saved game</comment> <comment xml:lang="ar">لعبة Kolf محفوظة</comment> - <comment xml:lang="ast">Xuegu guardáu 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> @@ -2334,7 +2297,6 @@ <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> @@ -2398,7 +2360,6 @@ <mime-type type="application/vnd.kde.okular-archive"> <comment>Okular document archive</comment> <comment xml:lang="ar">أرشيف مستند أوكلار</comment> - <comment xml:lang="ast">Ficheru de documentu de 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> @@ -2457,7 +2418,6 @@ <mime-type type="application/x-cabri"> <comment>Cabri figure</comment> <comment xml:lang="ar">صورة Cabri</comment> - <comment xml:lang="ast">Figura de 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> @@ -2520,7 +2480,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 Dr. Geo</comment> <comment xml:lang="ca@valencia">figura Dr. Geo</comment> @@ -2582,7 +2541,6 @@ <mime-type type="application/x-kgeo"> <comment>KGeo figure</comment> <comment xml:lang="ar">صورة KGeo</comment> - <comment xml:lang="ast">Figura de KGeo</comment> <comment xml:lang="bg">Фигура за KGeo</comment> <comment xml:lang="bs">KGeov crtež</comment> <comment xml:lang="ca">figura del KGeo</comment> @@ -2640,7 +2598,6 @@ <mime-type type="application/x-kig"> <comment>Kig figure</comment> <comment xml:lang="ar">صورة Kig</comment> - <comment xml:lang="ast">Figura de Kig</comment> <comment xml:lang="bg">Фигура за Kig</comment> <comment xml:lang="bs">KIG‑ov crtež</comment> <comment xml:lang="ca">figura del Kig</comment> @@ -2699,7 +2656,6 @@ <mime-type type="application/x-kseg"> <comment>KSeg document</comment> <comment xml:lang="ar">وثيقة KSeg</comment> - <comment xml:lang="ast">Documentu de KSeg</comment> <comment xml:lang="bg">Документ KSeg</comment> <comment xml:lang="bs">KSegov dokument</comment> <comment xml:lang="ca">document del KSeg</comment> @@ -2759,7 +2715,6 @@ <sub-class-of type="application/xml"/> <comment>vocabulary trainer document</comment> <comment xml:lang="ar">وثيقة مدرب المفردات</comment> - <comment xml:lang="ast">documentu d'entrenador de vocabulariu</comment> <comment xml:lang="bs">dokument za uvježbavanje rječnika</comment> <comment xml:lang="ca">document d'entrenador de vocabulari</comment> <comment xml:lang="ca@valencia">document d'entrenador de vocabulari</comment> @@ -2816,7 +2771,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> @@ -2874,7 +2828,6 @@ <mime-type type="application/x-kwordquiz"> <comment>KWordQuiz vocabulary</comment> <comment xml:lang="ar">مفردات KWordQuiz</comment> - <comment xml:lang="ast">Vocabulariu de 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> @@ -2932,7 +2885,6 @@ <mime-type type="application/x-kcachegrind"> <comment>Cachegrind/Callgrind profile dump</comment> <comment xml:lang="ar">تشكيلة تفريغ Cachegrind/Callgrind </comment> - <comment xml:lang="ast">Volcáu d'analís de rendimientu de Cachegrind/Callgrind</comment> <comment xml:lang="bs">Cachegrindov/Callgrindov profilni popis</comment> <comment xml:lang="ca">bolcat de perfil Cachegrind/Callgrind</comment> <comment xml:lang="ca@valencia">bolcat de perfil Cachegrind/Callgrind</comment> @@ -2991,7 +2943,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> @@ -3050,7 +3001,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ç de Windows</comment> <comment xml:lang="ca@valencia">enllaç de Windows</comment> @@ -3111,7 +3061,6 @@ <sub-class-of type="application/xml"/> <comment>KGet download list</comment> <comment xml:lang="ar">قائمة تنزيل KGet</comment> - <comment xml:lang="ast">Llista de descarga 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> @@ -3170,7 +3119,6 @@ <mime-type type="application/x-kopete-emoticons"> <comment>Kopete emoticons archive</comment> <comment xml:lang="ar">أرشف إبتسامات Kopete</comment> - <comment xml:lang="ast">Ficheru de fustaxes de Kopete</comment> <comment xml:lang="bs">Kopeteova arhiva emotikona</comment> <comment xml:lang="ca">arxiu d'emoticones del Kopete</comment> <comment xml:lang="ca@valencia">arxiu d'emoticones del Kopete</comment> @@ -3227,7 +3175,6 @@ <mime-type type="application/x-icq"> <comment>ICQ contact</comment> <comment xml:lang="ar">جهة اتصال ICQ</comment> - <comment xml:lang="ast">Contautu de ICQ</comment> <comment xml:lang="bg">Контакт в ICQ</comment> <comment xml:lang="bs">ICQ kontakt</comment> <comment xml:lang="ca">contacte de l'ICQ</comment> @@ -3290,7 +3237,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> @@ -3355,7 +3301,6 @@ <mime-type xmlns="http://www.freedesktop.org/standards/shared-mime-info"; type="application/x-trig"> <!-- fdo #32182, released in s-m-i 1.1 --> <comment>TriG RDF document</comment> <comment xml:lang="ar">وثيقة TriG RDF</comment> - <comment xml:lang="ast">Documentu RDF TriG</comment> <comment xml:lang="bs">TriG RDF dokument</comment> <comment xml:lang="ca">document TriG RDF</comment> <comment xml:lang="ca@valencia">document TriG RDF</comment> @@ -3416,7 +3361,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 Turtle</comment> <comment xml:lang="bs">Turtle RDF dokument</comment> <comment xml:lang="ca">document Turtle RDF</comment> <comment xml:lang="ca@valencia">document Turtle RDF</comment> @@ -3648,8 +3592,8 @@ <match type="string" offset="60" value="BOOKMOBI" /> </magic> </mime-type> - <!-- Will be in s-m-i 1.3, remove when we can depend on it --> - <mime-type type="image/x-webp"> + <!-- Released since s-m-i 1.3, remove when we can depend on it --> + <mime-type type="image/webp"> <comment>WebP image</comment> <comment xml:lang="ca">imatge WebP</comment> <comment xml:lang="ca@valencia">imatge WebP</comment> @@ -3693,7 +3637,6 @@ <match type="string" value="WEBP" offset="8"/> </match> </magic> - <alias type="image/webp"/> <glob pattern="*.webp"/> </mime-type> </mime-info>
