Merge branch 'master' into sebas/kplugins

2013-07-16 17:49:21 +02:00 · 2013-07-16 17:49:21 +02:00 · 668a1bc05e
commit 668a1bc05e
parent 0236f2657f 95870ffae2
11 changed files with 23 additions and 10 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -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:
 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
-                                            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)

 # those are not "done" yet:
-find_package(KCrash REQUIRED NO_MODULE)
-find_package(ktextwidgets REQUIRED NO_MODULE)
-find_package(ki18n REQUIRED NO_MODULE)
-find_package(kio REQUIRED NO_MODULE)
+find_package(Kio REQUIRED NO_MODULE)
 find_package(kdeclarative REQUIRED NO_MODULE)

 # Needed for some includes from KDE/ (KMimeType, etc.)
@ -122,6 +119,13 @@ set_package_properties(DBusMenuQt PROPERTIES DESCRIPTION "Support for notificati
                       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})
--- a/desktoptheme/air/metadata.desktop
+++ b/desktoptheme/air/metadata.desktop
@ -6,6 +6,7 @@ Name[es]=Aire
 Name[fi]=Air
 Name[fr]=Air
 Name[gl]=Air
+Name[hu]=Levegő
 Name[mr]=एअर
 Name[nl]=Air
 Name[pt]=Air
@ -20,6 +21,7 @@ Comment[de]=Ein Atemzug frische Luft
 Comment[es]=Una bocanada de aire fresco
 Comment[fi]=Raikkaan ilman leyhähdys
 Comment[fr]=Un souffle d'air frais
+Comment[hu]=Friss fuvallat
 Comment[mr]=शुद्ध हवेचा श्वास
 Comment[nl]=Een hap frisse lucht
 Comment[pt]=Uma brisa de ar fresco
--- a/desktoptheme/appdashboard/metadata.desktop
+++ b/desktoptheme/appdashboard/metadata.desktop
@ -5,6 +5,7 @@ Name[de]=Anwendungsübersicht
 Name[es]=Tablero de mandos de la aplicación
 Name[fi]=Sovelluskojelauta
 Name[fr]=Tableau de bord des applications
+Name[hu]=Alkalmazásáttekintő
 Name[mr]=अनुप्रयोग प्रक्षेपक
 Name[nl]=Toepassingendashboard
 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[fi]=Tarkoitettu oletussovelluskojelaudaksi
 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[nl]=Bedoelt als standaard in het toepassingendashboard
 Comment[pt]=Pretendido como predefinição do painel da aplicação
--- a/desktoptheme/oxygen/metadata.desktop
+++ b/desktoptheme/oxygen/metadata.desktop
@ -5,6 +5,7 @@ Name[de]=Oxygen
 Name[es]=Oxígeno
 Name[fi]=Oxygen
 Name[fr]=Oxygen
+Name[hu]=Oxigén
 Name[mr]=ऑक्सीजन
 Name[nl]=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[fi]=Oxygen-tyylinen teema
 Comment[fr]=Thème réalisé dans le style de Oxygen
+Comment[hu]=Oxygen-stílusú téma
 Comment[mr]=ऑक्सीजन शैली मध्ये शैली तयार केली
 Comment[nl]=Thema in Oxygen-stijl
 Comment[pt]=Um tema feito com o estilo Oxygen
--- a/src/kpart/plasma-kpart.desktop
+++ b/src/kpart/plasma-kpart.desktop
@ -5,6 +5,7 @@ Name[de]=plasma-kpart
 Name[es]=plasma-kpart
 Name[fi]=plasma-kpart
 Name[fr]=plasma-kpart
+Name[hu]=plasma-kpart
 Name[mr]=प्लाज्मा-kpart
 Name[nl]=plasma-kpart
 Name[pt]=plasma-kpart
--- a/src/plasma/CMakeLists.txt
+++ b/src/plasma/CMakeLists.txt
@ -30,8 +30,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                    ${CMAKE_CURRENT_BINARY_DIR}
                    ${KDE4_INCLUDE_DIR}
                    ${KDE4_INCLUDE_DIR}/KDE
-                    ${ki18n_SOURCE_DIR}/src
-                    ${ki18n_BINARY_DIR}/src
                    ${KDE4_INCLUDE_DIR}/kio
                    #FIXME: this will go into Qt upstream
                    ${CMAKE_INSTALL_PREFIX}/include/kdeqt5staging/
@ -149,7 +147,7 @@ target_link_libraries(plasma
    ${KAuth_LIBRARIES}
    ${KWindowSystem_LIBRARIES}
    ${PLASMA_EXTRA_LIBS}
-    ki18n
+    KI18n
    ${KDE4Support_LIBRARIES}
 )
 #FIXME gpgme++ is in kdepimlibs, neeeds to be elsewhere
--- a/src/plasma/autotests/data/signedPackage/metadata.desktop
+++ b/src/plasma/autotests/data/signedPackage/metadata.desktop
@ -5,6 +5,7 @@ Name[de]=JavaScript-Datei-Aktionen
 Name[es]=Operaciones de archivo JavaScript
 Name[fi]=JavaScript-tiedostotoiminnot
 Name[fr]=Opérations sur les fichiers JavaScript
+Name[hu]=JavaScript fájlműveletek
 Name[mr]=जावास्क्रिप्ट फाईलच्या क्रिया
 Name[nl]=Bestandsbewerkingen in JavaScript
 Name[pt]=Operações com Ficheiros em JavaScript
--- a/src/plasma/autotests/data/testpackage/metadata.desktop
+++ b/src/plasma/autotests/data/testpackage/metadata.desktop
@ -7,6 +7,7 @@ Name[de]=Test-Paket
 Name[es]=Paquete de pruebas
 Name[fi]=Testipaketti
 Name[fr]=Paquet de test
+Name[hu]=Teszt csomag
 Name[mr]=चाचणी पॅकेज
 Name[nl]=Testpakket
 Name[pt]=Pacote de Teste
--- a/src/plasma/data/servicetypes/plasma-applet.desktop
+++ b/src/plasma/data/servicetypes/plasma-applet.desktop
@ -8,6 +8,7 @@ Comment[de]=Plasma-Miniprogramm
 Comment[es]=Miniaplicación para Plasma
 Comment[fi]=Plasma-sovelma
 Comment[fr]=Applet Plasma
+Comment[hu]=Plasma kisalkalmazás
 Comment[mr]=प्लाज्मा एप्लेट
 Comment[nl]=Plasma-applet
 Comment[pt]='Applet' do Plasma
--- a/src/plasma/data/servicetypes/plasma-containment.desktop
+++ b/src/plasma/data/servicetypes/plasma-containment.desktop
@ -6,6 +6,7 @@ Comment=Plasma applet container and background painter
 Comment[cs]=Kontejner apletů a vykreslovač pozadí Plasma
 Comment[de]=Plasma-Programmcontainer und Hintergrund-Zeichnung
 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[nl]=Container voor plasma-applets en achtergrondinvulling
 Comment[pt]=Contentor de 'applets' do Plasma e pintor do fundo
--- a/src/plasma/runnercontext.cpp
+++ b/src/plasma/runnercontext.cpp
@ -35,7 +35,7 @@
 #include <kshell.h>
 #include <qstandardpaths.h>
 #include <qurl.h>
-#include <kio/kprotocolinfo.h>
+#include <kprotocolinfo.h>

 #include "abstractrunner.h"
 #include "querymatch.h"