Merge branch 'master' into sebas/kplugins
This commit is contained in:
commit
668a1bc05e
|
@ -56,16 +56,13 @@ find_package(kdeqt5staging REQUIRED NO_MODULE)
|
||||||
|
|
||||||
# Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1/tier2 libs from kdelibs:
|
# Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1/tier2 libs from kdelibs:
|
||||||
find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
|
find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
|
||||||
XmlGui KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver
|
KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver
|
||||||
KConfig KAuth kjs KWallet KDBusAddons
|
KConfig KAuth kjs KWallet KDBusAddons
|
||||||
ki18n kguiaddons kservice kwidgets ItemViews KNotifications KIconThemes KCompletion KJobWidgets KConfigWidgets Sonnet)
|
KI18n KGuiAddons KService KWidgets ItemViews KNotifications KIconThemes KCompletion KJobWidgets KConfigWidgets Sonnet KTextWidgets XmlGui KCrash)
|
||||||
#find_package(KF5Transitional REQUIRED)
|
#find_package(KF5Transitional REQUIRED)
|
||||||
|
|
||||||
# those are not "done" yet:
|
# those are not "done" yet:
|
||||||
find_package(KCrash REQUIRED NO_MODULE)
|
find_package(Kio REQUIRED NO_MODULE)
|
||||||
find_package(ktextwidgets REQUIRED NO_MODULE)
|
|
||||||
find_package(ki18n REQUIRED NO_MODULE)
|
|
||||||
find_package(kio REQUIRED NO_MODULE)
|
|
||||||
find_package(kdeclarative REQUIRED NO_MODULE)
|
find_package(kdeclarative REQUIRED NO_MODULE)
|
||||||
|
|
||||||
# Needed for some includes from KDE/ (KMimeType, etc.)
|
# Needed for some includes from KDE/ (KMimeType, etc.)
|
||||||
|
@ -122,6 +119,13 @@ set_package_properties(DBusMenuQt PROPERTIES DESCRIPTION "Support for notificati
|
||||||
TYPE REQUIRED
|
TYPE REQUIRED
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# TODO remove it in future
|
||||||
|
find_package(LibAttica NO_MODULE)
|
||||||
|
set_package_properties(LibAttica PROPERTIES DESCRIPTION "Support for Get Hot New Stuff related stuff"
|
||||||
|
URL "https://projects.kde.org/attica"
|
||||||
|
TYPE REQUIRED
|
||||||
|
)
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
|
||||||
#add_definitions(${KDE4_DEFINITIONS})
|
#add_definitions(${KDE4_DEFINITIONS})
|
||||||
|
|
|
@ -6,6 +6,7 @@ Name[es]=Aire
|
||||||
Name[fi]=Air
|
Name[fi]=Air
|
||||||
Name[fr]=Air
|
Name[fr]=Air
|
||||||
Name[gl]=Air
|
Name[gl]=Air
|
||||||
|
Name[hu]=Levegő
|
||||||
Name[mr]=एअर
|
Name[mr]=एअर
|
||||||
Name[nl]=Air
|
Name[nl]=Air
|
||||||
Name[pt]=Air
|
Name[pt]=Air
|
||||||
|
@ -20,6 +21,7 @@ Comment[de]=Ein Atemzug frische Luft
|
||||||
Comment[es]=Una bocanada de aire fresco
|
Comment[es]=Una bocanada de aire fresco
|
||||||
Comment[fi]=Raikkaan ilman leyhähdys
|
Comment[fi]=Raikkaan ilman leyhähdys
|
||||||
Comment[fr]=Un souffle d'air frais
|
Comment[fr]=Un souffle d'air frais
|
||||||
|
Comment[hu]=Friss fuvallat
|
||||||
Comment[mr]=शुद्ध हवेचा श्वास
|
Comment[mr]=शुद्ध हवेचा श्वास
|
||||||
Comment[nl]=Een hap frisse lucht
|
Comment[nl]=Een hap frisse lucht
|
||||||
Comment[pt]=Uma brisa de ar fresco
|
Comment[pt]=Uma brisa de ar fresco
|
||||||
|
|
|
@ -5,6 +5,7 @@ Name[de]=Anwendungsübersicht
|
||||||
Name[es]=Tablero de mandos de la aplicación
|
Name[es]=Tablero de mandos de la aplicación
|
||||||
Name[fi]=Sovelluskojelauta
|
Name[fi]=Sovelluskojelauta
|
||||||
Name[fr]=Tableau de bord des applications
|
Name[fr]=Tableau de bord des applications
|
||||||
|
Name[hu]=Alkalmazásáttekintő
|
||||||
Name[mr]=अनुप्रयोग प्रक्षेपक
|
Name[mr]=अनुप्रयोग प्रक्षेपक
|
||||||
Name[nl]=Toepassingendashboard
|
Name[nl]=Toepassingendashboard
|
||||||
Name[pt]=Painel da aplicação
|
Name[pt]=Painel da aplicação
|
||||||
|
@ -19,6 +20,7 @@ Comment[de]=Als Voreinstellung für Anwendungsübersicht angedacht
|
||||||
Comment[es]=Pensado como tablero de mandos por omisión de la aplicación
|
Comment[es]=Pensado como tablero de mandos por omisión de la aplicación
|
||||||
Comment[fi]=Tarkoitettu oletussovelluskojelaudaksi
|
Comment[fi]=Tarkoitettu oletussovelluskojelaudaksi
|
||||||
Comment[fr]=Prévu comme tableau de bord des applications par défaut
|
Comment[fr]=Prévu comme tableau de bord des applications par défaut
|
||||||
|
Comment[hu]=Alapértelmezésként alkalmazásáttekintőnek tervezett
|
||||||
Comment[mr]=अनुप्रयोग प्रक्षेपकास अभिप्रेत मूलभूत
|
Comment[mr]=अनुप्रयोग प्रक्षेपकास अभिप्रेत मूलभूत
|
||||||
Comment[nl]=Bedoelt als standaard in het toepassingendashboard
|
Comment[nl]=Bedoelt als standaard in het toepassingendashboard
|
||||||
Comment[pt]=Pretendido como predefinição do painel da aplicação
|
Comment[pt]=Pretendido como predefinição do painel da aplicação
|
||||||
|
|
|
@ -5,6 +5,7 @@ Name[de]=Oxygen
|
||||||
Name[es]=Oxígeno
|
Name[es]=Oxígeno
|
||||||
Name[fi]=Oxygen
|
Name[fi]=Oxygen
|
||||||
Name[fr]=Oxygen
|
Name[fr]=Oxygen
|
||||||
|
Name[hu]=Oxigén
|
||||||
Name[mr]=ऑक्सीजन
|
Name[mr]=ऑक्सीजन
|
||||||
Name[nl]=Oxygen
|
Name[nl]=Oxygen
|
||||||
Name[pt]=Oxygen
|
Name[pt]=Oxygen
|
||||||
|
@ -19,6 +20,7 @@ Comment[de]=Oberflächen-Design im Oxygen-Stil
|
||||||
Comment[es]=Tema realizado al estilo de Oxígeno
|
Comment[es]=Tema realizado al estilo de Oxígeno
|
||||||
Comment[fi]=Oxygen-tyylinen teema
|
Comment[fi]=Oxygen-tyylinen teema
|
||||||
Comment[fr]=Thème réalisé dans le style de Oxygen
|
Comment[fr]=Thème réalisé dans le style de Oxygen
|
||||||
|
Comment[hu]=Oxygen-stílusú téma
|
||||||
Comment[mr]=ऑक्सीजन शैली मध्ये शैली तयार केली
|
Comment[mr]=ऑक्सीजन शैली मध्ये शैली तयार केली
|
||||||
Comment[nl]=Thema in Oxygen-stijl
|
Comment[nl]=Thema in Oxygen-stijl
|
||||||
Comment[pt]=Um tema feito com o estilo Oxygen
|
Comment[pt]=Um tema feito com o estilo Oxygen
|
||||||
|
|
|
@ -5,6 +5,7 @@ Name[de]=plasma-kpart
|
||||||
Name[es]=plasma-kpart
|
Name[es]=plasma-kpart
|
||||||
Name[fi]=plasma-kpart
|
Name[fi]=plasma-kpart
|
||||||
Name[fr]=plasma-kpart
|
Name[fr]=plasma-kpart
|
||||||
|
Name[hu]=plasma-kpart
|
||||||
Name[mr]=प्लाज्मा-kpart
|
Name[mr]=प्लाज्मा-kpart
|
||||||
Name[nl]=plasma-kpart
|
Name[nl]=plasma-kpart
|
||||||
Name[pt]=plasma-kpart
|
Name[pt]=plasma-kpart
|
||||||
|
|
|
@ -30,8 +30,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
${KDE4_INCLUDE_DIR}
|
${KDE4_INCLUDE_DIR}
|
||||||
${KDE4_INCLUDE_DIR}/KDE
|
${KDE4_INCLUDE_DIR}/KDE
|
||||||
${ki18n_SOURCE_DIR}/src
|
|
||||||
${ki18n_BINARY_DIR}/src
|
|
||||||
${KDE4_INCLUDE_DIR}/kio
|
${KDE4_INCLUDE_DIR}/kio
|
||||||
#FIXME: this will go into Qt upstream
|
#FIXME: this will go into Qt upstream
|
||||||
${CMAKE_INSTALL_PREFIX}/include/kdeqt5staging/
|
${CMAKE_INSTALL_PREFIX}/include/kdeqt5staging/
|
||||||
|
@ -149,7 +147,7 @@ target_link_libraries(plasma
|
||||||
${KAuth_LIBRARIES}
|
${KAuth_LIBRARIES}
|
||||||
${KWindowSystem_LIBRARIES}
|
${KWindowSystem_LIBRARIES}
|
||||||
${PLASMA_EXTRA_LIBS}
|
${PLASMA_EXTRA_LIBS}
|
||||||
ki18n
|
KI18n
|
||||||
${KDE4Support_LIBRARIES}
|
${KDE4Support_LIBRARIES}
|
||||||
)
|
)
|
||||||
#FIXME gpgme++ is in kdepimlibs, neeeds to be elsewhere
|
#FIXME gpgme++ is in kdepimlibs, neeeds to be elsewhere
|
||||||
|
|
|
@ -5,6 +5,7 @@ Name[de]=JavaScript-Datei-Aktionen
|
||||||
Name[es]=Operaciones de archivo JavaScript
|
Name[es]=Operaciones de archivo JavaScript
|
||||||
Name[fi]=JavaScript-tiedostotoiminnot
|
Name[fi]=JavaScript-tiedostotoiminnot
|
||||||
Name[fr]=Opérations sur les fichiers JavaScript
|
Name[fr]=Opérations sur les fichiers JavaScript
|
||||||
|
Name[hu]=JavaScript fájlműveletek
|
||||||
Name[mr]=जावास्क्रिप्ट फाईलच्या क्रिया
|
Name[mr]=जावास्क्रिप्ट फाईलच्या क्रिया
|
||||||
Name[nl]=Bestandsbewerkingen in JavaScript
|
Name[nl]=Bestandsbewerkingen in JavaScript
|
||||||
Name[pt]=Operações com Ficheiros em JavaScript
|
Name[pt]=Operações com Ficheiros em JavaScript
|
||||||
|
|
|
@ -7,6 +7,7 @@ Name[de]=Test-Paket
|
||||||
Name[es]=Paquete de pruebas
|
Name[es]=Paquete de pruebas
|
||||||
Name[fi]=Testipaketti
|
Name[fi]=Testipaketti
|
||||||
Name[fr]=Paquet de test
|
Name[fr]=Paquet de test
|
||||||
|
Name[hu]=Teszt csomag
|
||||||
Name[mr]=चाचणी पॅकेज
|
Name[mr]=चाचणी पॅकेज
|
||||||
Name[nl]=Testpakket
|
Name[nl]=Testpakket
|
||||||
Name[pt]=Pacote de Teste
|
Name[pt]=Pacote de Teste
|
||||||
|
|
|
@ -8,6 +8,7 @@ Comment[de]=Plasma-Miniprogramm
|
||||||
Comment[es]=Miniaplicación para Plasma
|
Comment[es]=Miniaplicación para Plasma
|
||||||
Comment[fi]=Plasma-sovelma
|
Comment[fi]=Plasma-sovelma
|
||||||
Comment[fr]=Applet Plasma
|
Comment[fr]=Applet Plasma
|
||||||
|
Comment[hu]=Plasma kisalkalmazás
|
||||||
Comment[mr]=प्लाज्मा एप्लेट
|
Comment[mr]=प्लाज्मा एप्लेट
|
||||||
Comment[nl]=Plasma-applet
|
Comment[nl]=Plasma-applet
|
||||||
Comment[pt]='Applet' do Plasma
|
Comment[pt]='Applet' do Plasma
|
||||||
|
|
|
@ -6,6 +6,7 @@ Comment=Plasma applet container and background painter
|
||||||
Comment[cs]=Kontejner apletů a vykreslovač pozadí Plasma
|
Comment[cs]=Kontejner apletů a vykreslovač pozadí Plasma
|
||||||
Comment[de]=Plasma-Programmcontainer und Hintergrund-Zeichnung
|
Comment[de]=Plasma-Programmcontainer und Hintergrund-Zeichnung
|
||||||
Comment[fr]=Conteneur d'applets Plasma et décor d'arrière-plan
|
Comment[fr]=Conteneur d'applets Plasma et décor d'arrière-plan
|
||||||
|
Comment[hu]=Tároló Plasma-kisalkalmazásokhoz és háttérrajzoló
|
||||||
Comment[mr]=प्लाज्मा एप्लेट कंटेनर व बेकग्राउंड पेंटर
|
Comment[mr]=प्लाज्मा एप्लेट कंटेनर व बेकग्राउंड पेंटर
|
||||||
Comment[nl]=Container voor plasma-applets en achtergrondinvulling
|
Comment[nl]=Container voor plasma-applets en achtergrondinvulling
|
||||||
Comment[pt]=Contentor de 'applets' do Plasma e pintor do fundo
|
Comment[pt]=Contentor de 'applets' do Plasma e pintor do fundo
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include <kshell.h>
|
#include <kshell.h>
|
||||||
#include <qstandardpaths.h>
|
#include <qstandardpaths.h>
|
||||||
#include <qurl.h>
|
#include <qurl.h>
|
||||||
#include <kio/kprotocolinfo.h>
|
#include <kprotocolinfo.h>
|
||||||
|
|
||||||
#include "abstractrunner.h"
|
#include "abstractrunner.h"
|
||||||
#include "querymatch.h"
|
#include "querymatch.h"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user