Request 759 - SailfishOS Open Build Service

Overview

Request 759 (accepted)

Update to KDE Frameworks 5.6.0

Created by sebas over 9 years ago
In state accepted

Submit kactivities

Submit package home:sebas:br...el:frameworks / kactivities to package home:plfiorin...el:frameworks / kactivities

[-] [+]	Changed	kactivities.spec
@@ -4,13 +4,12 @@ # Name: kactivities -VCS: git@github.com:maui-packages/kactivities#8852defe80bd8b72fc055417f254aa8f58abf28c # >> macros # << macros Summary: A KDE Frameworks 5 Tier 3 runtime and library to organize activities -Version: 5.3.0 +Version: 5.6.0 Release: 2 Group: System/Base License: GPLv2+
[-] [+]	Deleted	kactivities-5.3.0.tar.xz/src/service/plugins/sqlite/Rankings.cpp ^
@@ -1,127 +0,0 @@ -/* - * Copyright (C) 2011, 2012 Ivan Cukic ivan.cukic(at)kde.org - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - / - -// Self -#include "Rankings.h" - -// STL -#include <algorithm> - -// Qt -#include <QDBusConnection> -#include <QVariantList> -#include <QSqlQuery> - -// KDE -#include <kdbusconnectionpool.h> - -// Utils -#include <utils/range.h> -#include <utils/remove_if.h> -#include <utils/qsqlquery.h> - -// Local -#include "Debug.h" -#include "ResourceScoreCache.h" -#include "Database.h" -#include "StatsPlugin.h" -#include "rankingsadaptor.h" - - -#define clientInterface(dbusPath) \ - QDBusInterface(dbusPath, QStringLiteral("/RankingsClient"), \ - QStringLiteral("org.kde.ActivityManager.RankingsClient")) - -Rankings Rankings::self() -{ - static Rankings instance; - return &instance; -} - -Rankings::Rankings() -{ - new RankingsAdaptor(this); - KDBusConnectionPool::threadConnection().registerObject( - QStringLiteral("/Rankings"), this); -} - -Rankings::~Rankings() -{ -} - -void Rankings::registerClient(const QString &client, const QString &requestId, - const QString &activity, - const QString &application) -{ - m_clients.insert(ClientPattern(client, requestId, activity, application)); - - static const auto query = QStringLiteral( - "SELECT targettedResource, cachedScore " - "FROM kext_ResourceScoreCache " // this should be kao_ResourceScoreCache, but lets leave it - "WHERE %1 AND %2 " - "AND cachedScore > 0 " - "ORDER BY cachedScore DESC LIMIT 30"); - - static const auto usedActivity = QStringLiteral("usedActivity = '%1'"); - static const auto initiatingAgent = QStringLiteral("initiatingAgent = '%1'"); - - auto results = Database::self()->exec( - query.arg(activity.isEmpty() ? QStringLiteral("1") - : usedActivity.arg(activity)) - .arg(application.isEmpty() ? QStringLiteral("1") - : initiatingAgent.arg(application))); - - QHash<QString, QVariant> update; - - for (const auto &result: results) { - const auto url = result[0].toString(); - const auto score = result[1].toReal(); - - update[url] = score; - } - - clientInterface(client).asyncCall(QStringLiteral("updated"), requestId, - QStringLiteral("replace"), - QVariant(update)); -} - -void Rankings::deregisterClient(const QString &client, const QString &requestId) -{ - m_clients.erase(ClientPattern(client, requestId)); -} - -void Rankings::resourceScoreUpdated(const QString &activity, - const QString &application, - const QString &resource, qreal score) -{ - using namespace kamd::utils; - - Q_UNUSED(application); - - QHash<QString, QVariant> update; - - update[resource] = score; - - for (const auto &client : - m_clients \| filtered(ClientPattern::matches, activity, application) - ) { - clientInterface(client.dbusPath) - .asyncCall(QStringLiteral("updated"), client.requestId, - QStringLiteral("incremental"), QVariant(update)); - } -} -
[-] [+]	Deleted	kactivities-5.3.0.tar.xz/src/service/plugins/sqlite/Rankings.h ^
@@ -1,123 +0,0 @@ -/* - * Copyright (C) 2011, 2012 Ivan Cukic <ivan.cukic@kde.org> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - / - -#ifndef PLUGINS_SQLITE_RANKINGS_H -#define PLUGINS_SQLITE_RANKINGS_H - -// Qt -#include <QHash> -#include <QObject> -#include <QString> -#include <QStringList> -#include <QThread> -#include <QDBusInterface> - -// Boost -#include <boost/container/flat_set.hpp> - - -class Rankings : public QObject { - Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.kde.ActivityManager.Rankings") - -public: - static Rankings self(); - - void resourceScoreUpdated(const QString &activity, - const QString &application, - const QString &resource, qreal score); - - ~Rankings(); - -public Q_SLOTS: - /** - * Registers a new client for the specified activity and application - * @param dbusPath d-bus name - * @param requestId applications can have interest in different items - * @param activity activity to track. If empty, all activities are - * aggregated - * @param application application to track. If empty, all applications are - * aggregated - / - void registerClient(const QString &dbusPath, - const QString &requestId, - const QString &activity = QString(), - const QString &application = QString()); - - /* - * Deregisters a dbusPath - / - void deregisterClient(const QString &dbusPath, - const QString &requestId); - -private: - Rankings(); - - static Rankings s_instance; - - struct ResultItem { - QString uri; - qreal score; - }; - - struct ClientPattern { - ClientPattern(const QString &dbusPath, const QString &requestId, - const QString &activity = QString(), - const QString &application = QString()) - : dbusPath(dbusPath) - , requestId(requestId) - , activity(activity) - , application(application) - { - } - - QString dbusPath; - QString requestId; - QString activity; - QString application; - - bool operator<(const ClientPattern &other) const - { - return dbusPath < other.dbusPath \|\| - (dbusPath == other.dbusPath && requestId < other.requestId); - } - - bool operator==(const ClientPattern &other) const - { - return dbusPath == other.dbusPath && requestId == other.requestId; - } - - static inline bool matches(const QString &activity, - const QString &application, - const ClientPattern &dbusPath) - { - return - ( - dbusPath.activity.isEmpty() \|\| - activity == dbusPath.activity - ) && ( - dbusPath.application.isEmpty() \|\| - application == dbusPath.application - ); - } - }; - -private: - boost::container::flat_set<ClientPattern> m_clients; -}; - -#endif // PLUGINS_SQLITE_RANKINGS_H
[-] [+]	Deleted	kactivities-5.3.0.tar.xz/src/service/plugins/sqlite/org.kde.ActivityManager.Rankings.xml ^
@@ -1,24 +0,0 @@ -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> -<node> - <interface name="org.kde.ActivityManager.Rankings"> - <method name="registerClient"> - <arg name="dbusPath" type="s" direction="in"/> - <arg name="requestId" type="s" direction="in"/> - <arg name="activity" type="s" direction="in"/> - <arg name="application" type="s" direction="in"/> - </method> - <method name="registerClient"> - <arg name="dbusPath" type="s" direction="in"/> - <arg name="requestId" type="s" direction="in"/> - <arg name="activity" type="s" direction="in"/> - </method> - <method name="registerClient"> - <arg name="dbusPath" type="s" direction="in"/> - <arg name="requestId" type="s" direction="in"/> - </method> - <method name="deregisterClient"> - <arg name="dbusPath" type="s" direction="in"/> - <arg name="requestId" type="s" direction="in"/> - </method> - </interface> -</node>
[-] [+]	Deleted	kactivities-5.3.0.tar.xz/src/service/plugins/sqlite/org.kde.ActivityManager.RankingsClient.xml ^
@@ -1,11 +0,0 @@ -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> -<node> - <interface name="org.kde.ActivityManager.RankingsClient"> - <method name="updated"> - <arg name="requestId" type="s" direction="in"/> - <arg name="action" type="s" direction="in"/> - <arg name="data" type="a{sv}" direction="in"/> - <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QVariantMap"/> - </method> - </interface> -</node>
[-] [+]	Deleted	kactivities-5.3.0.tar.xz/src/service/plugins/sqlite/org.kde.ActivityManager.Resources.Scoring.xml ^
@@ -1,20 +0,0 @@ -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> -<node> - <interface name="org.kde.ActivityManager.Resources.Scoring"> - <signal name="resourceScoreUpdated"> - <arg name="activity" type="s" direction="out"/> - <arg name="client" type="s" direction="out"/> - <arg name="resource" type="s" direction="out"/> - <arg name="score" type="d" direction="out"/> - </signal> - <method name="deleteRecentStats"> - <arg name="activity" type="s" direction="in"/> - <arg name="count" type="i" direction="in"/> - <arg name="what" type="s" direction="in"/> - </method> - <method name="deleteEarlierStats"> - <arg name="activity" type="s" direction="in"/> - <arg name="months" type="i" direction="in"/> - </method> - </interface> -</node>
[-] [+]	Changed	kactivities-5.6.0.tar.xz/CMakeLists.txt ^
@@ -15,7 +15,7 @@ endif () # Extra CMake stuff -find_package (ECM 1.3.0 REQUIRED NO_MODULE) +find_package (ECM 1.6.0 REQUIRED NO_MODULE) set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(KDEInstallDirs) @@ -29,8 +29,8 @@ find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus) # KDE Frameworks -set(KF5_VERSION "5.3.0") # handled by release scripts -set(KF5_DEP_VERSION "5.3.0") # handled by release scripts +set(KF5_VERSION "5.6.0") # handled by release scripts +set(KF5_DEP_VERSION "5.6.0") # handled by release scripts find_package (KF5DBusAddons ${KF5_DEP_VERSION} CONFIG REQUIRED) find_package (KF5I18n ${KF5_DEP_VERSION} CONFIG REQUIRED)
[-] [+]	Changed	kactivities-5.6.0.tar.xz/po/ca/kactivities5.po ^
@@ -4,14 +4,14 @@ # version 3 or later versions approved by the membership of KDE e.V. # # Josep Ma. Ferrer <txemaq@gmail.com>, 2014. -# Antoni Bella Pérez <antonibella5@orange.es>, 2014. +# Antoni Bella Pérez <antonibella5@yahoo.com>, 2014. msgid "" msgstr "" "Project-Id-Version: kactivities5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-09-24 07:44+0000\n" "PO-Revision-Date: 2014-08-18 23:43+0200\n" -"Last-Translator: Antoni Bella Pérez <antonibella5@orange.es>\n" +"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n" "Language-Team: Catalan <kde-i18n-ca@kde.org>\n" "Language: ca\n" "MIME-Version: 1.0\n"
[-] [+]	Changed	kactivities-5.6.0.tar.xz/po/da/kactivities5.po ^
@@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Martin Schlander <mschlander@opensuse.org>, 2012, 2013. +# Martin Schlander <mschlander@opensuse.org>, 2012, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-09-24 07:44+0000\n" -"PO-Revision-Date: 2013-06-30 13:12+0200\n" +"PO-Revision-Date: 2014-12-29 20:01+0100\n" "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n" "Language-Team: Danish <kde-i18n-doc@kde.org>\n" "Language: da\n" @@ -26,15 +26,13 @@ msgstr "mschlander@opensuse.org" #: imports/activitymodel.cpp:592 -#, fuzzy -#\| msgid "Activities..." msgctxt "Header title for activity data model" msgid "Activity" -msgstr "Aktiviteter..." +msgstr "Aktivitet" #: service/Activities.cpp:139 msgid "Default" -msgstr "" +msgstr "Standard" #: service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp:84 #: service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp:119 @@ -45,20 +43,16 @@ #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:111 #: workspace/kio/KioActivities.cpp:304 -#, fuzzy -#\| msgid "Activities..." msgid "Activities" -msgstr "Aktiviteter..." +msgstr "Aktiviteter" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:114 msgid "Loading..." -msgstr "" +msgstr "Indlæser..." #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:141 -#, fuzzy -#\| msgid "Activity manager is not running properly." msgid "The Activity Manager is not running" -msgstr "Aktivitetshåndteringen kører ikke korrekt." +msgstr "Aktivitetshåndteringen kører ikke" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:185 #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:252 @@ -81,16 +75,12 @@ msgstr "Afkobl fra:" #: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 -#, fuzzy -#\| msgid "Activities..." msgid "Activity" -msgstr "Aktiviteter..." +msgstr "Aktivitet" #: workspace/kio/KioActivities.cpp:228 -#, fuzzy -#\| msgid "Link to the current activity" msgid "Current activity" -msgstr "Kobl til den aktuelle aktivitet" +msgstr "Aktuel aktivitet" #: workspace/settings/MainConfigurationWidget.cpp:80 msgid "Available Features" @@ -125,8 +115,8 @@ msgctxt "unit of time. months to keep the history" msgid " month" msgid_plural " months" -msgstr[0] "" -msgstr[1] "" +msgstr[0] " måned" +msgstr[1] " måneder" #: workspace/settings/MainConfigurationWidget.cpp:260 msgctxt "for in 'keep history for 5 months'" @@ -150,24 +140,18 @@ #. i18n: ectx: property (text), widget (QRadioButton, radioRememberAllApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:45 -#, fuzzy -#\| msgid "For all applications" msgid "For a&ll applications" -msgstr "For alle programmer" +msgstr "For a&lle programmer" #. i18n: ectx: property (text), widget (QRadioButton, radioDontRememberApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:55 -#, fuzzy -#\| msgid "Do not remember" msgid "&Do not remember" -msgstr "Husk ikke" +msgstr "Husk &ikke" #. i18n: ectx: property (text), widget (QRadioButton, radioRememberSpecificApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:62 -#, fuzzy -#\| msgid "Only for specific applications" msgid "O&nly for specific applications" -msgstr "Kun for visse programmer" +msgstr "Ku&n for visse programmer" #. i18n: ectx: property (text), widget (QLabel, labelKeepHistory) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:90
[-] [+]	Added	kactivities-5.6.0.tar.xz/po/gd ^
+(directory)
[-] [+]	Added	kactivities-5.6.0.tar.xz/po/gd/kactivities5.po ^
@@ -0,0 +1,173 @@ +# 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 <fios@foramnagaidhlig.net>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: kactivities5\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-09-24 07:44+0000\n" +"PO-Revision-Date: 2014-11-24 18:43+0100\n" +"Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\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: Virtaal 0.7.1\n" +"X-Project-Style: kde\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "GunChleoc" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "fios@foramnagaidhlig.net" + +#: imports/activitymodel.cpp:592 +msgctxt "Header title for activity data model" +msgid "Activity" +msgstr "Gnìomhachd" + +#: service/Activities.cpp:139 +msgid "Default" +msgstr "Thùsail" + +#: service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp:84 +#: service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp:119 +#, kde-format +msgctxt "@action" +msgid "Switch to activity \"%1\"" +msgstr "Gearr leum dhan ghnìomhachd \"%1\"" + +#: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:111 +#: workspace/kio/KioActivities.cpp:304 +msgid "Activities" +msgstr "Gnìomhachdan" + +#: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:114 +msgid "Loading..." +msgstr "'Ga luchdadh..." + +#: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:141 +msgid "The Activity Manager is not running" +msgstr "Chan eil manaidsear nan gnìomhachdan 'ga ruith" + +#: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:185 +#: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:252 +msgid "Link to the current activity" +msgstr "Dèan ceangal dhan ghnìomhachd làithreach" + +#: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:188 +#: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:257 +msgid "Unlink from the current activity" +msgstr "Dì-cheangail on ghnìomhachd làithreach" + +#: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:191 +#: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:261 +msgid "Link to:" +msgstr "Ceangail gu:" + +#: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:196 +#: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:269 +msgid "Unlink from:" +msgstr "Dì-cheangail o:" + +#: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 +msgid "Activity" +msgstr "Gnìomhachd" + +#: workspace/kio/KioActivities.cpp:228 +msgid "Current activity" +msgstr "A' ghnìomhachd lèithreach" + +#: workspace/settings/MainConfigurationWidget.cpp:80 +msgid "Available Features" +msgstr "Feartan a tha ri làimh" + +#: workspace/settings/MainConfigurationWidget.cpp:82 +msgid "Plugins" +msgstr "Plugain" + +#: workspace/settings/MainConfigurationWidget.cpp:87 +msgctxt "unlimited number of months" +msgid "forever" +msgstr "gu buan" + +#: workspace/settings/MainConfigurationWidget.cpp:99 +msgid "Forget the last hour" +msgstr "Dìochuimhnich an uair mu dheireadh" + +#: workspace/settings/MainConfigurationWidget.cpp:102 +msgid "Forget the last two hours" +msgstr "Dìochuimhnich an dà uair mu dheireadh" + +#: workspace/settings/MainConfigurationWidget.cpp:105 +msgid "Forget a day" +msgstr "Dìochuimhnich latha" + +#: workspace/settings/MainConfigurationWidget.cpp:108 +msgid "Forget everything" +msgstr "Dìochuimhnich a h-uile rus" + +#: workspace/settings/MainConfigurationWidget.cpp:257 +msgctxt "unit of time. months to keep the history" +msgid " month" +msgid_plural " months" +msgstr[0] " mìos" +msgstr[1] " mhìos" +msgstr[2] " mìosan" +msgstr[3] " mìos" + +#: workspace/settings/MainConfigurationWidget.cpp:260 +msgctxt "for in 'keep history for 5 months'" +msgid "for " +msgstr "fad" + +#. i18n: ectx: property (text), widget (QCheckBox, checkEnableActivities) +#: workspace/settings/ui/MainConfigurationWidgetBase.ui:17 +msgid "Enable activities management" +msgstr "Cuir stiùireadh nan gnìomhachdan an comas" + +#. i18n: ectx: attribute (title), widget (QWidget, tab) +#: workspace/settings/ui/MainConfigurationWidgetBase.ui:28 +msgid "Privacy" +msgstr "Prìobhaideachd" + +#. i18n: ectx: property (text), widget (QLabel, labelRememberDocuments) +#: workspace/settings/ui/MainConfigurationWidgetBase.ui:34 +msgid "Remember opened documents:" +msgstr "Cuir na sgrìobhainnean a chaidh fhosgladh an cuimhne:" + +#. i18n: ectx: property (text), widget (QRadioButton, radioRememberAllApplications) +#: workspace/settings/ui/MainConfigurationWidgetBase.ui:45 +msgid "For a&ll applications" +msgstr "Airson a h-uil&e aplacaid" + +#. i18n: ectx: property (text), widget (QRadioButton, radioDontRememberApplications) +#: workspace/settings/ui/MainConfigurationWidgetBase.ui:55 +msgid "&Do not remember" +msgstr "Na &cuimhnich" + +#. i18n: ectx: property (text), widget (QRadioButton, radioRememberSpecificApplications) +#: workspace/settings/ui/MainConfigurationWidgetBase.ui:62 +msgid "O&nly for specific applications" +msgstr "&Na cuimhnich ach airson aplacaidean sònraichte" + +#. i18n: ectx: property (text), widget (QLabel, labelKeepHistory) +#: workspace/settings/ui/MainConfigurationWidgetBase.ui:90 +msgid "Keep history" +msgstr "Cum an eachdraidh" + +#. i18n: ectx: property (text), widget (QPushButton, buttonClearRecentHistory) +#: workspace/settings/ui/MainConfigurationWidgetBase.ui:113 +msgid "Clear recent history" +msgstr "Glan an eachdraidh faisg ort" + +#. i18n: ectx: property (text), widget (QCheckBox, checkBlacklistAllNotOnList) +#: workspace/settings/ui/MainConfigurationWidgetBase.ui:155 +msgid "Blacklist all applications not on this list" +msgstr "Cuir gach aplacaid nach eil air an liosa seo air an dubh-liosta"
[-] [+]	Changed	kactivities-5.6.0.tar.xz/po/it/kactivities5.po ^
@@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. +# Federico Zenith <federico.zenith@member.fsf.org>, 2012, 2013, 2014. # -# Federico Zenith <federico.zenith@member.fsf.org>, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: kactivitymanagerd_fileitem_linking_plugin\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-09-24 07:44+0000\n" -"PO-Revision-Date: 2013-06-19 09:05+0200\n" -"Last-Translator: Federico Zenith <federico.zenith@member.fsf.org>\n" +"PO-Revision-Date: 2014-10-09 20:27+0200\n" +"Last-Translator: Federico Zenith <zenith.federico@gmail.com>\n" "Language-Team: Italian <kde-i18n-it@kde.org>\n" "Language: it\n" "MIME-Version: 1.0\n" @@ -26,15 +26,13 @@ msgstr "federico.zenith@member.fsf.org" #: imports/activitymodel.cpp:592 -#, fuzzy -#\| msgid "Activities..." msgctxt "Header title for activity data model" msgid "Activity" -msgstr "Attività..." +msgstr "Attività" #: service/Activities.cpp:139 msgid "Default" -msgstr "" +msgstr "Predefinita" #: service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp:84 #: service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp:119 @@ -45,20 +43,16 @@ #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:111 #: workspace/kio/KioActivities.cpp:304 -#, fuzzy -#\| msgid "Activities..." msgid "Activities" -msgstr "Attività..." +msgstr "Attività" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:114 msgid "Loading..." -msgstr "" +msgstr "Caricamento..." #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:141 -#, fuzzy -#\| msgid "Activity manager is not running properly." msgid "The Activity Manager is not running" -msgstr "Il gestore delle attività non sta funzionando correttamente." +msgstr "Il gestore delle attività non è in esecuzione" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:185 #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:252 @@ -81,16 +75,12 @@ msgstr "Scollega da:" #: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 -#, fuzzy -#\| msgid "Activities..." msgid "Activity" -msgstr "Attività..." +msgstr "Attività" #: workspace/kio/KioActivities.cpp:228 -#, fuzzy -#\| msgid "Link to the current activity" msgid "Current activity" -msgstr "Collega all'attività attuale" +msgstr "Attività attuale" #: workspace/settings/MainConfigurationWidget.cpp:80 msgid "Available Features" @@ -125,8 +115,8 @@ msgctxt "unit of time. months to keep the history" msgid " month" msgid_plural " months" -msgstr[0] "" -msgstr[1] "" +msgstr[0] " mese" +msgstr[1] " mesi" #: workspace/settings/MainConfigurationWidget.cpp:260 msgctxt "for in 'keep history for 5 months'" @@ -150,24 +140,18 @@ #. i18n: ectx: property (text), widget (QRadioButton, radioRememberAllApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:45 -#, fuzzy -#\| msgid "For all applications" msgid "For a&ll applications" -msgstr "Per tutte le applicazioni" +msgstr "Per tutte &le applicazioni" #. i18n: ectx: property (text), widget (QRadioButton, radioDontRememberApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:55 -#, fuzzy -#\| msgid "Do not remember" msgid "&Do not remember" -msgstr "Non ricordare" +msgstr "&Non ricordare" #. i18n: ectx: property (text), widget (QRadioButton, radioRememberSpecificApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:62 -#, fuzzy -#\| msgid "Only for specific applications" msgid "O&nly for specific applications" -msgstr "Solo per certe applicazioni" +msgstr "&Solo per certe applicazioni" #. i18n: ectx: property (text), widget (QLabel, labelKeepHistory) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:90
[-] [+]	Changed	kactivities-5.6.0.tar.xz/po/lt/kactivities5.po ^
@@ -3,14 +3,14 @@ # This file is distributed under the same license as the l package. # # Automatically generated, 2012. -# Liudas Alisauskas <liudas@akmc.lt>, 2013. +# Liudas Alisauskas <liudas@akmc.lt>, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: l 10n\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-09-24 07:44+0000\n" -"PO-Revision-Date: 2013-01-05 14:59+0200\n" -"Last-Translator: Liudas Alisauskas <liudas@akmc.lt>\n" +"PO-Revision-Date: 2014-11-02 19:37+0200\n" +"Last-Translator: \n" "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n" "Language: lt\n" "MIME-Version: 1.0\n" @@ -29,15 +29,13 @@ msgstr "liudas@akmc.lt" #: imports/activitymodel.cpp:592 -#, fuzzy -#\| msgid "Activities" msgctxt "Header title for activity data model" msgid "Activity" -msgstr "Veiklos" +msgstr "Veikla" #: service/Activities.cpp:139 msgid "Default" -msgstr "" +msgstr "Numatyta" #: service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp:84 #: service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp:119 @@ -48,20 +46,16 @@ #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:111 #: workspace/kio/KioActivities.cpp:304 -#, fuzzy -#\| msgid "Activities" msgid "Activities" msgstr "Veiklos" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:114 msgid "Loading..." -msgstr "" +msgstr "Įkeliama..." #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:141 -#, fuzzy -#\| msgid "Activity manager is not running properly." msgid "The Activity Manager is not running" -msgstr "Veiklų tvarkytuvę veikia neteisingai." +msgstr "Veiklų tvarkytuvė neveikia" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:185 #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:252 @@ -84,16 +78,12 @@ msgstr "Atjungti nuo:" #: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 -#, fuzzy -#\| msgid "Activities" msgid "Activity" -msgstr "Veiklos" +msgstr "Veikla" #: workspace/kio/KioActivities.cpp:228 -#, fuzzy -#\| msgid "Link to the current activity" msgid "Current activity" -msgstr "Prijungti prie dabartinės veiklos" +msgstr "Dabartinė veikla" #: workspace/settings/MainConfigurationWidget.cpp:80 msgid "Available Features" @@ -128,10 +118,10 @@ msgctxt "unit of time. months to keep the history" msgid " month" msgid_plural " months" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] " mėnesį" +msgstr[1] " mėnesius" +msgstr[2] " mėnesių" +msgstr[3] " mėnesį" #: workspace/settings/MainConfigurationWidget.cpp:260 msgctxt "for in 'keep history for 5 months'" @@ -155,24 +145,18 @@ #. i18n: ectx: property (text), widget (QRadioButton, radioRememberAllApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:45 -#, fuzzy -#\| msgid "For all applications" msgid "For a&ll applications" -msgstr "Visų programų" +msgstr "Visoms programos" #. i18n: ectx: property (text), widget (QRadioButton, radioDontRememberApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:55 -#, fuzzy -#\| msgid "Do not remember" msgid "&Do not remember" -msgstr "Neprisiminti" +msgstr "&Neprisiminti" #. i18n: ectx: property (text), widget (QRadioButton, radioRememberSpecificApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:62 -#, fuzzy -#\| msgid "Only for specific applications" msgid "O&nly for specific applications" -msgstr "Tik tam tikrų programų" +msgstr "Tik tam tikroms programoms" #. i18n: ectx: property (text), widget (QLabel, labelKeepHistory) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:90
[-] [+]	Changed	kactivities-5.6.0.tar.xz/po/nn/kactivities5.po ^
@@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-08-18 08:02+0000\n" +"POT-Creation-Date: 2014-09-24 07:44+0000\n" "PO-Revision-Date: 2014-07-29 13:09+0200\n" "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -45,7 +45,7 @@ msgstr "" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:111 -#: workspace/kio/KioActivities.cpp:309 +#: workspace/kio/KioActivities.cpp:304 msgid "Activities" msgstr "" @@ -77,11 +77,11 @@ msgid "Unlink from:" msgstr "" -#: workspace/kio/KioActivities.cpp:108 workspace/kio/KioActivities.cpp:234 +#: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 msgid "Activity" msgstr "Aktivitet" -#: workspace/kio/KioActivities.cpp:233 +#: workspace/kio/KioActivities.cpp:228 msgid "Current activity" msgstr ""
[-] [+]	Changed	kactivities-5.6.0.tar.xz/po/pa/kactivities5.po ^
@@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-09-24 07:44+0000\n" -"PO-Revision-Date: 2014-07-08 14:14-0500\n" +"PO-Revision-Date: 2014-11-06 17:43-0600\n" "Last-Translator: A S Alam <aalam@users.sf.net>\n" "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n" "Language: pa\n" @@ -48,13 +48,11 @@ #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:114 msgid "Loading..." -msgstr "" +msgstr "...ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:141 -#, fuzzy -#\| msgid "Activity manager is not running properly." msgid "The Activity Manager is not running" -msgstr "ਸਰਗਰਮੀ ਮੈਨੇਜਰ ਠੀਕ ਤਰ੍ਹਾਂ ਨਹੀਂ ਚੱਲਦਾ ਹੈ।" +msgstr "ਸਰਗਰਮੀ ਮੈਨੇਜਰ ਨਹੀਂ ਚੱਲ ਰਿਹਾ ਹੈ" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:185 #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:252 @@ -77,9 +75,6 @@ msgstr "ਅਣਲਿੰਕ ਕਰੋ:" #: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 -#, fuzzy -#\| msgctxt "Header title for activity data model" -#\| msgid "Activity" msgid "Activity" msgstr "ਸਰਗਰਮੀ" @@ -145,24 +140,18 @@ #. i18n: ectx: property (text), widget (QRadioButton, radioRememberAllApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:45 -#, fuzzy -#\| msgid "For all applications" msgid "For a&ll applications" -msgstr "ਸਭ ਐਪਲੀਕੇਸ਼ਨ ਲਈ" +msgstr "ਸਭ ਐਪਲੀਕੇਸ਼ਨ ਲਈ(&l)" #. i18n: ectx: property (text), widget (QRadioButton, radioDontRememberApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:55 -#, fuzzy -#\| msgid "Do not remember" msgid "&Do not remember" -msgstr "ਯਾਦ ਨਾ ਰੱਖੋ" +msgstr "ਯਾਦ ਨਾ ਰੱਖੋ(&D)" #. i18n: ectx: property (text), widget (QRadioButton, radioRememberSpecificApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:62 -#, fuzzy -#\| msgid "Only for specific applications" msgid "O&nly for specific applications" -msgstr "ਕੇਵਲ ਖਾਸ ਐਪਲੀਕੇਸ਼ਨ ਲਈ ਹੀ" +msgstr "ਕੇਵਲ ਖਾਸ ਐਪਲੀਕੇਸ਼ਨ ਲਈ ਹੀ(&n)" #. i18n: ectx: property (text), widget (QLabel, labelKeepHistory) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:90
[-] [+]	Changed	kactivities-5.6.0.tar.xz/po/ru/kactivities5.po ^
@@ -9,7 +9,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-09-24 07:44+0000\n" -"PO-Revision-Date: 2014-06-30 00:18+0400\n" +"PO-Revision-Date: 2014-12-07 01:15+0400\n" "Last-Translator: Alexander Potashev <aspotashev@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" "Language: ru\n" @@ -51,13 +51,11 @@ #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:114 msgid "Loading..." -msgstr "" +msgstr "Загрузка..." #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:141 -#, fuzzy -#\| msgid "Activity manager is not running properly." msgid "The Activity Manager is not running" -msgstr "Диспетчер комнат не запущен правильно." +msgstr "Диспетчер комнат не запущен." #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:185 #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:252 @@ -80,9 +78,6 @@ msgstr "Снять привязку с:" #: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 -#, fuzzy -#\| msgctxt "Header title for activity data model" -#\| msgid "Activity" msgid "Activity" msgstr "Комната" @@ -150,24 +145,18 @@ #. i18n: ectx: property (text), widget (QRadioButton, radioRememberAllApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:45 -#, fuzzy -#\| msgid "For all applications" msgid "For a&ll applications" -msgstr "Для всех приложений" +msgstr "Для &всех приложений" #. i18n: ectx: property (text), widget (QRadioButton, radioDontRememberApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:55 -#, fuzzy -#\| msgid "Do not remember" msgid "&Do not remember" -msgstr "Не запоминать" +msgstr "&Не запоминать" #. i18n: ectx: property (text), widget (QRadioButton, radioRememberSpecificApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:62 -#, fuzzy -#\| msgid "Only for specific applications" msgid "O&nly for specific applications" -msgstr "Только для определённых приложений" +msgstr "Толь&ко для определённых приложений" #. i18n: ectx: property (text), widget (QLabel, labelKeepHistory) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:90
[-] [+]	Changed	kactivities-5.6.0.tar.xz/po/se/kactivities5.po ^
@@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-08-18 08:02+0000\n" +"POT-Creation-Date: 2014-09-24 07:44+0000\n" "PO-Revision-Date: 2011-10-26 01:37+0200\n" "Last-Translator: Børre Gaup <boerre@skolelinux.no>\n" "Language-Team: Northern Sami <i18n-sme@lister.ping.uio.no>\n" @@ -44,7 +44,7 @@ msgstr "" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:111 -#: workspace/kio/KioActivities.cpp:309 +#: workspace/kio/KioActivities.cpp:304 msgid "Activities" msgstr "" @@ -76,11 +76,11 @@ msgid "Unlink from:" msgstr "" -#: workspace/kio/KioActivities.cpp:108 workspace/kio/KioActivities.cpp:234 +#: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 msgid "Activity" msgstr "" -#: workspace/kio/KioActivities.cpp:233 +#: workspace/kio/KioActivities.cpp:228 msgid "Current activity" msgstr ""
[-] [+]	Changed	kactivities-5.6.0.tar.xz/po/tr/kactivities5.po ^
@@ -1,21 +1,22 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Volkan Gezer <volkangezer@gmail.com>, 2013. +# Volkan Gezer <volkangezer@gmail.com>, 2013, 2014. +# Kaan Ozdincer <kaanozdincer@gmail.com>, 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-09-24 07:44+0000\n" -"PO-Revision-Date: 2013-07-08 04:13+0200\n" -"Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n" +"PO-Revision-Date: 2014-11-12 00:32+0200\n" +"Last-Translator: Kaan Ozdincer <kaanozdincer@gmail.com>\n" "Language-Team: Turkish <kde-l10n-tr@kde.org>\n" "Language: tr\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 1.4\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -26,11 +27,9 @@ msgstr "volkangezer@gmail.com" #: imports/activitymodel.cpp:592 -#, fuzzy -#\| msgid "Activities..." msgctxt "Header title for activity data model" msgid "Activity" -msgstr "Etkinlikler..." +msgstr "Etkinlik" #: service/Activities.cpp:139 msgid "Default" @@ -45,20 +44,16 @@ #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:111 #: workspace/kio/KioActivities.cpp:304 -#, fuzzy -#\| msgid "Activities..." msgid "Activities" -msgstr "Etkinlikler..." +msgstr "Etkinlikler" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:114 msgid "Loading..." -msgstr "" +msgstr "Yükleniyor..." #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:141 -#, fuzzy -#\| msgid "Activity manager is not running properly." msgid "The Activity Manager is not running" -msgstr "Etkinlik yöneticisi düzgün bir şekilde çalışmıyor." +msgstr "Etkinlik Yöneticisi çalışmıyor." #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:185 #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:252 @@ -81,16 +76,12 @@ msgstr "Şuradan bağlantısını kes:" #: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 -#, fuzzy -#\| msgid "Activities..." msgid "Activity" -msgstr "Etkinlikler..." +msgstr "Etkinlik" #: workspace/kio/KioActivities.cpp:228 -#, fuzzy -#\| msgid "Link to the current activity" msgid "Current activity" -msgstr "Geçerli etkinliğe bağla" +msgstr "Geçerli etkinlik" #: workspace/settings/MainConfigurationWidget.cpp:80 msgid "Available Features" @@ -125,7 +116,7 @@ msgctxt "unit of time. months to keep the history" msgid " month" msgid_plural " months" -msgstr[0] "" +msgstr[0] " ay aylar" msgstr[1] "" #: workspace/settings/MainConfigurationWidget.cpp:260 @@ -150,24 +141,18 @@ #. i18n: ectx: property (text), widget (QRadioButton, radioRememberAllApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:45 -#, fuzzy -#\| msgid "For all applications" msgid "For a&ll applications" -msgstr "Tüm uygulamalar için" +msgstr "Tüm uygu&lamalar için" #. i18n: ectx: property (text), widget (QRadioButton, radioDontRememberApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:55 -#, fuzzy -#\| msgid "Do not remember" msgid "&Do not remember" -msgstr "Hatırlama" +msgstr "&Hatırlama" #. i18n: ectx: property (text), widget (QRadioButton, radioRememberSpecificApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:62 -#, fuzzy -#\| msgid "Only for specific applications" msgid "O&nly for specific applications" -msgstr "Sadece özel uygulamalar için" +msgstr "S&adece özel uygulamalar için" #. i18n: ectx: property (text), widget (QLabel, labelKeepHistory) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:90
[-] [+]	Changed	kactivities-5.6.0.tar.xz/po/zh_CN/kactivities5.po ^
@@ -1,15 +1,15 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Weng Xuetian <wengxt@gmail.com>, 2013. +# Weng Xuetian <wengxt@gmail.com>, 2013, 2014. # Feng Chao <chaofeng111@gmail.com>, 2012, 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-09-24 07:44+0000\n" -"PO-Revision-Date: 2014-05-23 20:49+0800\n" -"Last-Translator: Feng Chao <chaofeng111@gmail.com>\n" +"PO-Revision-Date: 2014-12-18 16:58-0800\n" +"Last-Translator: Weng Xuetian <wengxt@gmail.com>\n" "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -49,13 +49,11 @@ #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:114 msgid "Loading..." -msgstr "" +msgstr "正在载入..." #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:141 -#, fuzzy -#\| msgid "Activity manager is not running properly." msgid "The Activity Manager is not running" -msgstr "活动管理器未正常运行。" +msgstr "活动管理器未运行。" #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:185 #: workspace/fileitemplugin/FileItemLinkingPlugin.cpp:252 @@ -78,9 +76,6 @@ msgstr "取消连接：" #: workspace/kio/KioActivities.cpp:107 workspace/kio/KioActivities.cpp:229 -#, fuzzy -#\| msgctxt "Header title for activity data model" -#\| msgid "Activity" msgid "Activity" msgstr "活动" @@ -145,24 +140,18 @@ #. i18n: ectx: property (text), widget (QRadioButton, radioRememberAllApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:45 -#, fuzzy -#\| msgid "For all applications" msgid "For a&ll applications" -msgstr "对全部应用程序" +msgstr "对全部应用程序(&L)" #. i18n: ectx: property (text), widget (QRadioButton, radioDontRememberApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:55 -#, fuzzy -#\| msgid "Do not remember" msgid "&Do not remember" -msgstr "不记录" +msgstr "不记录(&D)" #. i18n: ectx: property (text), widget (QRadioButton, radioRememberSpecificApplications) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:62 -#, fuzzy -#\| msgid "Only for specific applications" msgid "O&nly for specific applications" -msgstr "只对特定程序" +msgstr "只对特定程序(&N)" #. i18n: ectx: property (text), widget (QLabel, labelKeepHistory) #: workspace/settings/ui/MainConfigurationWidgetBase.ui:90
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/CMakeLists.txt ^
@@ -52,7 +52,7 @@ # Config file set (KAMD_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set (KAMD_DATA_DIR "${KF5_DATA_INSTALL_DIR}/kactivitymanagerd/") -set (KAMD_PLUGIN_DIR "${PLUGIN_INSTALL_DIR}/kactivitymanagerd/") +set (KAMD_PLUGIN_DIR "${CMAKE_INSTALL_FULL_PLUGINDIR}/kactivitymanagerd/") configure_file (kactivities-features.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kactivities-features.h) include_directories(
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/imports/CMakeLists.txt ^
@@ -15,6 +15,7 @@ kactivities_imports_LIB_SRCS activitiesextensionplugin.cpp activitymodel.cpp + activityinfo.cpp resourcemodel.cpp ${CMAKE_SOURCE_DIR}/src/utils/dbusfuture_p.cpp @@ -40,5 +41,5 @@ ## install install (TARGETS kactivitiesextensionplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/activities) -install (FILES qmldir README DESTINATION ${QML_INSTALL_DIR}/org/kde/activities) +install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/activities)
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/imports/README ^
@@ -1,4 +1,4 @@ -org.kde.activities namespace doe not guarantee +org.kde.activities namespace does not guarantee a stable api. If you want to use components from it, make sure
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/imports/activitiesextensionplugin.cpp ^
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Ivan Cukic <ivan.cukic(at)kde.org> + * Copyright (C) 2012, 2013, 2014, 2015 Ivan Cukic <ivan.cukic(at)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -22,6 +22,7 @@ #include <QtQml> #include "activitymodel.h" +#include "activityinfo.h" #include "resourcemodel.h" #include <QDebug> @@ -35,7 +36,8 @@ { Q_ASSERT(QLatin1String(uri) == QLatin1String("org.kde.activities")); - qmlRegisterType<KActivities::Models::ActivityModel>(uri, 0, 1, "ActivityModel"); - qmlRegisterType<KActivities::Models::ResourceModel>(uri, 0, 1, "ResourceModel"); + qmlRegisterType<KActivities::Imports::ActivityModel>(uri, 0, 1, "ActivityModel"); + qmlRegisterType<KActivities::Imports::ActivityInfo>(uri, 0, 1, "ActivityInfo"); + qmlRegisterType<KActivities::Imports::ResourceModel>(uri, 0, 1, "ResourceModel"); }
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/imports/activitiesextensionplugin.h ^
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2012 by Ivan Cukic <ivan.cukic(at)kde.org> + * Copyright (C) 2011, 2012, 2013, 2014, 2015 by Ivan Cukic <ivan.cukic(at)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. / -#ifndef ACTIVITIES_COMPONENT_PLUGIN_H -#define ACTIVITIES_COMPONENT_PLUGIN_H +#ifndef KACTIVITIES_IMPORTS_PLUGIN_H +#define KACTIVITIES_IMPORTS_PLUGIN_H #include <QQmlExtensionPlugin> @@ -31,4 +31,5 @@ void registerTypes(const char uri) Q_DECL_OVERRIDE; }; -#endif // ACTIVITIES_COMPONENT_DATA_PLUGIN_H +#endif // KACTIVITIES_IMPORTS_PLUGIN_H +
[-] [+]	Added	kactivities-5.6.0.tar.xz/src/imports/activityinfo.cpp ^
@@ -0,0 +1,109 @@ +/* + * Copyright (C) 2012, 2013, 2014, 2015 Ivan Cukic <ivan.cukic(at)kde.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * or (at your option) any later version, as published by the Free + * Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + / + +// Self +#include "activityinfo.h" + +namespace KActivities { +namespace Imports { + +ActivityInfo::ActivityInfo(QObject parent) + : QObject(parent) + , m_showCurrentActivity(false) +{ + connect(&m_service, &KActivities::Controller::currentActivityChanged, + this, &ActivityInfo::setCurrentActivity); +} + +ActivityInfo::~ActivityInfo() +{ +} + +void ActivityInfo::setCurrentActivity(const QString &id) +{ + if (!m_showCurrentActivity) return; + + setIdInternal(id); + + emit nameChanged(m_info->name()); + emit iconChanged(m_info->icon()); +} + +void ActivityInfo::setActivityId(const QString &id) +{ + m_showCurrentActivity = (id == ":current"); + + setIdInternal(m_showCurrentActivity ? + m_service.currentActivity() : id); +} + +void ActivityInfo::setIdInternal(const QString &id) +{ + using namespace KActivities; + + // We are killing the old info object, if any + m_info.reset(new KActivities::Info(id)); + + connect(m_info.get(), &Info::nameChanged, + this, &ActivityInfo::nameChanged); + connect(m_info.get(), &Info::iconChanged, + this, &ActivityInfo::iconChanged); +} + +void ActivityInfo::setName(const QString &name) +{ + if (!m_info) return; + + m_service.setActivityName(m_info->id(), name); +} + +void ActivityInfo::setIcon(const QString &icon) +{ + if (!m_info) return; + + m_service.setActivityIcon(m_info->id(), icon); +} + + +QString ActivityInfo::activityId() const +{ + return m_info ? m_info->id() : ""; +} + +QString ActivityInfo::name() const +{ + return m_info ? m_info->name() : ""; +} + +QString ActivityInfo::icon() const +{ + return m_info ? m_info->icon() : ""; +} + +bool ActivityInfo::valid() const +{ + return true; +} + + +} // namespace Imports +} // namespace KActivities + +// #include "activityinfo.moc" +
[-] [+]	Added	kactivities-5.6.0.tar.xz/src/imports/activityinfo.h ^
@@ -0,0 +1,100 @@ +/* + * Copyright (C) 2012, 2013, 2014, 2015 Ivan Cukic <ivan.cukic(at)kde.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * or (at your option) any later version, as published by the Free + * Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + / + +#ifndef KACTIVITIES_IMPORTS_ACTIVITY_INFO_H +#define KACTIVITIES_IMPORTS_ACTIVITY_INFO_H + +// Qt +#include <QObject> + +// STL +#include <memory> + +// Local +#include <lib/core/controller.h> +#include <lib/core/info.h> + +namespace KActivities { +namespace Imports { + +/* + * ActivityInfo + / + +class ActivityInfo : public QObject { + Q_OBJECT + + /* + * Unique identifier of the activity + / + Q_PROPERTY(QString activityId READ activityId WRITE setActivityId NOTIFY activityIdChanged) + + /* + * Name of the activity + / + Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) + + /* + * Activity icon + / + Q_PROPERTY(QString icon READ icon WRITE setIcon NOTIFY iconChanged) + + /* + * Is the activity a valid one - does it exist? + / + Q_PROPERTY(bool valid READ valid NOTIFY validChanged) + +public: + ActivityInfo(QObject parent = 0); + virtual ~ActivityInfo(); + +public Q_SLOTS: + void setActivityId(const QString &id); + QString activityId() const; + + void setName(const QString &name); + QString name() const; + + void setIcon(const QString &icon); + QString icon() const; + + bool valid() const; + +Q_SIGNALS: + void activityIdChanged(const QString &id); + void nameChanged(const QString &name); + void iconChanged(const QString &icon); + void validChanged(bool valid); + +private Q_SLOTS: + void setCurrentActivity(const QString &id); + +private: + void setIdInternal(const QString &id); + + KActivities::Controller m_service; + std::unique_ptr<KActivities::Info> m_info; + bool m_showCurrentActivity; +}; + +} // namespace Imports +} // namespace KActivities + +#endif // KACTIVITIES_IMPORTS_ACTIVITY_INFO_H +
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/imports/activitymodel.cpp ^
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2012, 2013, 2014 Ivan Cukic <ivan.cukic(at)kde.org> + * Copyright (C) 2012, 2013, 2014, 2015 Ivan Cukic <ivan.cukic(at)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -52,7 +52,7 @@ namespace KActivities { -namespace Models { +namespace Imports { class ActivityModel::Private { public: @@ -653,7 +653,8 @@ continue_with(m_service.startActivity(id), callback); } -} // namespace Models +} // namespace Imports } // namespace KActivities // #include "activitymodel.moc" +
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/imports/activitymodel.h ^
@@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. / -#ifndef KACTIVITIES_MODELS_ACTIVITY_MODEL_H -#define KACTIVITIES_MODELS_ACTIVITY_MODEL_H +#ifndef KACTIVITIES_IMPORTS_ACTIVITY_MODEL_H +#define KACTIVITIES_IMPORTS_ACTIVITY_MODEL_H // Qt #include <QObject> @@ -38,7 +38,7 @@ class QDBusPendingCallWatcher; namespace KActivities { -namespace Models { +namespace Imports { /* * ActivityModel @@ -151,7 +151,8 @@ friend class Private; }; -} // namespace Models +} // namespace Imports } // namespace KActivities -#endif // KACTIVITIES_MODELS_ACTIVITY_MODEL_H +#endif // KACTIVITIES_IMPORTS_ACTIVITY_MODEL_H +
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/imports/resourcemodel.cpp ^
@@ -63,7 +63,7 @@ using kamd::utils::continue_with; namespace KActivities { -namespace Models { +namespace Imports { class ResourceModel::LinkerService: public QDBusInterface { private: @@ -691,7 +691,8 @@ QUrl(resource).toLocalFile() : resource; } -} // namespace Models +} // namespace Imports } // namespace KActivities // #include "resourcemodel.moc" +
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/imports/resourcemodel.h ^
@@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. / -#ifndef KACTIVITIES_MODELS_RESOURCE_MODEL_H -#define KACTIVITIES_MODELS_RESOURCE_MODEL_H +#ifndef KACTIVITIES_IMPORTS_RESOURCE_MODEL_H +#define KACTIVITIES_IMPORTS_RESOURCE_MODEL_H // Qt #include <QObject> @@ -43,7 +43,7 @@ class QDBusPendingCallWatcher; namespace KActivities { -namespace Models { +namespace Imports { /* * ResourceModel @@ -203,7 +203,8 @@ mutable KConfigGroup m_config; }; -} // namespace Models +} // namespace Imports } // namespace KActivities -#endif // KACTIVITIES_MODELS_RESOURCE_MODEL_H +#endif // KACTIVITIES_IMPORTS_RESOURCE_MODEL_H +
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/imports/utils_p.h ^
@@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KACTIVITIES_MODELS_UTILS_P_H -#define KACTIVITIES_MODELS_UTILS_P_H +#ifndef KACTIVITIES_IMPORTS_UTILS_P_H +#define KACTIVITIES_IMPORTS_UTILS_P_H // ----------------------------------------- // RAII classes for model updates ---------- @@ -72,4 +72,5 @@ // ----------------------------------------- -#endif // KACTIVITIES_MODELS_UTILS_P_H +#endif // KACTIVITIES_IMPORTS_UTILS_P_H +
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/service/Application.cpp ^
@@ -203,7 +203,7 @@ using namespace boost::adaptors; using namespace std::placeholders; - const auto pluginsDir(QLatin1String(KAMD_INSTALL_PREFIX "/" KAMD_PLUGIN_DIR)); + const auto pluginsDir(QLatin1String(KAMD_PLUGIN_DIR)); QCoreApplication::addLibraryPath(pluginsDir); const auto config
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/service/files/kactivitymanagerd-plugin.desktop ^
@@ -18,6 +18,7 @@ Comment[fi]=Aktiviteettihallintaliitännäinen Comment[fr]=Module externe de gestionnaire d'activités Comment[ga]=Breiseán bainisteora gníomhaíochta +Comment[gd]=Plugan manaidsear nan gnìomhachdan Comment[gl]=Complemento de xestión da actividade Comment[he]=תוסף מנהל פעילויות Comment[hu]=Aktivitáskezelő bővítmény @@ -33,7 +34,7 @@ Comment[nds]=Aktivitetenpleger-Moduul Comment[nl]=Plug-in van activiteitenbeheerder Comment[pa]=ਐਕਟੀਵਿਟੀ ਮੈਨੇਜਰ ਪਲੱਗਇਨ -Comment[pl]=Wtyczka menadżera działań +Comment[pl]=Wtyczka do zarządzania działaniami Comment[pt]='Plugin' de gestão de actividades Comment[pt_BR]=Plugin do gerenciador de atividades Comment[ro]=Extensie pentru gestionarul de activități
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/service/files/kactivitymanagerd.desktop ^
@@ -22,6 +22,7 @@ Name[fi]=Aktiviteettienhallinta Name[fr]=Gestionnaire d'activités Name[ga]=Bainisteoir Gníomhaíochta +Name[gd]=Manaidsear nan gnìomhachdan Name[gl]=Xestor da actividade Name[he]=מנהל פעילויות Name[hu]=Aktivitáskezelő @@ -37,7 +38,7 @@ Name[nds]=Aktivitetenpleger Name[nl]=Activiteitenbeheerder Name[pa]=ਐਕਟਵਿਟੀ ਮੈਨੇਜਰ -Name[pl]=Menadżer działań +Name[pl]=Zarządzanie działaniami Name[pt]=Gestor de Actividades Name[pt_BR]=Gerenciador de atividades Name[ro]=Gestionar de activități @@ -74,6 +75,7 @@ Comment[fi]=Aktiviteettihallintataustaohjelma Comment[fr]=Le moteur de gestion d'activités Comment[ga]=Inneall bainisteoireachta gníomhaíochta +Comment[gd]=Backend gus na gnìomhachdan a stiùireadh Comment[gl]=A infraestrutura de xestión da actividade Comment[he]=מנוע ניהול הפעילויות Comment[hu]=Aktivitáskezelő modul
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/service/plugins/activitytemplates/kactivitymanagerd-plugin-activitytemplates.desktop ^
@@ -4,15 +4,21 @@ Name[ca]=Plantilles de les activitats Name[ca@valencia]=Plantilles d'activitats Name[cs]=Šablony aktivit +Name[da]=Aktivitetsskabeloner Name[de]=Aktivitätenvorlagen Name[en_GB]=Activity Templates Name[es]=Plantillas de actividades Name[fi]=Aktiviteettimallit Name[fr]=Modèles d'activité +Name[gd]=Teamplaidean nan gnìomhachdan Name[gl]=Modelos de actividade Name[hu]=Aktivitássablonok Name[ia]=Patronos de Activitate +Name[is]=Sniðmát fyrir virkni +Name[it]=Modelli di attività Name[ko]=활동 템플릿 +Name[lt]=Veiklų šablonai +Name[mr]=कार्यपध्दती टेम्प्लेट्स Name[nb]=Film-maler Name[nds]=Aktiviteten-Vörlagen Name[nl]=Sjablonen voor activiteit @@ -38,14 +44,18 @@ Comment[ar]=دعم إنشاء قوالب أنشطة Comment[ca]=Suport per a la creació d'activitats amb plantilles Comment[ca@valencia]=Suport per a la creació d'activitats aplantillades +Comment[da]=Understøttelse af oprettelse af aktiviteter efter skabeloner Comment[de]=Unterstützung für das Erstellen von Vorlagen für Aktivitäten Comment[en_GB]=Support for creating templated activities Comment[es]=Creación de plantillas de actividades Comment[fi]=Tuki aktiviteettimallien tekemiseen Comment[fr]=Prise en charge de la création d'activités par modèles +Comment[gd]=Taic gus gnìomhachdan a chruthachadh le teamplaidean Comment[gl]=Permite a creación de modelos de actividades Comment[hu]=Támogatás sablonból létrehozott aktivitásokhoz Comment[ia]=Supporto pro crear activitates de forma de patrono +Comment[is]=Stuðningur við að útbúa virknisvið út frá sniðmátum +Comment[it]=Supporto per creare attività da modelli Comment[ko]=템플릿이 있는 활동 생성 지원 Comment[nb]=Støtte for å opprette aktiviteter fra maler Comment[nds]=Ünnerstütten för't Opstellen Aktiviteetvörlagen
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/service/plugins/globalshortcuts/kactivitymanagerd-plugin-globalshortcuts.desktop ^
@@ -14,6 +14,7 @@ Name[eu]=Lasterbide orokorrak Name[fi]=Työpöydänlaajuiset pikanäppäimet Name[fr]=Raccourcis globaux +Name[gd]=Ath-ghoiridean uile-choitcheann Name[gl]=Atallos globais Name[he]=קישורים גלובאלים Name[hu]=Globális billentyűparancsok @@ -63,10 +64,12 @@ Comment[eu]=Teklatuaren lasterbide orokorrak eransten ditu jardueren artean aldatzeko Comment[fi]=Lisää työpöydänlaajuiset pikanäppäimet aktiviteettien vaihtamiseen Comment[fr]=Ajoute des raccourcis clavier globaux pour le changement d'activités +Comment[gd]=Cuiridh seo ath-ghoiridean meur-chlàir uile-choitcheann ris gus leam a ghearradh eadar gnìomhachdan Comment[gl]=Engade atallos de teclado globais para trocar de actividade Comment[he]=מוסיף קיצורי מקשים גלובאלים למעבר בין פעילויות Comment[hu]=Globális gyorsbillentyűk hozzáadása az aktivitás váltóhoz Comment[ia]=Adde vias breve de claviero global pro commutation de activitate +Comment[is]=Bætir við víðværum flýtilyklum til að skipta um virkni Comment[it]=Aggiunge scorciatoie della tastiera globali per cambiare attività Comment[kk]=Белсенділік ауыстыру жалпы жүйелік перне тіркесімдерін қосу Comment[km]=បន្ថែមផ្លូវកាត់ក្ដារចុចសកលសម្រាប់ការប្ដូរសកម្ម
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/service/plugins/slc/kactivitymanagerd-plugin-slc.desktop ^
@@ -12,10 +12,12 @@ Name[eu]=Share-Like-Connect Name[fi]=Share-Like-Connect Name[fr]=Share-Like-Connect +Name[gd]=Share-Like-Connect Name[gl]=Compartir-gustar-conectar Name[he]=שתף-אוהב-מתחבר Name[hu]=Share-Like-Connect Name[ia]=Connexion como compartir (Share-Like-Connect) +Name[is]=Deila-Líka-Tengjast Name[it]=Share-Like-Connect Name[kk]=Қосылу-Секілді-Ортақтастыру Name[km]=កម្មវិធីជំនួយតភ្ជាប់ដូចជាការចែករំលែក @@ -57,10 +59,12 @@ Comment[eu]=Share-Like-Connect appletari datuak hornitzen dizkio Comment[fi]=Tarjoaa tietoa Share-Like-Connect-sovelmalle Comment[fr]=Fournit des données à l'applet « Share-Like-Connect » +Comment[gd]=Bheir seo dàta dhan aplaid Share-Like-Connect Comment[gl]=Fornece datos á applet compartir-gustar-conectar Comment[he]=מספק מידע לתוספ שתף-אוהב-מתחבר Comment[hu]=Adatot szolgáltat a Share-Like-Connect kisalkalmazáshoz Comment[ia]=Provide datos pro applet Share-Like-Connect +Comment[is]=Útbýr gögn fyrir Deila-Líka-Tengjast (Share-Like-Connect) smáforrit Comment[it]=Fornisce dati al programma Share-Like-Connect Comment[kk]=Қосылу-Секілді-Ортақтастыру апплетіне деректерді беру Comment[km]=ផ្ដល់ទិន្នន័យដើម្បីចែករំលែកកម្មវិធីជំនួយតភ្ជាប់
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/service/plugins/sqlite/CMakeLists.txt ^
@@ -9,7 +9,6 @@ ResourceScoreCache.cpp ResourceScoreMaintainer.cpp ResourceLinking.cpp - # Rankings.cpp ${CMAKE_SOURCE_DIR}/src/utils/qsqlquery.cpp ${plugin_implementation_SRCS} )
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/service/plugins/sqlite/Database.cpp ^
@@ -177,6 +177,10 @@ updateSchemaInfoQuery.arg(QStringLiteral("version"), currentSchemaVersion), + // The ResourceEvent table saves the Opened/Closed event pairs for + // a resource. The Accessed event is mapped to those. + // Focussing events are not stored in order not to get a + // huge database file and to lessen writes to the disk. QStringLiteral("CREATE TABLE IF NOT EXISTS ResourceEvent (" "usedActivity TEXT, " "initiatingAgent TEXT, " @@ -185,6 +189,8 @@ "end INTEGER " ")"), + // The ResourceScoreCache table stores the calcualted scores + // for resources based on the recorded events. QStringLiteral("CREATE TABLE IF NOT EXISTS ResourceScoreCache (" "usedActivity TEXT, " "initiatingAgent TEXT, " @@ -197,6 +203,11 @@ ")"), // Introduced in 2014.05.05 + // The ResourceLink table stores the information, formerly kept by + // Nepomuk, of which resources are linked to which activities. + // The additional features compared to the old days are + // the ability to limit the link to specific applications, and + // to create global links. QStringLiteral("CREATE TABLE IF NOT EXISTS ResourceLink (" "usedActivity TEXT, " "initiatingAgent TEXT, "
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/service/plugins/sqlite/ResourceLinking.cpp ^
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2012 Ivan Cukic <ivan.cukic(at)kde.org> + * Copyright (C) 2011, 2012, 2013, 2014, 2015 Ivan Cukic <ivan.cukic(at)kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -60,6 +60,8 @@ QString targettedResource, QString usedActivity) { + // qDebug() << "Linking " << targettedResource << " to " << usedActivity << " from " << initiatingAgent; + if (!validateArguments(initiatingAgent, targettedResource, usedActivity)) { qWarning() << "Invalid arguments" << initiatingAgent << targettedResource << usedActivity; @@ -103,6 +105,8 @@ QString targettedResource, QString usedActivity) { + // qDebug() << "Unlinking " << targettedResource << " from " << usedActivity << " from " << initiatingAgent; + if (!validateArguments(initiatingAgent, targettedResource, usedActivity)) { qWarning() << "Invalid arguments" << initiatingAgent << targettedResource << usedActivity; @@ -191,6 +195,16 @@ targettedResource = file.canonicalFilePath(); } + // Handling special values for activities + if (usedActivity == ":current") { + usedActivity = + Plugin::callOn<QString, Qt::DirectConnection>( + StatsPlugin::self()->activitiesInterface(), + "CurrentActivity", "QString"); + } else if (usedActivity == ":global") { + usedActivity = ""; + } + // If the activity is not empty and the passed activity // does not exist, cancel the request if (!usedActivity.isEmpty()
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/service/plugins/sqlite/ResourceLinking.h ^
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2012 Ivan Cukic <ivan.cukic@kde.org> + * Copyright (C) 2011, 2012, 2013, 2014, 2015 Ivan Cukic <ivan.cukic(at)kde.org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/service/plugins/sqlite/StatsPlugin.cpp ^
@@ -39,8 +39,6 @@ #include "ResourceScoreMaintainer.h" #include "ResourceLinking.h" #include "Utils.h" -// #include "Rankings.h" -// #include "scoringadaptor.h" #include "../../Event.h" KAMD_EXPORT_PLUGIN(sqliteplugin, StatsPlugin, "kactivitymanagerd-plugin-sqlite.json") @@ -69,8 +67,7 @@ m_activities = modules[QStringLiteral("activities")]; m_resources = modules[QStringLiteral("resources")]; - // Database::self(); - // Rankings::self(); + Database::self(); connect(m_resources, SIGNAL(ProcessedResourceEvents(EventList)), this, SLOT(addEvents(EventList)));
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/service/plugins/sqlite/kactivitymanagerd-plugin-sqlite.desktop ^
@@ -12,6 +12,7 @@ Name[eu]=Sqlite elikatzailea Name[fi]=Sqlite-syötteistin Name[fr]=Connecteur pour Sqlite +Name[gd]=Inbhir Sqlite Name[gl]=Alimentador de Sqlite Name[he]=רסס מבוסס Sqlite Name[hu]=Sqlite-feltöltő @@ -60,10 +61,12 @@ Comment[fi]=Liitännäinen tapahtumien tallentamiseen ja arvostelemiseen Sqlitessa Comment[fr]=Module externe de mémorisation et de classement des évènements dans Sqlite Comment[ga]=Breiseán a stórálann agus scórálann imeachtaí in Sqlite +Comment[gd]=Plugan gus tachartasan a ghlèidheadh 's a rangachadh ann an Sqlite Comment[gl]=Un complemento para gardar e cualificar acontecementos en Sqlite Comment[he]=תוסף לשמירה ורישום של אירועים ב־Sqlite Comment[hu]=Bővítmény események tárolására és pontozására Sqlite-ban Comment[ia]=Plugin pro immagazinar e dar punctos a eventos in Sqlite +Comment[is]=Íforrit til að geyma atburði og flokka í Sqlite Comment[it]=Estensione per memorizzare e valutare gli eventi in Sqlite Comment[kk]=Оқиғаларды сақтап бағалайтын Sqlite қызметі Comment[km]=កម្មវិធីជំនួយដើម្បីរក្សាទុក និងដាក់ពិន្ទុព្រឹត្តិការណ៍នៅក្នុង Sqlite
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/service/plugins/virtualdesktopswitch/kactivitymanagerd-plugin-virtualdesktopswitch.desktop ^
@@ -14,10 +14,12 @@ Name[eu]=Alegiazko mahaigain aldatzailea Name[fi]=Virtuaalityöpöydän valitsin Name[fr]=Commutateur de bureaux virtuels +Name[gd]=Suidsear nan deasgan bhiortail Name[gl]=Selector de escritorio virtual Name[he]=מעביר שולחנות עבודה Name[hu]=Virtuális asztal váltó Name[ia]=Commutator de scriptorio virtual +Name[is]=Sýndarskjáborðaskiptir Name[it]=Cambiadesktop virtuale Name[kk]=Виртуалды үстелін ауыстырушы Name[km]=កម្មវិធីប្ដូរផ្ទៃតុនិម្មិត @@ -61,10 +63,12 @@ Comment[eu]=Jarduera batera aldatzean, jarduera horrekin erabilitako azken alegiazko mahaigaina irekitzen du Comment[fi]=Aktiviteettia vaihdettaessa avaa sen virtuaalityöpöydän, jota kyseisellä aktiviteetilla viimeksi käytettiin Comment[fr]=Lors d'un changement d'activité, cette fonction ouvre le dernier bureau virtuel utilisé par cette activité +Comment[gd]=Nuair a ghearras tu leum gu gnìomhachd eile, thèid an deasg bhiortail fhosgladh a chleachd thu leis a' ghnìomhachd sin an turas mu dheireadh Comment[gl]=Cando se muda de actividade abre o último escritorio virtual usado con esa actividade Comment[he]=בעת מעבר בין פעילויות, פותח את שולחן העבודה בשימוש אחרון בפעילות המתאימה Comment[hu]=Amikor aktivitást vált, megnyitja az aktivitás által utoljára használt virtuális asztalt Comment[ia]=Quando on commuta a un activitate, il aperi le ultime scriptorio virtual usate con celle activitate +Comment[is]=Þegar skipt er í ákveðna virkni, opnast það sýndarskjáborð sem síðast var með þeirri virkni Comment[it]=Quando si passa ad un'attività, apre l'ultimo desktop virtuale usato con quella attività Comment[kk]=Белсенділікті ауыстырғанда, оны соңғы рет пайдаланған виртуалды үстелді ашу Comment[km]=នៅពេលប្ដូរទៅជាសកម្មភាព បើកផ្ទៃតុនិម្មិតចុងក្រោយដែលបានប្រើជាមួយសកម្មភាពនោះ
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop ^
@@ -14,10 +14,12 @@ Name[eu]=Fitxategia jarduerarekin lotzeko plugina Name[fi]=Tiedostojen yhdistäminen aktiviteettiin Name[fr]=Module externe de liaison entre fichiers et activités +Name[gd]=Plugan gus faidhlichean a co-cheangal ri gnìomhachdan Name[gl]=Complemento para ligar ficheiros con actividades Name[he]=תוסף לקישור פעילויות אל קובץ Name[hu]=Fájl-aktivitás összelinkelő bővítmény Name[ia]=File pro Plugin ligante de activitate +Name[is]=Tengiviðbót fyrir skrá-í-virkni Name[it]=Estensione di collegamento tra file e attività Name[kk]=Белсенділікті файлмен байланыстыру плагині Name[km]=ឯកសារទៅកម្មវិធីជំនួយកំណត់ជួរសកម្មភាព
[-] [+]	Changed	kactivities-5.6.0.tar.xz/src/workspace/settings/kcm_activities.desktop ^
@@ -25,6 +25,7 @@ Name[fi]=Aktiviteetit Name[fr]=Activités Name[ga]=Gníomhaíochtaí +Name[gd]=Gnìomhachdan Name[gl]=Actividades Name[he]=פעילויות Name[hu]=Aktivitások @@ -73,10 +74,12 @@ Comment[et]=Tegevuste süsteemi seadistamine Comment[fi]=Aktiviteettien asetukset Comment[fr]=Configure le système d'activités +Comment[gd]=Rèitich siostam nan gnìomhachdan Comment[gl]=Configura o sistema de actividades Comment[he]=הגדר את הפעילויות במערכת Comment[hu]=Az aktivitások rendszer beállítása Comment[ia]=Configura le systema de activitates +Comment[is]=Stilla virknikerfið Comment[it]=Configura il sistema delle attività Comment[kk]=Белсенділік жүйесін баптау Comment[km]=កំណត់រចនាសម្ព័ន្ធប្រព័ន្ធសកម្មភាព
[-] [+]	Changed	kactivities-5.6.0.tar.xz/tests/imports/org.kde.listactivitiestest/metadata.desktop ^
@@ -4,15 +4,21 @@ Name[ca]=Prova de les activitats Name[ca@valencia]=Prova d'activitats Name[cs]=Testování aktivit +Name[da]=Test af aktiviteter Name[de]=Aktivitätentest Name[en_GB]=Activities testing Name[es]=Prueba de actividades Name[fi]=Aktiviteettitesti Name[fr]=Test des activités +Name[gd]=Deuchainn nan gnìomhachdan Name[gl]=Probas de actividades Name[hu]=Aktivitásteszt Name[ia]=Essayante Activitates +Name[is]=Prófun á virknisviðum +Name[it]=Prova delle attività Name[ko]=활동 테스트 +Name[lt]=Veiklų bandymas +Name[mr]=कार्यपध्दती चाचणी Name[nb]=Aktiviteter Name[nds]=Aktiviteten-Tests Name[nl]=Testen van activiteiten @@ -21,6 +27,7 @@ Name[pt]=Teste das actividades Name[pt_BR]=Teste de atividades Name[ro]=Testare activități +Name[ru]=Тестирование комнат Name[sk]=Testovanie aktivít Name[sl]=Preizkušanje dejavnosti Name[sr]=Испробавање активности
[-] [+]	Changed	kactivities-5.6.0.tar.xz/tests/imports/plasma-applet-org.kde.listactivitiestest.desktop ^
@@ -3,15 +3,20 @@ Name[ca]=Prova de la llista d'activitats Name[ca@valencia]=Prova de llista d'activitats Name[cs]=Test seznamu aktivit +Name[da]=Oplist test af aktiviteter Name[de]=Aktivitätentest auflisten Name[en_GB]=List activities test Name[es]=Prueba de listado de actividades Name[fi]=Aktiviteettien listaamistesti Name[fr]=Test de la liste d'activités +Name[gd]=Seall deuchainn air na gnìomhachdan Name[gl]=Proba da lista de actividades Name[hu]=Aktivitáslista tesztelése Name[ia]=Lista essayos de activitates +Name[is]=Gera lista með prófunum á virknisviðum +Name[it]=Prova dell'elenco delle attività Name[ko]=활동 목록 테스트 +Name[mr]=कार्यपध्दती चाचणी यादी करा Name[nb]=List aktivitetsstester Name[nds]=Aktiviteten-Oplisttest Name[nl]=Lijst maken van activiteitentest @@ -19,6 +24,7 @@ Name[pl]=Próba wyszczególniania działań Name[pt]=Teste da listagem de actividades Name[pt_BR]=Teste da lista de atividades +Name[ru]=Тестирование списка комнат Name[sk]=Test zoznamu aktivít Name[sl]=Seznam preizkusov dejavnosti Name[sr]=Проба набрајања активности @@ -34,14 +40,18 @@ Comment=Strange, but not a Clock Comment[ca]=És estrany, però no és cap rellotge Comment[ca@valencia]=És estrany, però no és cap rellotge +Comment[da]=Mærkelig, men ikke et ur Comment[de]=Seltsam, aber keine Uhr Comment[en_GB]=Strange, but not a Clock Comment[es]=Es extraño, pero no es un reloj Comment[fi]=Outo, mutta ei kello Comment[fr]=Étranges, mais ceci n'est pas une horloge +Comment[gd]=Neònach ach chan e uaireadair a th' ann Comment[gl]=Estraño, pero non é un reloxo Comment[hu]=Furcsa, de nem egy óra Comment[ia]=Stranie, ma non un horologio +Comment[is]=Skrýtið, en ekki klukka +Comment[it]=Stranamente, non un orologio Comment[ko]=수상하지만 시계는 아님 Comment[nb]=Underlig, men ingen klokke Comment[nds]=Snaaksch, man keen Klock @@ -51,6 +61,7 @@ Comment[pt]=Estranho, Mas Não é um Relógio Comment[pt_BR]=Estranho, mas não é um relógio Comment[ro]=Straniu, dar nu e ceas +Comment[ru]=Странное, но не часы Comment[sk]=Zvláštne, ale nie hodiny Comment[sl]=Nenavadno, ni pa ura Comment[sr]=Чудно, али није сат
[-] [+]	Changed	kactivities.yaml ^
@@ -1,5 +1,5 @@ Name : kactivities -Version : 5.3.0 +Version : 5.6.0 Release : 2 Group : System/Base License : GPLv2+

Comments for request 759 (0)

There's nothing to be done right now

Request History

sebas	created request	1421327201 over 9 years ago
Update to KDE Frameworks 5.6.0
sebas	Request got accepted	1421327467 over 9 years ago
OK

Request 759 (accepted)

Comments for request 759 (0)

Request History

0 Package Maintainers