Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2015-11-24 22:25:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2015-10-30 13:40:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2015-11-24 22:25:04.000000000 +0100 @@ -1,0 +2,16 @@ +Sun Nov 8 17:03:37 UTC 2015 - [email protected] + +- Update to 5.16.0 (boo#955067) + * KBuildSycoca: always save, even if no change in .desktop file + was noticed. (kde#353203) + * Make doctools optional + * kbuildsycoca: parse all the mimeapps.list files mentioned in + the new spec. + * Use largest timestamp in subdirectory as resource + directory timestamp. + * Keep MIME types separate when converting KPluginInfo to + KPluginMetaData + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.16.0.php + +------------------------------------------------------------------- Old: ---- kservice-5.15.0.tar.xz New: ---- kservice-5.16.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.Mn3xkg/_old 2015-11-24 22:25:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Mn3xkg/_new 2015-11-24 22:25:05.000000000 +0100 @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.15 +%define _tar_path 5.16 Name: kservice -Version: 5.15.0 +Version: 5.16.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ kservice-5.15.0.tar.xz -> kservice-5.16.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/CMakeLists.txt new/kservice-5.16.0/CMakeLists.txt --- old/kservice-5.15.0/CMakeLists.txt 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/CMakeLists.txt 2015-11-08 13:35:05.000000000 +0100 @@ -5,7 +5,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.15.0 NO_MODULE) +find_package(ECM 5.16.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) @@ -19,8 +19,8 @@ include(GenerateExportHeader) -set(KF5_VERSION "5.15.0") # handled by release scripts -set(KF5_DEP_VERSION "5.15.0") # handled by release scripts +set(KF5_VERSION "5.16.0") # handled by release scripts +set(KF5_DEP_VERSION "5.16.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KSERVICE @@ -43,7 +43,7 @@ find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED) find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5DocTools REQUIRED) +find_package(KF5DocTools ${KF5_DEP_VERSION}) # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Service") @@ -70,9 +70,16 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kservice5\") if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ki18n_install(po) - kdoctools_install(po) + + if (KF5DocTools_FOUND) + kdoctools_install(po) + endif() +endif() + +if (KF5DocTools_FOUND) + add_subdirectory(docs) endif() -add_subdirectory(docs) + add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(autotests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/autotests/fakekdedmodule.desktop new/kservice-5.16.0/autotests/fakekdedmodule.desktop --- old/kservice-5.15.0/autotests/fakekdedmodule.desktop 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/autotests/fakekdedmodule.desktop 2015-11-08 13:35:05.000000000 +0100 @@ -14,7 +14,7 @@ Comment[br]=Mollad KDED Comment[bs]=KDED modul Comment[ca]=Mòdul pel KDED -Comment[ca@valencia]=Mòdul per al KDED +Comment[ca@valencia]=Mòdul pel KDED Comment[cs]=KDED modul Comment[csb]=Mòdul KDED Comment[cy]=Modiwl KDED @@ -43,7 +43,7 @@ Comment[hy]=KDED մոդուլ Comment[ia]=Modulo KDED Comment[id]=Modul KDED -Comment[is]=KDED eining +Comment[is]=KDED-eining Comment[it]=Modulo di KDED Comment[ja]=KDED モジュール Comment[kk]=KDED модулі diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/autotests/fakeplugin.desktop new/kservice-5.16.0/autotests/fakeplugin.desktop --- old/kservice-5.15.0/autotests/fakeplugin.desktop 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/autotests/fakeplugin.desktop 2015-11-08 13:35:05.000000000 +0100 @@ -17,6 +17,7 @@ Name[hu]=NSA bővítmény Name[ia]=Plugin de NSA Name[id]=Plugin NSA +Name[is]=NSA-viðbót Name[it]=Estensione NSA Name[ko]=NSA 플러그인 Name[lt]=NSA priedas @@ -61,6 +62,7 @@ Comment[hu]=Teszt bővítmény kém Comment[ia]=Essaya Plugin Spy Comment[id]=Tes Plugin Mata-Mata +Comment[is]=Spy prófunarviðbót Comment[it]=Estensione di test Spy Comment[ko]=테스트 플러그인 첩자 Comment[lt]=Bandomasis priedas - šnipas @@ -107,12 +109,16 @@ Keywords=word1;word2 Keywords[ast]=pallabra1;pallabra2 Keywords[ca]=paraula1;paraula2 +Keywords[ca@valencia]=paraula1;paraula2 Keywords[da]=ord1;ord2 Keywords[de]=Welt1;Welt2 +Keywords[el]=λέξη1;λέξη2 Keywords[en_GB]=word1;word2 Keywords[es]=palabra1;palabra2 Keywords[fi]=sana1;sana2 +Keywords[gd]=facal1;facal2 Keywords[gl]=palabra1;palabra2 +Keywords[is]=word1;word2 Keywords[it]=parola1;parola2 Keywords[ko]=word1;word2 Keywords[nb]=ord1;ord2 @@ -138,12 +144,16 @@ X-KDE-Keywords=word3,word4 X-KDE-Keywords[ast]=pallabra1;pallabra2 X-KDE-Keywords[ca]=paraula3,paraula4 +X-KDE-Keywords[ca@valencia]=paraula3,paraula4 X-KDE-Keywords[da]=ord3,ord4 X-KDE-Keywords[de]=Welt3,Welt4 +X-KDE-Keywords[el]=λέξη3,λέξη4 X-KDE-Keywords[en_GB]=word3,word4 X-KDE-Keywords[es]=palabra3,palabra4 X-KDE-Keywords[fi]=sana3,sana4 +X-KDE-Keywords[gd]=facal3,facal4 X-KDE-Keywords[gl]=palabra3,palabra4 +X-KDE-Keywords[is]=word3,word4 X-KDE-Keywords[it]=parola3,parola4 X-KDE-Keywords[ko]=word3,word4 X-KDE-Keywords[nb]=ord3,ord4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/autotests/kmimeassociationstest.cpp new/kservice-5.16.0/autotests/kmimeassociationstest.cpp --- old/kservice-5.15.0/autotests/kmimeassociationstest.cpp 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/autotests/kmimeassociationstest.cpp 2015-11-08 13:35:05.000000000 +0100 @@ -24,12 +24,15 @@ #include <kdesktopfile.h> #include <kmimetypetrader.h> #include <kservicefactory_p.h> +#include <qtemporarydir.h> #include <qtemporaryfile.h> #include <qtest.h> #include "kmimeassociations_p.h" #include <kbuildsycoca_p.h> #include <ksycoca.h> #include "ksycoca_p.h" +#include <QMimeDatabase> +#include <QMimeType> // We need a factory that returns the same KService::Ptr every time it's asked for a given service. // Otherwise the changes to the service's serviceTypes by KMimeAssociationsTest have no effect @@ -220,8 +223,11 @@ KOfferHash offerHash; KMimeAssociations parser(offerHash, KSycocaPrivate::self()->serviceFactory()); - QTemporaryFile tempFile; - QVERIFY(tempFile.open()); + QTemporaryDir tempDir; + QVERIFY(tempDir.isValid()); + + QFile tempFile(tempDir.path() + "/mimeapps.list"); + QVERIFY(tempFile.open(QIODevice::WriteOnly)); tempFile.write(m_mimeAppsFileContents); const QString fileName = tempFile.fileName(); tempFile.close(); @@ -269,8 +275,11 @@ KMimeAssociations parser(offerHash, KSycocaPrivate::self()->serviceFactory()); // Write global file - QTemporaryFile tempFileGlobal; - QVERIFY(tempFileGlobal.open()); + QTemporaryDir tempDirGlobal; + QVERIFY(tempDirGlobal.isValid()); + + QFile tempFileGlobal(tempDirGlobal.path() + "/mimeapps.list"); + QVERIFY(tempFileGlobal.open(QIODevice::WriteOnly)); QByteArray globalAppsFileContents = "[Added Associations]\n" "image/jpeg=firefox.desktop;\n" // removed by local config "text/html=firefox.desktop;\n" // mdv @@ -280,8 +289,11 @@ tempFileGlobal.close(); // We didn't keep it, so we need to write the local file again - QTemporaryFile tempFile; - QVERIFY(tempFile.open()); + QTemporaryDir tempDir; + QVERIFY(tempDir.isValid()); + + QFile tempFile(tempDir.path() + "/mimeapps.list"); + QVERIFY(tempFile.open(QIODevice::WriteOnly)); tempFile.write(m_mimeAppsFileContents); const QString fileName = tempFile.fileName(); tempFile.close(); @@ -372,6 +384,12 @@ { // #164584: Removing ark from opendocument.text didn't work const QString opendocument = "application/vnd.oasis.opendocument.text"; + + // [sanity checking of s-m-i installation] + QMimeType mime = QMimeDatabase().mimeTypeForName(opendocument); + QVERIFY(mime.isValid()); + QVERIFY(mime.inherits("application/zip")); + KService::List offers = KMimeTypeTrader::self()->query(opendocument); QVERIFY(offerListHasService(offers, fakeArkApplication, true)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/autotests/kplugininfotest.cpp new/kservice-5.16.0/autotests/kplugininfotest.cpp --- old/kservice-5.15.0/autotests/kplugininfotest.cpp 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/autotests/kplugininfotest.cpp 2015-11-08 13:35:05.000000000 +0100 @@ -158,14 +158,17 @@ QCOMPARE(info.libraryPath(), pluginName); QCOMPARE(info.license(), QStringLiteral("LGPL")); QCOMPARE(info.pluginName(), pluginName); - if (info.service() || QTest::currentDataTag() == QByteArrayLiteral("from KService::Ptr + custom property")) { - // KService merges X-KDE-ServiceTypes and MimeTypes - QCOMPARE(info.serviceTypes(), QStringList() << "KService/NSA" << "text/plain" << "image/png"); + // KService/KPluginInfo merges X-KDE-ServiceTypes and MimeTypes + QCOMPARE(info.serviceTypes(), QStringList() << "KService/NSA" << "text/plain" << "image/png"); + if (!info.service()) { // KService does not include X-My-Custom-Property since there is no service type installed that defines it - } else { - QCOMPARE(info.serviceTypes(), QStringList() << "KService/NSA"); QCOMPARE(info.property("X-My-Custom-Property"), QVariant("foo")); } + // Now check that converting to KPluginMetaData has the separation + KPluginMetaData asMetaData = info.toMetaData(); + QCOMPARE(asMetaData.serviceTypes(), QStringList() << "KService/NSA"); + QCOMPARE(asMetaData.mimeTypes(), QStringList() << "text/plain" << "image/png"); + QCOMPARE(info.version(), QStringLiteral("1.0")); QCOMPARE(info.website(), QStringLiteral("http://kde.org/";)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/autotests/ksycocatest.cpp new/kservice-5.16.0/autotests/ksycocatest.cpp --- old/kservice-5.15.0/autotests/ksycocatest.cpp 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/autotests/ksycocatest.cpp 2015-11-08 13:35:05.000000000 +0100 @@ -61,10 +61,13 @@ QDir(servicesDir()).removeRecursively(); QDir(menusDir()).removeRecursively(); - QDir().mkpath(menusDir()); + QDir().mkpath(menusDir() + "/fakeSubserviceDirectory"); #ifdef Q_XDG_PLATFORM qputenv("XDG_DATA_DIRS", QFile::encodeName(m_tempDir.path())); + + // so that vfolder_menu doesn't go look into /etc and /usr + qputenv("XDG_CONFIG_DIRS", QFile::encodeName(m_tempDir.path())); #else // We need to make changes to a global dir without messing up the system QSKIP("This test requires XDG_DATA_DIRS"); @@ -180,9 +183,7 @@ #endif const QDateTime oldTimestamp = QFileInfo(KSycoca::absoluteFilePath()).lastModified(); - QDir dir(menusDir()); - dir.mkdir("fakeSubserviceDirectory"); - const QString path = dir.absoluteFilePath("fakeSubserviceDirectory"); + const QString path = menusDir() + QString("/fakeSubserviceDirectory"); // ### use QFile::setFileTime when it lands in Qt... #ifdef Q_OS_UNIX @@ -199,12 +200,17 @@ ksycoca_ms_between_checks = 0; QTest::qWait(1000); // remove this once lastModified includes ms + qDebug() << "Waited 1s, calling ensureCacheValid (should rebuild)"; KSycoca::self()->ensureCacheValid(); const QDateTime newTimestamp = QFileInfo(KSycoca::absoluteFilePath()).lastModified(); + if (newTimestamp <= oldTimestamp) { + qWarning() << "oldTimestamp=" << oldTimestamp << "newTimestamp=" << newTimestamp; + } QVERIFY(newTimestamp > oldTimestamp); QTest::qWait(1000); // remove this once lastModified includes ms + qDebug() << "Waited 1s, calling ensureCacheValid (should not rebuild)"; KSycoca::self()->ensureCacheValid(); const QDateTime againTimestamp = QFileInfo(KSycoca::absoluteFilePath()).lastModified(); QCOMPARE(againTimestamp, newTimestamp); // same mtime, it didn't get rebuilt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/autotests/noplugin.desktop new/kservice-5.16.0/autotests/noplugin.desktop --- old/kservice-5.15.0/autotests/noplugin.desktop 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/autotests/noplugin.desktop 2015-11-08 13:35:05.000000000 +0100 @@ -6,6 +6,7 @@ Name[cs]=Žádný modul Name[da]=Intet plugin Name[de]=Kein Modul +Name[el]=Χωρίς πρόσθετο Name[en_GB]=No Plugin Name[es]=Ningún complemento Name[fi]=Ei liitännäistä @@ -15,6 +16,7 @@ Name[hu]=Nincsenek bővítmények Name[ia]=Necun Plugin Name[id]=Tak Ada Plugin +Name[is]=Engin viðbót Name[it]=Senza estensione Name[ko]=플러그인 없음 Name[lt]=Nerasta priedų @@ -44,10 +46,11 @@ Comment=This does not have a library Comment[ast]=Esto nun tien una llibrería Comment[ca]=Aquest no té cap biblioteca -Comment[ca@valencia]=Això no té cap biblioteca +Comment[ca@valencia]=Este no té cap biblioteca Comment[cs]=Toto nemá knihovnu Comment[da]=Dette har ikke et bibliotek Comment[de]=Dies hat keine Bibliothek +Comment[el]=Αυτό δεν περιέχει βιβλιοθήκη Comment[en_GB]=This does not have a library Comment[es]=Esto no posee una biblioteca Comment[fi]=Tällä ei ole kirjastoa @@ -57,6 +60,7 @@ Comment[hu]=Ennek nincsen függvénykönyvtára Comment[ia]=Isto non ha un bibliotheca Comment[id]=Ini tidak mempunyai pustaka +Comment[is]=Þetta er ekki með aðgerðasafn Comment[it]=Questo non ha una libreria Comment[ko]=이 플러그인은 라이브러리를 포함하지 않음 Comment[lt]=Tai neturi bibliotekos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/po/ca/docs/desktoptojson/man-desktoptojson.8.docbook new/kservice-5.16.0/po/ca/docs/desktoptojson/man-desktoptojson.8.docbook --- old/kservice-5.15.0/po/ca/docs/desktoptojson/man-desktoptojson.8.docbook 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/po/ca/docs/desktoptojson/man-desktoptojson.8.docbook 2015-11-08 13:35:05.000000000 +0100 @@ -39,7 +39,7 @@ </author> <date ->02-04-2014</date> +>2 d'abril de 2014</date> <releaseinfo >Frameworks 5.0</releaseinfo> <productname diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/po/ca/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook new/kservice-5.16.0/po/ca/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook --- old/kservice-5.15.0/po/ca/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/po/ca/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook 2015-11-08 13:35:05.000000000 +0100 @@ -39,9 +39,9 @@ </author> <date ->12-04-2014</date> +>17 de setembre de 2015</date> <releaseinfo ->Frameworks 5.0</releaseinfo> +>Frameworks 5.15</releaseinfo> <productname >KDE Frameworks</productname> @@ -112,21 +112,6 @@ <varlistentry> <term ><option ->--checkstamps</option -></term> -<listitem> -<para ->Comprova les marques de temps dels fitxers de la memòria cau i els directoris de recursos que contenen les dades que van a la memòria cau, i només actualitza la base de dades si algun dels directoris de recursos ha estat modificat més recentment que la memòria cau. S'ignorarà si s'estableixen les opcions <option ->--nocheckfiles</option -> o <option ->--noincremental</option ->.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option >--global</option ></term> <listitem> @@ -140,21 +125,6 @@ <varlistentry> <term ><option ->--nocheckfiles</option -></term> -<listitem> -<para ->No reconstrueix la memòria cau, llevat que succeixi alguna cosa més que un canvi en els fitxers de recursos (com un canvi en el format de la memòria cau o un canvi a <varname ->XDG_DATA_DIRS</varname -> en un sistema Unix). S'ignorarà si s'estableix l'opció <option ->--global</option ->.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option >--noincremental</option ></term> <listitem> @@ -270,8 +240,8 @@ <term ><filename ><varname ->directori_cau</varname ->/ksycoca5</filename +>cachedir</varname +>/ksycoca5_[idioma]_[sha1-of-dirs]</filename ></term> <listitem> <para @@ -281,24 +251,6 @@ >directori_cau</varname >) sol ser <filename class="directory" ><envar ->XDG_CONFIG_HOME</envar -></filename -></para> -</listitem> -</varlistentry> -<varlistentry> -<term -><filename -><varname ->directori_cau</varname ->/ksycoca5stamp</filename -></term> -<listitem> -<para ->La marca de temps i altra meta-informació sobre el fitxer de memòria cau principal. Sobre els sistemes Unix, el <varname ->directori_cau</varname ->) sol ser <filename class="directory" -><envar >XDG_CONFIG_HOME</envar ></filename ></para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/po/ca/kservice5.po new/kservice-5.16.0/po/ca/kservice5.po --- old/kservice-5.15.0/po/ca/kservice5.po 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/po/ca/kservice5.po 2015-11-08 13:35:05.000000000 +0100 @@ -1,5 +1,5 @@ # Translation of kservice5.po to Catalan -# Copyright (C) 2014 This_file_is_part_of_KDE +# Copyright (C) 2014-2015 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/po/ca@valencia/kservice5.po new/kservice-5.16.0/po/ca@valencia/kservice5.po --- old/kservice-5.15.0/po/ca@valencia/kservice5.po 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/po/ca@valencia/kservice5.po 2015-11-08 13:35:05.000000000 +0100 @@ -1,13 +1,12 @@ -# Translation of kservice5.po to Catalan -# Copyright (C) 1998-2014 This_file_is_part_of_KDE +# Translation of kservice5.po to Catalan (Valencian) +# Copyright (C) 2014-2015 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Sebastià Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006. -# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013. +# Sebastià Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. +# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014, 2015. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. -# Sebastia Pla Sanz <[email protected]>, 2006, 2007. -# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Robert Millan <[email protected]>, 2009. # Orestes Mas <[email protected]>, 2010. msgid "" @@ -15,14 +14,14 @@ "Project-Id-Version: kservice5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-09-19 08:55+0000\n" -"PO-Revision-Date: 2014-04-06 18:06+0200\n" +"PO-Revision-Date: 2015-09-16 19:59+0200\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" @@ -32,7 +31,7 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "[email protected],[email protected],[email protected],[email protected]" +msgstr "[email protected],[email protected],[email protected],[email protected]" #: kbuildsycoca/kbuildsycoca_main.cpp:56 msgctxt "application name" @@ -65,14 +64,11 @@ msgstr "Waldo Bastian" #: kbuildsycoca/kbuildsycoca_main.cpp:75 -#, fuzzy -#| msgctxt "@info:shell command-line option" -#| msgid "Disable checking files (dangerous)" msgctxt "@info:shell command-line option" msgid "" "Do not signal applications to update (deprecated, no longer having any " "effect)" -msgstr "Desactiva la verificació de fitxers (perillós)" +msgstr "No senyalis aplicacions a actualitzar (obsolet, ja no té cap efecte)" #: kbuildsycoca/kbuildsycoca_main.cpp:78 msgctxt "@info:shell command-line option" @@ -83,14 +79,12 @@ msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" msgstr "" +"Comprova les marques de temps del fitxer (obsoleta, ja no té cap efecte)" #: kbuildsycoca/kbuildsycoca_main.cpp:84 -#, fuzzy -#| msgctxt "@info:shell command-line option" -#| msgid "Disable checking files (dangerous)" msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" -msgstr "Desactiva la verificació de fitxers (perillós)" +msgstr "Desactiva la verificació dels fitxers (obsoleta, ja no té cap efecte)" #: kbuildsycoca/kbuildsycoca_main.cpp:87 msgctxt "@info:shell command-line option" @@ -122,7 +116,7 @@ "Error launching %1. Either KLauncher is not running anymore, or it failed to " "start the application." msgstr "" -"Error en executar %1. O el KLauncher no s'està executant, o ha fallat en " +"Error en llançar %1. O el KLauncher no s'està executant, o ha fallat en " "iniciar l'aplicació." #: kdeinit/ktoolinvocation.cpp:106 @@ -141,13 +135,13 @@ "\n" "%1" msgstr "" -"No s'ha pogut engegar el client de correu:\n" +"No s'ha pogut llançar el client de correu:\n" "\n" "%1" #: kdeinit/ktoolinvocation_x11.cpp:252 msgid "Could not launch Mail Client" -msgstr "No s'ha pogut engegar el client de correu" +msgstr "No s'ha pogut llançar el client de correu" #: kdeinit/ktoolinvocation_x11.cpp:301 kdeinit/ktoolinvocation_x11.cpp:326 #: kdeinit/ktoolinvocation_x11.cpp:345 @@ -157,14 +151,14 @@ "\n" "%1" msgstr "" -"No s'ha pogut engegar el navegador:\n" +"No s'ha pogut llançar el navegador:\n" "\n" "%1" #: kdeinit/ktoolinvocation_x11.cpp:302 kdeinit/ktoolinvocation_x11.cpp:327 #: kdeinit/ktoolinvocation_x11.cpp:346 msgid "Could not launch Browser" -msgstr "No s'ha pogut engegar el navegador" +msgstr "No s'ha pogut llançar el navegador" #: kdeinit/ktoolinvocation_x11.cpp:385 #, kde-format @@ -173,13 +167,13 @@ "\n" "%1" msgstr "" -"No s'ha pogut engegar el client de terminal:\n" +"No s'ha pogut llançar el client de terminal:\n" "\n" "%1" #: kdeinit/ktoolinvocation_x11.cpp:386 msgid "Could not launch Terminal Client" -msgstr "No s'ha pogut engegar el client de terminal" +msgstr "No s'ha pogut llançar el client de terminal" #: plugin/kdbusservicestarter.cpp:77 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/po/el/kservice5.po new/kservice-5.16.0/po/el/kservice5.po --- old/kservice-5.15.0/po/el/kservice5.po 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/po/el/kservice5.po 2015-11-08 13:35:05.000000000 +0100 @@ -15,19 +15,20 @@ # Dimitrios Glentadakis <[email protected]>, 2010, 2011, 2012, 2013, 2014. # nikos, 2011. # Stelios <[email protected]>, 2012, 2013. +# Dimitris Kardarakos <[email protected]>, 2015. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-09-19 08:55+0000\n" -"PO-Revision-Date: 2014-01-04 09:52+0100\n" -"Last-Translator: Dimitrios Glentadakis <[email protected]>\n" +"PO-Revision-Date: 2015-11-06 11:46+0200\n" +"Last-Translator: Dimitris Kardarakos <[email protected]>\n" "Language-Team: Greek <[email protected]>\n" "Language: el\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" msgctxt "NAME OF TRANSLATORS" @@ -39,59 +40,45 @@ msgstr "[email protected], [email protected], [email protected]" #: kbuildsycoca/kbuildsycoca_main.cpp:56 -#, fuzzy -#| msgid "KBuildSycoca" msgctxt "application name" msgid "KBuildSycoca" msgstr "KBuildSycoca" #: kbuildsycoca/kbuildsycoca_main.cpp:58 -#, fuzzy -#| msgid "Rebuilds the system configuration cache." msgctxt "application description" msgid "Rebuilds the system configuration cache." msgstr "Ξαναχτίζει τη λανθάνουσα μνήμη διαμόρφωσης συστήματος." #: kbuildsycoca/kbuildsycoca_main.cpp:60 -#, fuzzy -#| msgid "(c) 1999-2002 KDE Developers" msgctxt "@info:credit" msgid "Copyright 1999-2014 KDE Developers" -msgstr "(c) 1999-2002 Οι προγραμματιστές του KDE" +msgstr "Πνευματικά δικαιώματα 1999 - 2014, οι προγραμματιστές του KDE" #: kbuildsycoca/kbuildsycoca_main.cpp:61 -#, fuzzy -#| msgid "David Faure" msgctxt "@info:credit" msgid "David Faure" msgstr "David Faure" #: kbuildsycoca/kbuildsycoca_main.cpp:62 kbuildsycoca/kbuildsycoca_main.cpp:65 -#, fuzzy -#| msgid "Author" msgctxt "@info:credit" msgid "Author" msgstr "Συγγραφέας" #: kbuildsycoca/kbuildsycoca_main.cpp:64 -#, fuzzy -#| msgid "Waldo Bastian" msgctxt "@info:credit" msgid "Waldo Bastian" msgstr "Waldo Bastian" #: kbuildsycoca/kbuildsycoca_main.cpp:75 -#, fuzzy -#| msgid "Disable checking files (dangerous)" msgctxt "@info:shell command-line option" msgid "" "Do not signal applications to update (deprecated, no longer having any " "effect)" -msgstr "Απενεργοποίηση ελέγχου αρχείων (επικίνδυνο)" +msgstr "" +"Να μη στέλνεται σήμα στις εφαρμογές για ενημέρωση (απαρχαιωμένο, δεν έχει " +"κανένα αποτέλεσμα πλέον)" #: kbuildsycoca/kbuildsycoca_main.cpp:78 -#, fuzzy -#| msgid "Disable incremental update, re-read everything" msgctxt "@info:shell command-line option" msgid "Disable incremental update, re-read everything" msgstr "" @@ -101,31 +88,27 @@ msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" msgstr "" +"Έλεγχος των χρονικών στιγμιοτύπων των αρχείων (απαρχαιωμένο, δεν έχει κανένα " +"αποτέλεσμα πλέον)" #: kbuildsycoca/kbuildsycoca_main.cpp:84 -#, fuzzy -#| msgid "Disable checking files (dangerous)" msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" -msgstr "Απενεργοποίηση ελέγχου αρχείων (επικίνδυνο)" +msgstr "" +"Απενεργοποίηση ελέγχου αρχείων (απαρχαιωμένο, δεν έχει κανένα αποτέλεσμα " +"πλέον)" #: kbuildsycoca/kbuildsycoca_main.cpp:87 -#, fuzzy -#| msgid "Create global database" msgctxt "@info:shell command-line option" msgid "Create global database" msgstr "Δημιουργία καθολικής βάσης δεδομένων" #: kbuildsycoca/kbuildsycoca_main.cpp:90 -#, fuzzy -#| msgid "Perform menu generation test run only" msgctxt "@info:shell command-line option" msgid "Perform menu generation test run only" msgstr "Εκτέλεση μόνο δοκιμής δημιουργίας μενού" #: kbuildsycoca/kbuildsycoca_main.cpp:93 -#, fuzzy -#| msgid "Track menu id for debug purposes" msgctxt "@info:shell command-line option" msgid "Track menu id for debug purposes" msgstr "Ανίχνευση id του μενού για χρήση σε αποσφαλμάτωση" @@ -134,6 +117,8 @@ msgctxt "@info:shell command-line option" msgid "Switch QStandardPaths to test mode, for unit tests only" msgstr "" +"Εναλλαγή των QStandardPaths σε λειτουργία δοκιμής, μόνο για τους ελέγχους " +"του προγραμματιστή" #: kdeinit/ktoolinvocation.cpp:66 msgid "Function must be called from the main thread." @@ -208,7 +193,7 @@ #: plugin/kdbusservicestarter.cpp:77 #, kde-format msgid "No service implementing %1" -msgstr "" +msgstr "Καμιά υπηρεσία που να υλοποιεί το %1" #: services/kservice.cpp:1012 msgid "The provided service is not valid" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/po/gd/kservice5.po new/kservice-5.16.0/po/gd/kservice5.po --- old/kservice-5.15.0/po/gd/kservice5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kservice-5.16.0/po/gd/kservice5.po 2015-11-08 13:35:05.000000000 +0100 @@ -0,0 +1,192 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# GunChleoc <[email protected]>, 2015. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2015-09-19 08:55+0000\n" +"PO-Revision-Date: 2015-11-04 15:15+0000\n" +"Last-Translator: Michael Bauer <[email protected]>\n" +"Language-Team: Fòram na Gàidhlig\n" +"Language: gd\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " +"(n > 2 && n < 20) ? 2 : 3;\n" +"X-Generator: Poedit 1.8.4\n" +"X-Project-Style: kde\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "GunChleoc" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "[email protected]" + +#: kbuildsycoca/kbuildsycoca_main.cpp:56 +msgctxt "application name" +msgid "KBuildSycoca" +msgstr "KBuildSycoca" + +#: kbuildsycoca/kbuildsycoca_main.cpp:58 +msgctxt "application description" +msgid "Rebuilds the system configuration cache." +msgstr "Togaidh seo tasgadan rèiteachadh an t-siostaim às ùr." + +#: kbuildsycoca/kbuildsycoca_main.cpp:60 +msgctxt "@info:credit" +msgid "Copyright 1999-2014 KDE Developers" +msgstr "Còir-lethbhreac 1999-2014 KDE Developers" + +#: kbuildsycoca/kbuildsycoca_main.cpp:61 +msgctxt "@info:credit" +msgid "David Faure" +msgstr "David Faure" + +#: kbuildsycoca/kbuildsycoca_main.cpp:62 kbuildsycoca/kbuildsycoca_main.cpp:65 +msgctxt "@info:credit" +msgid "Author" +msgstr "Ùghdar" + +#: kbuildsycoca/kbuildsycoca_main.cpp:64 +msgctxt "@info:credit" +msgid "Waldo Bastian" +msgstr "Waldo Bastian" + +#: kbuildsycoca/kbuildsycoca_main.cpp:75 +msgctxt "@info:shell command-line option" +msgid "" +"Do not signal applications to update (deprecated, no longer having any " +"effect)" +msgstr "" +"Na cuir siognail dha na h-aplacaidean gun ùraich iad (cha mholar seo " +"tuilleadh is cha dèan e dad)" + +#: kbuildsycoca/kbuildsycoca_main.cpp:78 +msgctxt "@info:shell command-line option" +msgid "Disable incremental update, re-read everything" +msgstr "Cuir an ùrachadh ioncramaideach à comas, leugh a h-uile rud às ùr" + +#: kbuildsycoca/kbuildsycoca_main.cpp:81 +msgctxt "@info:shell command-line option" +msgid "Check file timestamps (deprecated, no longer having any effect)" +msgstr "" +"Dearbhaich stampaichean-tìde nam faidhlichean (cha mholar seo tuilleadh is " +"cha dèan e dad)" + +#: kbuildsycoca/kbuildsycoca_main.cpp:84 +msgctxt "@info:shell command-line option" +msgid "Disable checking files (deprecated, no longer having any effect)" +msgstr "" +"Cuir dearbhadh nam faidhlichean à comas (cha mholar seo tuilleadh is cha " +"dèan e dad)" + +#: kbuildsycoca/kbuildsycoca_main.cpp:87 +msgctxt "@info:shell command-line option" +msgid "Create global database" +msgstr "Cruthaich stòr-dàta uile-choitcheann" + +#: kbuildsycoca/kbuildsycoca_main.cpp:90 +msgctxt "@info:shell command-line option" +msgid "Perform menu generation test run only" +msgstr "Na ruith ach deuchainn air gintinn nan clàran-taice" + +#: kbuildsycoca/kbuildsycoca_main.cpp:93 +msgctxt "@info:shell command-line option" +msgid "Track menu id for debug purposes" +msgstr "Tracaich aithnichear a' chlàir-thaice a chum dì-bhugaidh" + +#: kbuildsycoca/kbuildsycoca_main.cpp:97 +msgctxt "@info:shell command-line option" +msgid "Switch QStandardPaths to test mode, for unit tests only" +msgstr "" +"Atharraich QStandardPaths gun mhodh deuchainn, airson unit tests a-mhàin" + +#: kdeinit/ktoolinvocation.cpp:66 +msgid "Function must be called from the main thread." +msgstr "Feumaidh am foincsean a ghairm on phrìomh thread." + +#: kdeinit/ktoolinvocation.cpp:103 +#, kde-format +msgid "" +"Error launching %1. Either KLauncher is not running anymore, or it failed to " +"start the application." +msgstr "" +"Mearachd a' tòiseachadh %1. Chan eil KLauncher a' ruith tuilleadh no cha " +"deach leis an aplacaid a thòiseachadh." + +#: kdeinit/ktoolinvocation.cpp:106 +#, kde-format +msgid "" +"KLauncher could not be reached via D-Bus. Error when calling %1:\n" +"%2\n" +msgstr "" +"Cha deach leinn KLauncher a ruigsinn slighe D-Bus. Mearachd a' gairm %1:\n" +"%2\n" + +#: kdeinit/ktoolinvocation_x11.cpp:251 +#, kde-format +msgid "" +"Could not launch the mail client:\n" +"\n" +"%1" +msgstr "" +"Cha deach leinn cliant a' phuist a thòiseachadh:\n" +"\n" +"%1" + +#: kdeinit/ktoolinvocation_x11.cpp:252 +msgid "Could not launch Mail Client" +msgstr "Cha deach leinn cliant a' phuist a thòiseachadh" + +#: kdeinit/ktoolinvocation_x11.cpp:301 kdeinit/ktoolinvocation_x11.cpp:326 +#: kdeinit/ktoolinvocation_x11.cpp:345 +#, kde-format +msgid "" +"Could not launch the browser:\n" +"\n" +"%1" +msgstr "" +"Cha deach leinn am brabhsair a thòiseachadh:\n" +"\n" +"%1" + +#: kdeinit/ktoolinvocation_x11.cpp:302 kdeinit/ktoolinvocation_x11.cpp:327 +#: kdeinit/ktoolinvocation_x11.cpp:346 +msgid "Could not launch Browser" +msgstr "Cha deach leinn am brabhsair a thòiseachadh" + +#: kdeinit/ktoolinvocation_x11.cpp:385 +#, kde-format +msgid "" +"Could not launch the terminal client:\n" +"\n" +"%1" +msgstr "" +"Cha deach leinn cliant an tèirmineil a thòiseachadh:\n" +"\n" +"%1" + +#: kdeinit/ktoolinvocation_x11.cpp:386 +msgid "Could not launch Terminal Client" +msgstr "Cha deach leinn cliant an tèirmineil a thòiseachadh" + +#: plugin/kdbusservicestarter.cpp:77 +#, kde-format +msgid "No service implementing %1" +msgstr "Chan eil seirbheis sam bith a' toirt %1 gu buil" + +#: services/kservice.cpp:1012 +msgid "The provided service is not valid" +msgstr "Chan eil an t-seirbheis a chaidh a shònrachadh dligheach" + +#: services/kservice.cpp:1016 +#, kde-format +msgid "The service '%1' provides no library or the Library key is missing" +msgstr "" +"Chan eil an t-seirbheis \"%1\" a' solar leabharlann no tha iuchair an " +"leabharlainn a dhìth" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/po/gl/kservice5.po new/kservice-5.16.0/po/gl/kservice5.po --- old/kservice-5.15.0/po/gl/kservice5.po 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/po/gl/kservice5.po 2015-11-08 13:35:05.000000000 +0100 @@ -9,20 +9,22 @@ # Marce Villarino <[email protected]>, 2009, 2010, 2011, 2012. # Xosé <[email protected]>, 2010. # Marce Villarino <[email protected]>, 2011, 2012, 2013, 2014. +# Adrián Chaves Fernández (Gallaecio) <[email protected]>, 2015. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-09-19 08:55+0000\n" -"PO-Revision-Date: 2014-05-13 22:40+0200\n" -"Last-Translator: Marce Villarino <[email protected]>\n" +"PO-Revision-Date: 2015-11-07 11:15+0100\n" +"Last-Translator: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail." +"com>\n" "Language-Team: Galician <[email protected]>\n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "X-Environment: kde, development\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -66,14 +68,13 @@ msgstr "Waldo Bastian" #: kbuildsycoca/kbuildsycoca_main.cpp:75 -#, fuzzy -#| msgctxt "@info:shell command-line option" -#| msgid "Disable checking files (dangerous)" msgctxt "@info:shell command-line option" msgid "" "Do not signal applications to update (deprecated, no longer having any " "effect)" -msgstr "Desactivar a comprobación dos ficheiros (perigoso)" +msgstr "" +"Non enviar sinais ás aplicacións para que se actualicen (obsoleto, non " +"funciona)." #: kbuildsycoca/kbuildsycoca_main.cpp:78 msgctxt "@info:shell command-line option" @@ -83,15 +84,12 @@ #: kbuildsycoca/kbuildsycoca_main.cpp:81 msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" -msgstr "" +msgstr "Comprobar os selos de tempo dos ficheiros (obsoleto, non funciona)." #: kbuildsycoca/kbuildsycoca_main.cpp:84 -#, fuzzy -#| msgctxt "@info:shell command-line option" -#| msgid "Disable checking files (dangerous)" msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" -msgstr "Desactivar a comprobación dos ficheiros (perigoso)" +msgstr "Desactivar a comprobación dos ficheiros (obsoleto, non funciona)." #: kbuildsycoca/kbuildsycoca_main.cpp:87 msgctxt "@info:shell command-line option" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/po/ko/kservice5.po new/kservice-5.16.0/po/ko/kservice5.po --- old/kservice-5.15.0/po/ko/kservice5.po 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/po/ko/kservice5.po 2015-11-08 13:35:05.000000000 +0100 @@ -9,15 +9,15 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-09-19 08:55+0000\n" -"PO-Revision-Date: 2015-06-27 12:02+0200\n" -"Last-Translator: Shinjo Park <[email protected]>\n" +"PO-Revision-Date: 2015-11-07 00:18+0100\n" +"Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -58,14 +58,11 @@ msgstr "Waldo Bastian" #: kbuildsycoca/kbuildsycoca_main.cpp:75 -#, fuzzy -#| msgctxt "@info:shell command-line option" -#| msgid "Disable checking files (dangerous)" msgctxt "@info:shell command-line option" msgid "" "Do not signal applications to update (deprecated, no longer having any " "effect)" -msgstr "파일을 확인하지 않기 (위험)" +msgstr "프로그램에 업데이트 신호 보내지 않기(더 이상 사용하지 않음)" #: kbuildsycoca/kbuildsycoca_main.cpp:78 msgctxt "@info:shell command-line option" @@ -75,15 +72,12 @@ #: kbuildsycoca/kbuildsycoca_main.cpp:81 msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" -msgstr "" +msgstr "파일 시간 확인하기(더 이상 사용하지 않음)" #: kbuildsycoca/kbuildsycoca_main.cpp:84 -#, fuzzy -#| msgctxt "@info:shell command-line option" -#| msgid "Disable checking files (dangerous)" msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" -msgstr "파일을 확인하지 않기 (위험)" +msgstr "파일을 확인하지 않기(더 이상 사용하지 않음)" #: kbuildsycoca/kbuildsycoca_main.cpp:87 msgctxt "@info:shell command-line option" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/po/sk/kservice5.po new/kservice-5.16.0/po/sk/kservice5.po --- old/kservice-5.15.0/po/sk/kservice5.po 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/po/sk/kservice5.po 2015-11-08 13:35:05.000000000 +0100 @@ -6,20 +6,20 @@ # Jakub <[email protected]>, 2009. # Michal Sulek <[email protected]>, 2009, 2010, 2011. # Richard Frič <[email protected]>, 2011. -# Roman Paholík <[email protected]>, 2012, 2013, 2014. +# Roman Paholík <[email protected]>, 2012, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-09-19 08:55+0000\n" -"PO-Revision-Date: 2014-04-02 21:22+0200\n" -"Last-Translator: Roman Paholík <[email protected]>\n" +"PO-Revision-Date: 2015-10-11 12:18+0100\n" +"Last-Translator: Roman Paholik <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" "Language: sk\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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" msgctxt "NAME OF TRANSLATORS" @@ -64,14 +64,12 @@ msgstr "Waldo Bastian" #: kbuildsycoca/kbuildsycoca_main.cpp:75 -#, fuzzy -#| msgctxt "@info:shell command-line option" -#| msgid "Disable checking files (dangerous)" msgctxt "@info:shell command-line option" msgid "" "Do not signal applications to update (deprecated, no longer having any " "effect)" -msgstr "Zakázať kontrolu súborov (nebezpečné)" +msgstr "" +"Nesignalizovať aktualizácie aplikácií (zastaralé, nemá to už žiadny efekt)" #: kbuildsycoca/kbuildsycoca_main.cpp:78 msgctxt "@info:shell command-line option" @@ -81,15 +79,12 @@ #: kbuildsycoca/kbuildsycoca_main.cpp:81 msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" -msgstr "" +msgstr "Kontrolovať časové pečiatky (zastaralé, nemá to už žiadny efekt)" #: kbuildsycoca/kbuildsycoca_main.cpp:84 -#, fuzzy -#| msgctxt "@info:shell command-line option" -#| msgid "Disable checking files (dangerous)" msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" -msgstr "Zakázať kontrolu súborov (nebezpečné)" +msgstr "Zakázať kontrolu súborov (zastaralé, nemá to už žiadny efekt)" #: kbuildsycoca/kbuildsycoca_main.cpp:87 msgctxt "@info:shell command-line option" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/src/services/kplugininfo.cpp new/kservice-5.16.0/src/services/kplugininfo.cpp --- old/kservice-5.15.0/src/services/kplugininfo.cpp 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/src/services/kplugininfo.cpp 2015-11-08 13:35:05.000000000 +0100 @@ -24,6 +24,7 @@ #include <QDebug> #include <QDirIterator> #include <QJsonArray> +#include <QMimeDatabase> #include <QStandardPaths> #include "ksycoca.h" @@ -66,6 +67,7 @@ GlobalQStringLiteral(s_dependenciesKey, "X-KDE-PluginInfo-Depends") GlobalQStringLiteral(s_serviceTypesKey, "ServiceTypes") GlobalQStringLiteral(s_xKDEServiceTypes, "X-KDE-ServiceTypes") +GlobalQStringLiteral(s_mimeTypeKey, "MimeType") GlobalQStringLiteral(s_formFactorsKey, "X-KDE-FormFactors") GlobalQStringLiteral(s_enabledbyDefaultKey, "X-KDE-PluginInfo-EnabledByDefault") GlobalQStringLiteral(s_enabledKey, "Enabled") @@ -82,6 +84,7 @@ GlobalQStringLiteral(s_jsonIdKey, "Id") GlobalQStringLiteral(s_jsonVersionKey, "Version") GlobalQStringLiteral(s_jsonWebsiteKey, "Website") +GlobalQStringLiteral(s_jsonMimeTypesKey, "MimeTypes") GlobalQStringLiteral(s_jsonKPluginKey, "KPlugin") } @@ -95,7 +98,7 @@ , kcmservicesCached(false) {} - QStringList deserializeList(const QString &data); + static QStringList deserializeList(const QString &data); bool hidden : 1; @@ -188,6 +191,16 @@ kplugin[s_jsonFormFactorsKey()] = QJsonArray::fromStringList(formFactors); kplugin[s_serviceTypesKey()] = QJsonArray::fromStringList(serviceTypes); kplugin[s_jsonDependenciesKey()] = QJsonArray::fromStringList(dependencies); + QJsonValue mimeTypes = accessor(data, s_mimeTypeKey()); + if (mimeTypes.isString()) { + QStringList mimeList = KPluginInfoPrivate::deserializeList(mimeTypes.toString()); + if (!mimeList.isEmpty()) { + mimeTypes = QJsonArray::fromStringList(mimeList); + } else { + mimeTypes = QJsonValue(); + } + } + kplugin[s_jsonMimeTypesKey()] = mimeTypes; return kplugin; } @@ -312,6 +325,29 @@ json[key] = QJsonValue::fromVariant(v); } } + // reintroduce the separation between MimeType= and X-KDE-ServiceTypes= + // we could do this by modifying KService and KSyCoCa, but as this is only compatibility + // code we just query QMimeDatabase whether a ServiceType is a valid MIME type. + // TODO: should we also make sure invalid MimeType= entries end up in KPluginMetaData::mimeTypes()? + const QStringList services = service->serviceTypes(); + if (!services.isEmpty()) { + QMimeDatabase db; + QStringList mimeTypes; + mimeTypes.reserve(services.size()); + QStringList newServiceTypes; + newServiceTypes.reserve(services.size()); + foreach (const QString& s, services) { + if (db.mimeTypeForName(s).isValid()) { + mimeTypes << s; + } else { + newServiceTypes << s; + } + } + json[s_mimeTypeKey()] = QJsonArray::fromStringList(mimeTypes); + json[s_xKDEServiceTypes()] = QJsonArray::fromStringList(newServiceTypes); + json[s_serviceTypesKey()] = QJsonValue(); + } + d->setMetaData(KPluginMetaData(json, service->library(), service->entryPath()), false); if (!d->metaData.isValid()) { d.reset(); @@ -540,7 +576,8 @@ QStringList KPluginInfo::serviceTypes() const { KPLUGININFO_ISVALID_ASSERTION; - return d->metaData.serviceTypes(); + // KService/KPluginInfo include the MIME types in serviceTypes() + return d->metaData.serviceTypes() + d->metaData.mimeTypes(); } KService::Ptr KPluginInfo::service() const @@ -589,7 +626,7 @@ //special case if we want a stringlist: split values by ',' or ';' and construct the list if (t == QVariant::StringList) { if (result.canConvert<QString>()) { - result = d->deserializeList(result.toString()); + result = KPluginInfoPrivate::deserializeList(result.toString()); } else if (result.canConvert<QVariantList>()) { QVariantList list = result.toList(); QStringList newResult; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/src/services/kplugininfo.desktop new/kservice-5.16.0/src/services/kplugininfo.desktop --- old/kservice-5.15.0/src/services/kplugininfo.desktop 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/src/services/kplugininfo.desktop 2015-11-08 13:35:05.000000000 +0100 @@ -13,7 +13,7 @@ Name[br]=Titouroù al lugent KDE Name[bs]=Podaci o KDE priključku Name[ca]=Informació del connector del KDE -Name[ca@valencia]=Connector informatiu de KDE +Name[ca@valencia]=Informació del connector del KDE Name[cs]=Informace o modulech KDE Name[csb]=Wëdowiédzô ò pluginsach KDE Name[cy]=Gwybodaeth Ategynnau KDE @@ -42,7 +42,7 @@ Name[hy]=KDE հարմարանքի տեղեկություն Name[ia]=Information de Plugin de KDE Name[id]=Informasi Plugin KDE -Name[is]=KDE íforritsupplýsingar +Name[is]=KDE viðbótaupplýsingar Name[it]=Informazioni sulle estensioni di KDE Name[ja]=KDE プラグイン情報 Name[kk]=KDE плагин мәліметі diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/src/sycoca/kbuildsycoca.cpp new/kservice-5.16.0/src/sycoca/kbuildsycoca.cpp --- old/kservice-5.15.0/src/sycoca/kbuildsycoca.cpp 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/src/sycoca/kbuildsycoca.cpp 2015-11-08 13:35:05.000000000 +0100 @@ -197,7 +197,6 @@ } m_ctimeFactory = new KCTimeFactory(this); // This is a build factory too, don't delete!! - bool uptodate = true; for (QMap<QString, QByteArray>::ConstIterator it1 = allResourcesSubDirs.constBegin(); it1 != allResourcesSubDirs.constEnd(); ++it1) { @@ -255,18 +254,16 @@ } } if (m_changed || !m_allEntries) { - uptodate = false; - //qDebug() << "CHANGED:" << resource; + //qDebug() << "CHANGED:" << m_resource; m_changedResources.append(m_resource); } } - bool result = !uptodate || (m_ctimeDict && !m_ctimeDict->isEmpty()); if (m_ctimeDict && !m_ctimeDict->isEmpty()) { //qDebug() << "Still in time dict:"; //m_ctimeDict->dump(); // ## It seems entries filtered out by vfolder are still in there, - // so we end up always saving ksycoca, i.e. this method never returns false + // so on a real system we end up always adding "apps" to m_changedResources // Get the list of resources from which some files were deleted const QStringList resources = m_ctimeDict->remainingResourceList(); @@ -274,7 +271,9 @@ m_changedResources += resources; } - if (result || m_menuTest) { + bool result = true; + const bool createVFolder = !m_changedResources.isEmpty() || (m_ctimeDict && !m_ctimeDict->isEmpty()); + if (createVFolder || m_menuTest) { m_resource = "apps"; m_resourceSubdir = QStringLiteral("applications"); m_currentFactory = d->m_serviceFactory; @@ -309,7 +308,6 @@ } if (m_changed || !m_allEntries) { - uptodate = false; //qDebug() << "CHANGED:" << m_resource; m_changedResources.append(m_resource); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/src/sycoca/kmimeassociations.cpp new/kservice-5.16.0/src/sycoca/kmimeassociations.cpp --- old/kservice-5.15.0/src/sycoca/kmimeassociations.cpp 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/src/sycoca/kmimeassociations.cpp 2015-11-08 13:35:05.000000000 +0100 @@ -24,6 +24,7 @@ #include <kconfiggroup.h> #include <kconfig.h> #include <QDebug> +#include <QFile> #include <qstandardpaths.h> #include <qmimedatabase.h> @@ -47,15 +48,29 @@ */ -bool KMimeAssociations::parseAllMimeAppsList() +void KMimeAssociations::parseAllMimeAppsList() { - const QString MIMEAPPS_LIST=QStringLiteral("mimeapps.list"); - // Using the "merged view" from KConfig is not enough since we -add- at every level, we don't replace. - const QStringList mimeappsFiles = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, MIMEAPPS_LIST) - + QStandardPaths::locateAll(QStandardPaths::ApplicationsLocation, MIMEAPPS_LIST); - if (mimeappsFiles.isEmpty()) { - return false; + QStringList mimeappsFileNames; + // make the list of possible filenames from the spec ($desktop-mimeapps.list, then mimeapps.list) + const QString desktops = QString::fromLocal8Bit(qgetenv("XDG_CURRENT_DESKTOP")); + foreach (const QString &desktop, desktops.split(":", QString::SkipEmptyParts)) { + mimeappsFileNames.append(desktop.toLower() + QLatin1String("-mimeapps.list")); } + mimeappsFileNames.append(QStringLiteral("mimeapps.list")); + // list the dirs in the order of the spec (XDG_CONFIG_HOME, XDG_CONFIG_DIRS, XDG_DATA_HOME, XDG_DATA_DIRS) + const QStringList mimeappsDirs = QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation) + + QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); + QStringList mimeappsFiles; + // collect existing files + foreach (const QString &dir, mimeappsDirs) { + foreach (const QString &file, mimeappsFileNames) { + const QString filePath = dir + '/' + file; + if (QFile::exists(filePath)) { + mimeappsFiles.append(filePath); + } + } + } + //qDebug() << "FILE LIST:" << mimeappsFiles; int basePreference = 1000; // start high :) QListIterator<QString> mimeappsIter(mimeappsFiles); @@ -66,18 +81,23 @@ parseMimeAppsList(mimeappsFile, basePreference); basePreference += 50; } - return true; } void KMimeAssociations::parseMimeAppsList(const QString &file, int basePreference) { KConfig profile(file, KConfig::SimpleConfig); - parseAddedAssociations(KConfigGroup(&profile, "Added Associations"), file, basePreference); - parseRemovedAssociations(KConfigGroup(&profile, "Removed Associations"), file); + if (file.endsWith("/mimeapps.list")) { // not for $desktop-mimeapps.list + parseAddedAssociations(KConfigGroup(&profile, "Added Associations"), file, basePreference); + parseRemovedAssociations(KConfigGroup(&profile, "Removed Associations"), file); + + // KDE extension for parts and plugins, see settings/filetypes/mimetypedata.cpp + parseAddedAssociations(KConfigGroup(&profile, "Added KDE Service Associations"), file, basePreference); + parseRemovedAssociations(KConfigGroup(&profile, "Removed KDE Service Associations"), file); + } - // KDE extension for parts and plugins, see settings/filetypes/mimetypedata.cpp - parseAddedAssociations(KConfigGroup(&profile, "Added KDE Service Associations"), file, basePreference); - parseRemovedAssociations(KConfigGroup(&profile, "Removed KDE Service Associations"), file); + // TODO "Default Applications" is a separate query and a separate algorithm, says the spec. + // For now this is better than nothing though. + parseAddedAssociations(KConfigGroup(&profile, "Default Applications"), file, basePreference); } void KMimeAssociations::parseAddedAssociations(const KConfigGroup &group, const QString &file, int basePreference) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/src/sycoca/kmimeassociations_p.h new/kservice-5.16.0/src/sycoca/kmimeassociations_p.h --- old/kservice-5.15.0/src/sycoca/kmimeassociations_p.h 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/src/sycoca/kmimeassociations_p.h 2015-11-08 13:35:05.000000000 +0100 @@ -66,7 +66,7 @@ explicit KMimeAssociations(KOfferHash &offerHash, KServiceFactory *serviceFactory); // Read mimeapps.list files - bool parseAllMimeAppsList(); + void parseAllMimeAppsList(); void parseMimeAppsList(const QString &file, int basePreference); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.15.0/src/sycoca/ksycoca.cpp new/kservice-5.16.0/src/sycoca/ksycoca.cpp --- old/kservice-5.15.0/src/sycoca/ksycoca.cpp 2015-10-06 23:43:04.000000000 +0200 +++ new/kservice-5.16.0/src/sycoca/ksycoca.cpp 2015-11-08 13:35:05.000000000 +0100 @@ -635,7 +635,7 @@ if (mtime > m_now) { qCDebug(SYCOCA) << fi.filePath() << "has a modification time in the future" << mtime; } - qCDebug(SYCOCA) << "timestamp changed:" << fi.filePath() << mtime << ">" << lastStamp; + qCDebug(SYCOCA) << "timestamp changed:" << fi.filePath() << mtime << ">" << QDateTime::fromMSecsSinceEpoch(lastStamp); // no need to continue search return false; }
