diff -Nru kactivities-4.12.3/CMakeLists.txt kactivities-4.12.90/CMakeLists.txt --- kactivities-4.12.3/CMakeLists.txt 2014-02-09 08:16:39.000000000 +0000 +++ kactivities-4.12.90/CMakeLists.txt 2014-03-04 05:57:58.000000000 +0000 @@ -2,6 +2,7 @@ find_package (KDE4 REQUIRED) +include (GenerateExportHeader) include (KDE4Defaults) include (MacroLibrary) include (MacroOptionalAddSubdirectory) diff -Nru kactivities-4.12.3/debian/changelog kactivities-4.12.90/debian/changelog --- kactivities-4.12.3/debian/changelog 2014-03-04 19:28:24.000000000 +0000 +++ kactivities-4.12.90/debian/changelog 2014-03-19 10:35:48.000000000 +0000 @@ -1,3 +1,9 @@ +kactivities (4:4.12.90-0ubuntu1) trusty; urgency=medium + + * New upstream beta release + + -- Jonathan Riddell Wed, 19 Mar 2014 10:35:47 +0000 + kactivities (4:4.12.3-0ubuntu1) trusty; urgency=medium * New upstream bugfix release diff -Nru kactivities-4.12.3/debian/control kactivities-4.12.90/debian/control --- kactivities-4.12.3/debian/control 2014-03-04 19:28:24.000000000 +0000 +++ kactivities-4.12.90/debian/control 2014-03-19 10:35:48.000000000 +0000 @@ -9,7 +9,7 @@ Sune Vuorela Build-Depends: kde-sc-dev-latest (>= 4:4.10.1), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.15.4~), - kdelibs5-dev (>= 4:4.12.3), nepomuk-core-dev (>= 4:4.12.3), + kdelibs5-dev (>= 4:4.12.90), nepomuk-core-dev (>= 4:4.12.90), libsoprano-dev, shared-desktop-ontologies (>= 0.8.1), libx11-dev, diff -Nru kactivities-4.12.3/src/service/Activities.cpp kactivities-4.12.90/src/service/Activities.cpp --- kactivities-4.12.3/src/service/Activities.cpp 2014-02-09 08:16:39.000000000 +0000 +++ kactivities-4.12.90/src/service/Activities.cpp 2014-03-04 05:57:58.000000000 +0000 @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -173,6 +174,10 @@ QString Activities::AddActivity(const QString & name) { + if (!KAuthorized::authorize("plasma-desktop/add_activities")) { + return QString(); + } + if (name.isEmpty()) { Q_ASSERT(!name.isEmpty()); return QString(); @@ -204,6 +209,10 @@ void Activities::RemoveActivity(const QString & activity) { + if (!KAuthorized::authorize("plasma-desktop/add_activities")) { + return; + } + // Sanity checks if (!d->activities.contains(activity)) { return; diff -Nru kactivities-4.12.3/src/service/files/activitymanager-plugin.desktop kactivities-4.12.90/src/service/files/activitymanager-plugin.desktop --- kactivities-4.12.3/src/service/files/activitymanager-plugin.desktop 2014-02-09 08:16:39.000000000 +0000 +++ kactivities-4.12.90/src/service/files/activitymanager-plugin.desktop 2014-03-04 05:57:58.000000000 +0000 @@ -44,6 +44,7 @@ Comment[sr@ijekavianlatin]=Priključak menadžera aktivnosti Comment[sr@latin]=Priključak menadžera aktivnosti Comment[sv]=Insticksprogram för aktivitetshantering +Comment[tg]=Плагини мудири фаъолият Comment[tr]=Etkinlik yöneticisi eklentisi Comment[ug]=پائالىيەت باشقۇرغۇچ قىستۇرمىسى Comment[uk]=Додаток керування просторами дій diff -Nru kactivities-4.12.3/src/service/files/kactivitymanagerd.desktop kactivities-4.12.90/src/service/files/kactivitymanagerd.desktop --- kactivities-4.12.3/src/service/files/kactivitymanagerd.desktop 2014-02-09 08:16:39.000000000 +0000 +++ kactivities-4.12.90/src/service/files/kactivitymanagerd.desktop 2014-03-04 05:57:58.000000000 +0000 @@ -48,6 +48,7 @@ Name[sr@ijekavianlatin]=Menadžer aktivnosti Name[sr@latin]=Menadžer aktivnosti Name[sv]=Aktivitetshanterare +Name[tg]=Мудири фаъолият Name[tr]=Etkinlik Yöneticisi Name[ug]=پائالىيەت باشقۇرغۇچ Name[uk]=Керування просторами дій @@ -97,6 +98,7 @@ Comment[sr@ijekavianlatin]=Pozadina za upravljanje aktivnostima Comment[sr@latin]=Pozadina za upravljanje aktivnostima Comment[sv]=Gränssnittet för aktivitetshanteringen +Comment[tg]=Сервери идоракунии фаъолият Comment[tr]=Etkinlik yönetimi arkaucu Comment[ug]=پائالىيەت باشقۇرغۇچ ئارقا ئۇچى Comment[uk]=Сервер керування просторами дій diff -Nru kactivities-4.12.3/src/service/plugins/activityranking/activitymanager-plugin-activityranking.desktop kactivities-4.12.90/src/service/plugins/activityranking/activitymanager-plugin-activityranking.desktop --- kactivities-4.12.3/src/service/plugins/activityranking/activitymanager-plugin-activityranking.desktop 2014-02-09 08:16:39.000000000 +0000 +++ kactivities-4.12.90/src/service/plugins/activityranking/activitymanager-plugin-activityranking.desktop 2014-03-04 05:57:58.000000000 +0000 @@ -38,6 +38,7 @@ Name[sr@ijekavianlatin]=Rangiranje aktivnosti Name[sr@latin]=Rangiranje aktivnosti Name[sv]=Aktivitetsrankning +Name[tg]=Баҳодиҳии фаъолият Name[tr]=Etkinlik sıralaması Name[ug]=پائالىيەت قاتارى Name[uk]=Оцінювання просторів дій diff -Nru kactivities-4.12.3/src/service/plugins/globalshortcuts/activitymanager-plugin-globalshortcuts.desktop kactivities-4.12.90/src/service/plugins/globalshortcuts/activitymanager-plugin-globalshortcuts.desktop --- kactivities-4.12.3/src/service/plugins/globalshortcuts/activitymanager-plugin-globalshortcuts.desktop 2014-02-09 08:16:39.000000000 +0000 +++ kactivities-4.12.90/src/service/plugins/globalshortcuts/activitymanager-plugin-globalshortcuts.desktop 2014-03-04 05:57:58.000000000 +0000 @@ -39,6 +39,7 @@ Name[sr@ijekavianlatin]=Globalne prečice Name[sr@latin]=Globalne prečice Name[sv]=Globala genvägar +Name[tg]=Миёнбурҳои умумӣ Name[tr]=Genel Kısayollar Name[ug]=ئومۇمىيەت تېزلەتمە Name[uk]=Загальні клавіатурні скорочення diff -Nru kactivities-4.12.3/src/service/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop kactivities-4.12.90/src/service/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop --- kactivities-4.12.3/src/service/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop 2014-02-09 08:16:39.000000000 +0000 +++ kactivities-4.12.90/src/service/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop 2014-03-04 05:57:58.000000000 +0000 @@ -7,6 +7,7 @@ Name[de]=Nepomuk Feeder Name[el]=Τροφοδότης του Nepomuk Name[es]=Aprovisionamiento de Nepomuk +Name[et]=Nepomuki söötur Name[fi]=Nepomuk-syötteistin Name[fr]=Connecteur pour Nepomuk Name[gl]=Alimentador de Nepomuk @@ -34,6 +35,7 @@ Name[sr@ijekavianlatin]=Nepomukov uvodnik Name[sr@latin]=Nepomukov uvodnik Name[sv]=Nepomuk-inmatning +Name[tg]=Диҳандаи Nepomuk Name[tr]=Nepomuk Besleyici Name[ug]=Nepomuk Feeder Name[uk]=Додаток передавання даних Nepomuk @@ -49,6 +51,7 @@ Comment[de]=Modul zum Abgleichen von Daten in Nepomuk Comment[el]=Πρόσθετο συγχρονισμού γεγονότων με το Nepomuk Comment[es]=Complemento para sincronizar datos con Nepomuk +Comment[et]=Plugin andmete sünkroonimiseks Nepomukiga Comment[fi]=Liitännäinen tietojen synkronointiin Nepomukin kanssa Comment[fr]=Module externe de synchronisation de données avec Nepomuk Comment[gl]=Un complemento para sincronizar datos co Nepomuk @@ -63,7 +66,6 @@ Comment[nb]=Programtillegg for å synkronisere data med Nepomuk Comment[nds]=Moduul för't Synkroniseren vun Daten mit Nepomuk Comment[nl]=Plug-in om gegevens met Nepomuk te synchroniseren -Comment[pa]=ਨਿਪੋਮੁਕ ਵਿੱਚ ਡਾਟਾ ਸਿੰਕ ਕਰਨ ਲਈ ਪਲੱਗਇਨ Comment[pl]=Wtyczka do synchronizacji danych z Nepomukiem Comment[pt]='Plugin' para sincronizar os dados com o Nepomuk Comment[pt_BR]=Plugin para sincronizar os dados com o Nepomuk diff -Nru kactivities-4.12.3/src/service/plugins/sqlite/activitymanager-plugin-sqlite.desktop kactivities-4.12.90/src/service/plugins/sqlite/activitymanager-plugin-sqlite.desktop --- kactivities-4.12.3/src/service/plugins/sqlite/activitymanager-plugin-sqlite.desktop 2014-02-09 08:16:39.000000000 +0000 +++ kactivities-4.12.90/src/service/plugins/sqlite/activitymanager-plugin-sqlite.desktop 2014-03-04 05:57:58.000000000 +0000 @@ -38,6 +38,7 @@ Name[sr@ijekavianlatin]=SQLiteov uvodnik Name[sr@latin]=SQLiteov uvodnik Name[sv]=SQLite-inmatning +Name[tg]=Диҳандаи Sqlite Name[tr]=Sqlite Besleyicisi Name[ug]=Sqlite Feeder Name[uk]=Передавання даних Sqlite diff -Nru kactivities-4.12.3/src/service/plugins/virtualdesktopswitch/activitymanager-plugin-virtualdesktopswitch.desktop kactivities-4.12.90/src/service/plugins/virtualdesktopswitch/activitymanager-plugin-virtualdesktopswitch.desktop --- kactivities-4.12.3/src/service/plugins/virtualdesktopswitch/activitymanager-plugin-virtualdesktopswitch.desktop 2014-02-09 08:16:39.000000000 +0000 +++ kactivities-4.12.90/src/service/plugins/virtualdesktopswitch/activitymanager-plugin-virtualdesktopswitch.desktop 2014-03-04 05:57:58.000000000 +0000 @@ -38,6 +38,7 @@ Name[sr@ijekavianlatin]=Menjač virtuelnih površi Name[sr@latin]=Menjač virtuelnih površi Name[sv]=Byte av virtuellt skrivbord +Name[tg]=Васлкунандаи мизи кории виртуалӣ Name[tr]=Sanal masaüstü değiştirici Name[ug]=مەۋھۇم ئۈستەلئۈستى ئالماشتۇرغۇچ Name[uk]=Перемикач віртуальних стільниць diff -Nru kactivities-4.12.3/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop kactivities-4.12.90/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop --- kactivities-4.12.3/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop 2014-02-09 08:16:39.000000000 +0000 +++ kactivities-4.12.90/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop 2014-03-04 05:57:58.000000000 +0000 @@ -39,6 +39,7 @@ Name[sr@ijekavianlatin]=Fajl ka priključku povezivanja aktivnosti Name[sr@latin]=Fajl ka priključku povezivanja aktivnosti Name[sv]=Länkinsticksprogram från fil till aktivitet +Name[tg]=Файл барои плагини баҳодиҳии фаъолият Name[tr]=Etkinliğe dosya bağlama eklentisi Name[ug]=پائالىيەت ئۇلانما قىستۇرما ھۆججىتى Name[uk]=Додаток прив’язування файлів до просторів дій diff -Nru kactivities-4.12.3/src/workspace/settings/kcm_activities.desktop kactivities-4.12.90/src/workspace/settings/kcm_activities.desktop --- kactivities-4.12.3/src/workspace/settings/kcm_activities.desktop 2014-02-09 08:16:39.000000000 +0000 +++ kactivities-4.12.90/src/workspace/settings/kcm_activities.desktop 2014-03-04 05:57:58.000000000 +0000 @@ -50,6 +50,7 @@ Name[sr@ijekavianlatin]=Aktivnosti Name[sr@latin]=Aktivnosti Name[sv]=Aktiviteter +Name[tg]=Фаъолият Name[tr]=Etkinlikler Name[ug]=پائالىيەتلەر Name[uk]=Простори дій @@ -94,6 +95,7 @@ Comment[sr@ijekavianlatin]=Podesite sistem aktivnosti Comment[sr@latin]=Podesite sistem aktivnosti Comment[sv]=Anpassa aktivitetssystemet +Comment[tg]=Танзимоти системаи фаъолият Comment[tr]=Etkinlikler sistemini yapılandır Comment[ug]=پائالىيەت سىستېمىسىنى سەپلەيدۇ Comment[uk]=Налаштування системи просторів дій