From 41211c25368ae4c66481fec69b8c20fc88c016c4 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Wed, 8 Jun 2011 09:37:08 +0200 Subject: [PATCH 1/3] SVN_SILENT made messages (.desktop file) --- data/services/plasma.protocol | 1 + data/servicetypes/plasma-service.desktop | 1 + data/servicetypes/plasma-toolbox.desktop | 1 + .../plasma-containmentactions-test.desktop | 2 ++ 4 files changed, 5 insertions(+) diff --git a/data/services/plasma.protocol b/data/services/plasma.protocol index 7b9d10e32..6774d5245 100644 --- a/data/services/plasma.protocol +++ b/data/services/plasma.protocol @@ -10,6 +10,7 @@ Description=A protocol for Plasma services Description[bs]=Protokol Plazma usluga Description[ca]=Un protocol pels serveis del Plasma Description[ca@valencia]=Un protocol pels serveis del Plasma +Description[cs]=Protokol pro služby Plasma Description[da]=En protokol til Plasma-tjenester Description[es]=Un protocolo para los servicios de Plasma Description[et]=Plasma teenuste protokoll diff --git a/data/servicetypes/plasma-service.desktop b/data/servicetypes/plasma-service.desktop index d766fe654..d9f8d7381 100644 --- a/data/servicetypes/plasma-service.desktop +++ b/data/servicetypes/plasma-service.desktop @@ -21,6 +21,7 @@ Comment[hr]=Servis u Plasmi Comment[hu]=Plazma-szolgáltatás Comment[ia]=Servicio de Plasma Comment[is]=Plasma-þjónusta +Comment[it]=Servizio plasma Comment[ja]=Plasma サービス Comment[kk]=Plasma қызметі Comment[km]=សេវា​​ប្លាស្មា diff --git a/data/servicetypes/plasma-toolbox.desktop b/data/servicetypes/plasma-toolbox.desktop index c8b039207..93f2fae76 100644 --- a/data/servicetypes/plasma-toolbox.desktop +++ b/data/servicetypes/plasma-toolbox.desktop @@ -21,6 +21,7 @@ Comment[hr]=Plasma alatni okvir Comment[hu]=Plazma-eszközkészlet Comment[ia]=Instrumentario de Plasma Comment[is]=Plasma verkfærasafn +Comment[it]=Barra degli strumenti plasma Comment[ja]=Plasma ツールボックス Comment[kk]=Plasma құралдары Comment[km]=ប្រអប់​ឧបករណ៍​ប្លាស្មា diff --git a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop index b6ec52d0c..bdcb0c89b 100644 --- a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop +++ b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop @@ -19,6 +19,7 @@ Name[hr]=Test Name[hu]=Teszt Name[ia]=Essayo Name[is]=Prófun +Name[it]=Prova Name[ja]=テスト Name[kk]=Сынақ Name[km]=សាកល្បង @@ -69,6 +70,7 @@ Comment[hr]=Lažan priključak za testiranje Comment[hu]=Üres bővítmény teszteléshez Comment[ia]=Un plugin vacue pro essayar Comment[is]=Tilraunaíforrit fyrir prófanir +Comment[it]=Una estensione fittizia di prova Comment[ja]=テスト用のダミープラグイン Comment[kk]=Сынақ үшін бос плагині Comment[km]=កម្មវិធី​ជំនួយ​ដំបូង​សម្រាប់​សាកល្បង From 97af96221e2d108441994550c71b3de3265c13c3 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Wed, 8 Jun 2011 15:40:06 +0200 Subject: [PATCH 2/3] for 4.7 don't link to kdeclarative since kdeclarative is experimental, for 4.7 build it directly into libplasma instead of dynamically linking to it --- CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b79b95465..ed7f1cf2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -205,6 +205,15 @@ set(plasma_LIB_SRCS private/qtjolie-branch/qtjolie/pendingreply.cpp private/qtjolie-branch/qtjolie/server.cpp private/qtjolie-branch/qtjolie/serverthread.cpp + + #Temporary solution to not link to libkdeclarative + ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/kdeclarative.cpp + ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/private/engineaccess.cpp + ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/private/kiconprovider.cpp + ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/bindings/qscriptnonguibookkeeping.cpp + ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/bindings/i18n.cpp + ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/bindings/icon.cpp + ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative/bindings/url.cpp ) if(NOT KDE_NO_DEPRECATED) @@ -245,9 +254,10 @@ endif(PHONON_FOUND) kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS}) +#add kdeclarative after the 4.7 release target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} - ${KDE4_KDEUI_LIBS} kdnssd threadweaver kdeclarative ${PLASMA_EXTRA_LIBS}) + ${KDE4_KDEUI_LIBS} kdnssd threadweaver ${PLASMA_EXTRA_LIBS}) if(QCA2_FOUND) target_link_libraries(plasma ${QCA2_LIBRARIES}) From 72e0a4f9571dc377e4ce45b539891285affa8a79 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Thu, 9 Jun 2011 09:02:57 +0200 Subject: [PATCH 3/3] SVN_SILENT made messages (.desktop file) --- data/services/plasma.protocol | 1 + 1 file changed, 1 insertion(+) diff --git a/data/services/plasma.protocol b/data/services/plasma.protocol index 6774d5245..0e9d0daa5 100644 --- a/data/services/plasma.protocol +++ b/data/services/plasma.protocol @@ -26,6 +26,7 @@ Description[pt]=Um protocolo para os serviços do Plasma Description[pt_BR]=Protocolo para os serviços do Plasma Description[ro]=Un protocol pentru servicii Plasma Description[ru]=Протокол для служб Plasma +Description[sk]=Protokol pre Plasma služby Description[sv]=Ett protokoll för Plasma-tjänster Description[tr]=Plasma servisleri için bir protokol Description[uk]=Протокол для служб Плазми