Hello community, here is the log from the commit of package kactivities5 for openSUSE:Factory checked in at 2015-01-29 12:51:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities5 (Old) and /work/SRC/openSUSE:Factory/.kactivities5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities5" Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities5/kactivities5.changes 2014-12-21 11:58:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kactivities5.new/kactivities5.changes 2015-01-29 12:51:22.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Jan 3 18:03:20 UTC 2015 - [email protected] + +- Update to 5.6.0 + * Introducing the ActivityInfo QML object + * Linking now supports special values alongside activity ids. + Supported values: + :global - links to all activities + :current - links to the current activity + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.6.0.php + +------------------------------------------------------------------- Old: ---- kactivities-5.5.0.tar.xz New: ---- kactivities-5.6.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities5.spec ++++++ --- /var/tmp/diff_new_pack.6wxa78/_old 2015-01-29 12:51:23.000000000 +0100 +++ /var/tmp/diff_new_pack.6wxa78/_new 2015-01-29 12:51:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kactivities5 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,20 +18,20 @@ %define lname libKF5Activities5 Name: kactivities5 -Version: 5.5.0 +Version: 5.6.0 Release: 0 %define kf5_version %{version} Summary: KDE Plasma Activities support License: GPL-2.0+ Group: System/GUI/KDE Url: http://projects.kde.org/kactivities -Source: http://download.kde.org/stable/frameworks/5.5/kactivities-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/5.6/kactivities-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM kamd-rename.patch -- https://git.reviewboard.kde.org/r/115602/ -- rename kactivitymanagerd binary so it can co-exist with kactivities4 +# PATCH-FIX-UPSTREAM kamd-rename.patch -- https://git.reviewboard.kde.org/r/1.6.02/ -- rename kactivitymanagerd binary so it can co-exist with kactivities4 Patch0: kamd-rename.patch BuildRequires: boost-devel >= 1.49.0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.5.0 +BuildRequires: extra-cmake-modules >= 1.6.0 BuildRequires: fdupes BuildRequires: kcmutils-devel >= %{kf5_version} BuildRequires: kconfig-devel >= %{kf5_version} @@ -82,7 +82,7 @@ Summary: KDE Plasma Activities support Group: Development/Libraries/KDE Requires: %lname = %{version} -Requires: extra-cmake-modules >= 1.5.0 +Requires: extra-cmake-modules >= 1.6.0 Requires: pkgconfig(Qt5Core) >= 5.2.0 %description devel ++++++ kactivities-5.5.0.tar.xz -> kactivities-5.6.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/CMakeLists.txt new/kactivities-5.6.0/CMakeLists.txt --- old/kactivities-5.5.0/CMakeLists.txt 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/CMakeLists.txt 2015-01-03 13:00:07.000000000 +0100 @@ -15,7 +15,7 @@ endif () # Extra CMake stuff -find_package (ECM 1.5.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.5.0") # handled by release scripts -set(KF5_DEP_VERSION "5.5.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/po/ca/kactivities5.po new/kactivities-5.6.0/po/ca/kactivities5.po --- old/kactivities-5.5.0/po/ca/kactivities5.po 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/po/ca/kactivities5.po 2015-01-03 13:00:07.000000000 +0100 @@ -4,14 +4,14 @@ # version 3 or later versions approved by the membership of KDE e.V. # # Josep Ma. Ferrer <[email protected]>, 2014. -# Antoni Bella Pérez <[email protected]>, 2014. +# Antoni Bella Pérez <[email protected]>, 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 <[email protected]>\n" +"Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/po/da/kactivities5.po new/kactivities-5.6.0/po/da/kactivities5.po --- old/kactivities-5.5.0/po/da/kactivities5.po 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/po/da/kactivities5.po 2015-01-03 13:00:07.000000000 +0100 @@ -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 <[email protected]>, 2012, 2013. +# Martin Schlander <[email protected]>, 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 <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" "Language: da\n" @@ -26,15 +26,13 @@ msgstr "[email protected]" #: 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/po/gd/kactivities5.po new/kactivities-5.6.0/po/gd/kactivities5.po --- old/kactivities-5.5.0/po/gd/kactivities5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kactivities-5.6.0/po/gd/kactivities5.po 2015-01-03 13:00:07.000000000 +0100 @@ -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 <[email protected]>, 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 <[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: 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 "[email protected]" + +#: 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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/po/ru/kactivities5.po new/kactivities-5.6.0/po/ru/kactivities5.po --- old/kactivities-5.5.0/po/ru/kactivities5.po 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/po/ru/kactivities5.po 2015-01-03 13:00:07.000000000 +0100 @@ -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 <[email protected]>\n" "Language-Team: Russian <[email protected]>\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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/po/zh_CN/kactivities5.po new/kactivities-5.6.0/po/zh_CN/kactivities5.po --- old/kactivities-5.5.0/po/zh_CN/kactivities5.po 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/po/zh_CN/kactivities5.po 2015-01-03 13:00:07.000000000 +0100 @@ -1,15 +1,15 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Weng Xuetian <[email protected]>, 2013. +# Weng Xuetian <[email protected]>, 2013, 2014. # Feng Chao <[email protected]>, 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 <[email protected]>\n" +"PO-Revision-Date: 2014-12-18 16:58-0800\n" +"Last-Translator: Weng Xuetian <[email protected]>\n" "Language-Team: Chinese Simplified <[email protected]>\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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/imports/CMakeLists.txt new/kactivities-5.6.0/src/imports/CMakeLists.txt --- old/kactivities-5.5.0/src/imports/CMakeLists.txt 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/imports/CMakeLists.txt 2015-01-03 13:00:07.000000000 +0100 @@ -15,6 +15,7 @@ kactivities_imports_LIB_SRCS activitiesextensionplugin.cpp activitymodel.cpp + activityinfo.cpp resourcemodel.cpp ${CMAKE_SOURCE_DIR}/src/utils/dbusfuture_p.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/imports/README new/kactivities-5.6.0/src/imports/README --- old/kactivities-5.5.0/src/imports/README 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/imports/README 2015-01-03 13:00:07.000000000 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/imports/activitiesextensionplugin.cpp new/kactivities-5.6.0/src/imports/activitiesextensionplugin.cpp --- old/kactivities-5.5.0/src/imports/activitiesextensionplugin.cpp 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/imports/activitiesextensionplugin.cpp 2015-01-03 13:00:07.000000000 +0100 @@ -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"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/imports/activitiesextensionplugin.h new/kactivities-5.6.0/src/imports/activitiesextensionplugin.h --- old/kactivities-5.5.0/src/imports/activitiesextensionplugin.h 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/imports/activitiesextensionplugin.h 2015-01-03 13:00:07.000000000 +0100 @@ -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 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/imports/activityinfo.cpp new/kactivities-5.6.0/src/imports/activityinfo.cpp --- old/kactivities-5.5.0/src/imports/activityinfo.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kactivities-5.6.0/src/imports/activityinfo.cpp 2015-01-03 13:00:07.000000000 +0100 @@ -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" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/imports/activityinfo.h new/kactivities-5.6.0/src/imports/activityinfo.h --- old/kactivities-5.5.0/src/imports/activityinfo.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kactivities-5.6.0/src/imports/activityinfo.h 2015-01-03 13:00:07.000000000 +0100 @@ -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 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/imports/activitymodel.cpp new/kactivities-5.6.0/src/imports/activitymodel.cpp --- old/kactivities-5.5.0/src/imports/activitymodel.cpp 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/imports/activitymodel.cpp 2015-01-03 13:00:07.000000000 +0100 @@ -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" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/imports/activitymodel.h new/kactivities-5.6.0/src/imports/activitymodel.h --- old/kactivities-5.5.0/src/imports/activitymodel.h 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/imports/activitymodel.h 2015-01-03 13:00:07.000000000 +0100 @@ -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 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/imports/resourcemodel.cpp new/kactivities-5.6.0/src/imports/resourcemodel.cpp --- old/kactivities-5.5.0/src/imports/resourcemodel.cpp 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/imports/resourcemodel.cpp 2015-01-03 13:00:07.000000000 +0100 @@ -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" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/imports/resourcemodel.h new/kactivities-5.6.0/src/imports/resourcemodel.h --- old/kactivities-5.5.0/src/imports/resourcemodel.h 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/imports/resourcemodel.h 2015-01-03 13:00:07.000000000 +0100 @@ -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 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/imports/utils_p.h new/kactivities-5.6.0/src/imports/utils_p.h --- old/kactivities-5.5.0/src/imports/utils_p.h 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/imports/utils_p.h 2015-01-03 13:00:07.000000000 +0100 @@ -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 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/service/files/kactivitymanagerd-plugin.desktop new/kactivities-5.6.0/src/service/files/kactivitymanagerd-plugin.desktop --- old/kactivities-5.5.0/src/service/files/kactivitymanagerd-plugin.desktop 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/service/files/kactivitymanagerd-plugin.desktop 2015-01-03 13:00:07.000000000 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/service/files/kactivitymanagerd.desktop new/kactivities-5.6.0/src/service/files/kactivitymanagerd.desktop --- old/kactivities-5.5.0/src/service/files/kactivitymanagerd.desktop 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/service/files/kactivitymanagerd.desktop 2015-01-03 13:00:07.000000000 +0100 @@ -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ő @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/service/plugins/activitytemplates/kactivitymanagerd-plugin-activitytemplates.desktop new/kactivities-5.6.0/src/service/plugins/activitytemplates/kactivitymanagerd-plugin-activitytemplates.desktop --- old/kactivities-5.5.0/src/service/plugins/activitytemplates/kactivitymanagerd-plugin-activitytemplates.desktop 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/service/plugins/activitytemplates/kactivitymanagerd-plugin-activitytemplates.desktop 2015-01-03 13:00:07.000000000 +0100 @@ -4,11 +4,13 @@ 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 @@ -42,11 +44,13 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/service/plugins/globalshortcuts/kactivitymanagerd-plugin-globalshortcuts.desktop new/kactivities-5.6.0/src/service/plugins/globalshortcuts/kactivitymanagerd-plugin-globalshortcuts.desktop --- old/kactivities-5.5.0/src/service/plugins/globalshortcuts/kactivitymanagerd-plugin-globalshortcuts.desktop 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/service/plugins/globalshortcuts/kactivitymanagerd-plugin-globalshortcuts.desktop 2015-01-03 13:00:07.000000000 +0100 @@ -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,6 +64,7 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/service/plugins/slc/kactivitymanagerd-plugin-slc.desktop new/kactivities-5.6.0/src/service/plugins/slc/kactivitymanagerd-plugin-slc.desktop --- old/kactivities-5.5.0/src/service/plugins/slc/kactivitymanagerd-plugin-slc.desktop 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/service/plugins/slc/kactivitymanagerd-plugin-slc.desktop 2015-01-03 13:00:07.000000000 +0100 @@ -12,6 +12,7 @@ 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 @@ -58,6 +59,7 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/service/plugins/sqlite/Database.cpp new/kactivities-5.6.0/src/service/plugins/sqlite/Database.cpp --- old/kactivities-5.5.0/src/service/plugins/sqlite/Database.cpp 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/service/plugins/sqlite/Database.cpp 2015-01-03 13:00:07.000000000 +0100 @@ -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, " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/service/plugins/sqlite/ResourceLinking.cpp new/kactivities-5.6.0/src/service/plugins/sqlite/ResourceLinking.cpp --- old/kactivities-5.5.0/src/service/plugins/sqlite/ResourceLinking.cpp 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/service/plugins/sqlite/ResourceLinking.cpp 2015-01-03 13:00:07.000000000 +0100 @@ -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() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/service/plugins/sqlite/ResourceLinking.h new/kactivities-5.6.0/src/service/plugins/sqlite/ResourceLinking.h --- old/kactivities-5.5.0/src/service/plugins/sqlite/ResourceLinking.h 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/service/plugins/sqlite/ResourceLinking.h 2015-01-03 13:00:07.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2012 Ivan Cukic <[email protected]> + * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/service/plugins/sqlite/kactivitymanagerd-plugin-sqlite.desktop new/kactivities-5.6.0/src/service/plugins/sqlite/kactivitymanagerd-plugin-sqlite.desktop --- old/kactivities-5.5.0/src/service/plugins/sqlite/kactivitymanagerd-plugin-sqlite.desktop 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/service/plugins/sqlite/kactivitymanagerd-plugin-sqlite.desktop 2015-01-03 13:00:07.000000000 +0100 @@ -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,6 +61,7 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/service/plugins/virtualdesktopswitch/kactivitymanagerd-plugin-virtualdesktopswitch.desktop new/kactivities-5.6.0/src/service/plugins/virtualdesktopswitch/kactivitymanagerd-plugin-virtualdesktopswitch.desktop --- old/kactivities-5.5.0/src/service/plugins/virtualdesktopswitch/kactivitymanagerd-plugin-virtualdesktopswitch.desktop 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/service/plugins/virtualdesktopswitch/kactivitymanagerd-plugin-virtualdesktopswitch.desktop 2015-01-03 13:00:07.000000000 +0100 @@ -14,6 +14,7 @@ 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ó @@ -62,6 +63,7 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop new/kactivities-5.6.0/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop --- old/kactivities-5.5.0/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop 2015-01-03 13:00:07.000000000 +0100 @@ -14,6 +14,7 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/src/workspace/settings/kcm_activities.desktop new/kactivities-5.6.0/src/workspace/settings/kcm_activities.desktop --- old/kactivities-5.5.0/src/workspace/settings/kcm_activities.desktop 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/src/workspace/settings/kcm_activities.desktop 2015-01-03 13:00:07.000000000 +0100 @@ -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,6 +74,7 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/tests/imports/org.kde.listactivitiestest/metadata.desktop new/kactivities-5.6.0/tests/imports/org.kde.listactivitiestest/metadata.desktop --- old/kactivities-5.5.0/tests/imports/org.kde.listactivitiestest/metadata.desktop 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/tests/imports/org.kde.listactivitiestest/metadata.desktop 2015-01-03 13:00:07.000000000 +0100 @@ -4,11 +4,13 @@ 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 @@ -25,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]=Испробавање активности diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.5.0/tests/imports/plasma-applet-org.kde.listactivitiestest.desktop new/kactivities-5.6.0/tests/imports/plasma-applet-org.kde.listactivitiestest.desktop --- old/kactivities-5.5.0/tests/imports/plasma-applet-org.kde.listactivitiestest.desktop 2014-12-06 13:30:54.000000000 +0100 +++ new/kactivities-5.6.0/tests/imports/plasma-applet-org.kde.listactivitiestest.desktop 2015-01-03 13:00:07.000000000 +0100 @@ -3,11 +3,13 @@ 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 @@ -22,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]=Проба набрајања активности @@ -37,11 +40,13 @@ 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 @@ -56,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]=Чудно, али није сат -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
