Fix last commit

7 files changed, 97 insertions, 97 deletions

diff --git a/languages/cpp/app_templates/kde4app/README b/languages/cpp/app_templates/kde4app/README
index ccd1936c..8180d28c 100644
--- a/languages/cpp/app_templates/kde4app/README
+++ b/languages/cpp/app_templates/kde4app/README
@@ -1,15 +1,15 @@
 !!!!!ATTENTION!!!!!
 
-Before starting the build you may need to setup the KDE environment variables.
+Before starting the build you may need to setup the KDE4 environment variables.
 To do this open Project->Project Options and then look at the "Run" and the "Make" 
 pages. Each of these two has an environment variables widget in which you have
 to fill in the right values for the variables already listed.
 
 After setting up the variables you'll also need to run cmake inside the build
-directory. This can not be done by tdevelop as a KDE environment is needed
-when running cmake to find KDE. Open the integrated konsole and change to the build
-subdirectory. Then setup a KDE environment and run "cmake ../".
+directory. This can not be done by tdevelop as a KDE4 environment is needed
+when running cmake to find KDE4. Open the integrated konsole and change to the build
+subdirectory. Then setup a KDE4 environment and run "cmake ../".
 
-More information how to setup a KDE development environment can be found on
-http://techbase.kde.org/Getting_Started/Increased_Productivity_in_KDE_with_Scripts
+More information how to setup a KDE4 development environment can be found on
+http://techbase.kde.org/Getting_Started/Increased_Productivity_in_KDE4_with_Scripts
 
diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp
index 306ccd9d..bb91d42e 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.cpp
+++ b/languages/cpp/app_templates/kde4app/kapp4.cpp
@@ -14,7 +14,7 @@
 #include <kactioncollection.h>
 #include <kstandardaction.h>
 
-#include <TDE/KLocale>
+#include <KDE/KLocale>
 
 %{APPNAME}::%{APPNAME}()
     : KXmlGuiWindow(),
diff --git a/languages/cpp/app_templates/kde4app/kapp4.desktop b/languages/cpp/app_templates/kde4app/kapp4.desktop
index 5e503c5e..008fad44 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.desktop
+++ b/languages/cpp/app_templates/kde4app/kapp4.desktop
@@ -1,30 +1,30 @@
 [Desktop Entry]
 Name=KApp4
 Name[nds]=KProg4
-Name[sv]=TDE 4-program
+Name[sv]=KDE 4-program
 Name[zh_TW]=KApp4 程式
 Exec=kapp4 %i -caption "%c"
 Icon=kapp4
 Type=Application
 X-DocPath=kapp4/kapp4.html
-GenericName=A KDE Application
-GenericName[ca]=Una aplicació del KDE
-GenericName[da]=Et KDE-program
-GenericName[de]=Eine TDE 4-Anwendung
-GenericName[el]=Μία εφαρμογή του KDE
-GenericName[es]=Una aplicación para KDE
-GenericName[et]=KDE rakendus
-GenericName[hu]=KDE-alapú alkalmazás
-GenericName[it]=Applicazione KDE
-GenericName[nds]=En KDE-Programm
-GenericName[nl]=Een KDE-programma
-GenericName[pl]=Program dla KDE
-GenericName[pt]=Uma Aplicação do KDE
-GenericName[pt_BR]=Uma Aplicação do KDE
-GenericName[ru]=Приложение TDE 4
-GenericName[sk]=KDE aplikácia
-GenericName[sr]=KDE програм
-GenericName[sr@Latn]=KDE program
-GenericName[sv]=Ett TDE 4-program
-GenericName[zh_TW]=KDE 應用程式
+GenericName=A KDE4 Application
+GenericName[ca]=Una aplicació del KDE4
+GenericName[da]=Et KDE4-program
+GenericName[de]=Eine KDE 4-Anwendung
+GenericName[el]=Μία εφαρμογή του KDE4
+GenericName[es]=Una aplicación para KDE4
+GenericName[et]=KDE4 rakendus
+GenericName[hu]=KDE4-alapú alkalmazás
+GenericName[it]=Applicazione KDE4
+GenericName[nds]=En KDE4-Programm
+GenericName[nl]=Een KDE4-programma
+GenericName[pl]=Program dla KDE4
+GenericName[pt]=Uma Aplicação do KDE4
+GenericName[pt_BR]=Uma Aplicação do KDE4
+GenericName[ru]=Приложение KDE 4
+GenericName[sk]=KDE4 aplikácia
+GenericName[sr]=KDE4 програм
+GenericName[sr@Latn]=KDE4 program
+GenericName[sv]=Ett KDE 4-program
+GenericName[zh_TW]=KDE4 應用程式
 Terminal=false
diff --git a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt
index f9921f16..db1f4bab 100644
--- a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt
+++ b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt
@@ -1,7 +1,7 @@
 project(%{APPNAME})
-find_package(KDE REQUIRED)
-include (KDEDefaults)
-include_directories( ${KDE_INCLUDES} ${QT_INCLUDES} )
+find_package(KDE4 REQUIRED)
+include (KDE4Defaults)
+include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} )
 
 set(%{APPNAMELC}_SRCS
    %{APPNAMELC}.cpp
@@ -17,7 +17,7 @@ kde4_add_kcfg_files(%{APPNAMELC}_SRCS settings.kcfgc )
 
 kde4_add_executable(%{APPNAMELC} ${%{APPNAMELC}_SRCS})
 
-target_link_libraries(%{APPNAMELC} ${KDE_TDEUI_LIBS} )
+target_link_libraries(%{APPNAMELC} ${KDE4_TDEUI_LIBS} )
 
 install(TARGETS %{APPNAMELC} DESTINATION ${BIN_INSTALL_DIR} )
 
diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate b/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
index d9c200a1..1516e92e 100644
--- a/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
+++ b/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
@@ -1,47 +1,47 @@
-# TDE Config File
+# KDE Config File
 [General]
-Name=KDE Application framework
-Name[ca]=Entorn de treball d'aplicacions pel KDE
-Name[da]=KDE program-framework
-Name[de]=TDE 4-Anwendungsgrundgerüst
-Name[el]=Πλαίσιο εφαρμογής του KDE
-Name[es]=Infraestructura de aplicación para KDE
-Name[et]=KDE rakenduse raamistik
-Name[hu]=Keretrendszer KDE-alapú alkalmazáshoz
-Name[it]=Infrastruttura per applicazioni KDE
-Name[nds]=KDE-Programmrahmenwark
-Name[nl]=KDE-programmaframewerk
-Name[pl]=Szablon programu dla KDE
-Name[pt]=Plataforma de aplicações do KDE
-Name[pt_BR]=Plataforma de aplicações do KDE
-Name[ru]=Инструментарий для создания приложений TDE 4
-Name[sk]=KDE aplikačný framework
-Name[sr]=Радни оквир KDE програма
-Name[sr@Latn]=Radni okvir KDE programa
-Name[sv]=TDE 4-programramverk
-Name[zh_TW]=KDE 應用程式框架
+Name=KDE4 Application framework
+Name[ca]=Entorn de treball d'aplicacions pel KDE4
+Name[da]=KDE4 program-framework
+Name[de]=KDE 4-Anwendungsgrundgerüst
+Name[el]=Πλαίσιο εφαρμογής του KDE4
+Name[es]=Infraestructura de aplicación para KDE4
+Name[et]=KDE4 rakenduse raamistik
+Name[hu]=Keretrendszer KDE4-alapú alkalmazáshoz
+Name[it]=Infrastruttura per applicazioni KDE4
+Name[nds]=KDE4-Programmrahmenwark
+Name[nl]=KDE4-programmaframewerk
+Name[pl]=Szablon programu dla KDE4
+Name[pt]=Plataforma de aplicações do KDE4
+Name[pt_BR]=Plataforma de aplicações do KDE4
+Name[ru]=Инструментарий для создания приложений KDE 4
+Name[sk]=KDE4 aplikačný framework
+Name[sr]=Радни оквир KDE4 програма
+Name[sr@Latn]=Radni okvir KDE4 programa
+Name[sv]=KDE 4-programramverk
+Name[zh_TW]=KDE4 應用程式框架
 Icon=kde4app.png
-Category=C++/KDE
-Comment=Generates a simple KDE application with one toplevel window, menus and toolbars.
-Comment[ca]=Genera una aplicació senzilla per al KDE amb una finestra principal, menús i barres d'eines.
-Comment[da]=Genererer et simpelt KDE-program med et vindue på topniveau, menuer og værktøjslinjer.
-Comment[de]=Erstellt eine einfache TDE 4-Anwendung mit einem Toplevel-Fenster, Menüs und Werkzeugleisten.
-Comment[el]=Δημιουργεί μια απλή εφαρμογή του KDE με ένα ανώτερο παράθυρο, μενού, και γραμμές εργαλείων.
-Comment[es]=Genera una sencilla aplicación para KDE con una ventana principal, menús y barras de herramientas.
-Comment[et]=Lihtsa KDE rakenduse loomine ühe tipptaseme akna, menüüde ja tööriistaribadega.
-Comment[hu]=Létrehoz egy egyszerű KDE-alkalmazást egy főablakkal, menükkel és eszköztárakkal.
-Comment[it]=Genera una semplice applicazione KDE con una finestra toplevel, menu e barre degli strumenti.
-Comment[nds]=Stellt en eenfach KDE-Programm mit een böverst Finster, Menüs un Warktüüchbalkens op.
-Comment[nl]=Genereert een eenvoudig KDE-programma met een topniveauvenster, menu's en werkbalken.
-Comment[pl]=Generuje prosty program dla KDE posiadający okno, menu i paski narzędzi.
-Comment[pt]=Gera uma aplicação para KDE simples, com uma janela de topo, menus e barras de ferramentas.
-Comment[pt_BR]=Gera uma aplicação para KDE simples, com uma janela de topo, menus e barras de ferramentas.
-Comment[ru]=Создание простого приложения TDE 4 с одним окном верхнего уровня, меню и панелями инструментов.
-Comment[sk]=Vygeneruje jednoduchú KDE aplikáciu s jedným oknom, menu a panelom nástrojov.
-Comment[sr]=Прави једноставан KDE програм са једним прозором највишег нивоа, менијима и тракама са алатом.
-Comment[sr@Latn]=Pravi jednostavan KDE program sa jednim prozorom najvišeg nivoa, menijima i trakama sa alatom.
-Comment[sv]=Skapar ett enkelt TDE 4-program med ett toppnivåfönster, menyer och verktygsrader.
-Comment[zh_TW]=產生一個簡單的 KDE 應用程式，內含頂層視窗、選單與工具列。
+Category=C++/KDE4
+Comment=Generates a simple KDE4 application with one toplevel window, menus and toolbars.
+Comment[ca]=Genera una aplicació senzilla per al KDE4 amb una finestra principal, menús i barres d'eines.
+Comment[da]=Genererer et simpelt KDE4-program med et vindue på topniveau, menuer og værktøjslinjer.
+Comment[de]=Erstellt eine einfache KDE 4-Anwendung mit einem Toplevel-Fenster, Menüs und Werkzeugleisten.
+Comment[el]=Δημιουργεί μια απλή εφαρμογή του KDE4 με ένα ανώτερο παράθυρο, μενού, και γραμμές εργαλείων.
+Comment[es]=Genera una sencilla aplicación para KDE4 con una ventana principal, menús y barras de herramientas.
+Comment[et]=Lihtsa KDE4 rakenduse loomine ühe tipptaseme akna, menüüde ja tööriistaribadega.
+Comment[hu]=Létrehoz egy egyszerű KDE4-alkalmazást egy főablakkal, menükkel és eszköztárakkal.
+Comment[it]=Genera una semplice applicazione KDE4 con una finestra toplevel, menu e barre degli strumenti.
+Comment[nds]=Stellt en eenfach KDE4-Programm mit een böverst Finster, Menüs un Warktüüchbalkens op.
+Comment[nl]=Genereert een eenvoudig KDE4-programma met een topniveauvenster, menu's en werkbalken.
+Comment[pl]=Generuje prosty program dla KDE4 posiadający okno, menu i paski narzędzi.
+Comment[pt]=Gera uma aplicação para KDE4 simples, com uma janela de topo, menus e barras de ferramentas.
+Comment[pt_BR]=Gera uma aplicação para KDE4 simples, com uma janela de topo, menus e barras de ferramentas.
+Comment[ru]=Создание простого приложения KDE 4 с одним окном верхнего уровня, меню и панелями инструментов.
+Comment[sk]=Vygeneruje jednoduchú KDE4 aplikáciu s jedným oknom, menu a panelom nástrojov.
+Comment[sr]=Прави једноставан KDE4 програм са једним прозором највишег нивоа, менијима и тракама са алатом.
+Comment[sr@Latn]=Pravi jednostavan KDE4 program sa jednim prozorom najvišeg nivoa, menijima i trakama sa alatom.
+Comment[sv]=Skapar ett enkelt KDE 4-program med ett toppnivåfönster, menyer och verktygsrader.
+Comment[zh_TW]=產生一個簡單的 KDE4 應用程式，內含頂層視窗、選單與工具列。
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/README
 Archive=kde4app.tar.gz
@@ -133,23 +133,23 @@ Dir=%{dest}/build
 
 [MSG]
 Type=message
-Comment=A KDE Application was created at %{dest}
-Comment[ca]=S'ha creat una aplicació per al KDE a %{dest}
-Comment[da]=Et KDE-program blev oprettet i %{dest}
-Comment[de]=Eine TDE 4-Anwendung wurde in %{dest} erstellt.
-Comment[el]=Μια εφαρμογή KDE δημιουργήθηκε στο %{dest}
-Comment[es]=Una aplicación para KDE ha sido creada en %{dest}
-Comment[et]=KDE rakendus loodi asukohta %{dest}
-Comment[hu]=Létrejött egy KDE-alapú alkalmazás itt: %{dest}
-Comment[it]=È stata creata un'applicazione KDE in %{dest}
-Comment[nds]=In %{dest} wöör en KDE-Programm opstellt
-Comment[nl]=Een KDE-toepassing is aangemaakt in %{dest}
-Comment[pl]=Program dla KDE został utworzony w %{dest}
-Comment[pt]=Foi criada uma aplicação do KDE em %{dest}
-Comment[pt_BR]=Foi criada uma aplicação do KDE em %{dest}
-Comment[ru]=Приложение TDE 4 создано в %{dest}
-Comment[sk]=KDE aplikácia bola vytvorená v %{dest}
-Comment[sr]=KDE програм је направљен у %{dest}
-Comment[sr@Latn]=KDE program je napravljen u %{dest}
-Comment[sv]=Ett TDE 4-program skapades i %{dest}
-Comment[zh_TW]=一個 KDE 應用程式已建立於 %{dest}
+Comment=A KDE4 Application was created at %{dest}
+Comment[ca]=S'ha creat una aplicació per al KDE4 a %{dest}
+Comment[da]=Et KDE4-program blev oprettet i %{dest}
+Comment[de]=Eine KDE 4-Anwendung wurde in %{dest} erstellt.
+Comment[el]=Μια εφαρμογή KDE4 δημιουργήθηκε στο %{dest}
+Comment[es]=Una aplicación para KDE4 ha sido creada en %{dest}
+Comment[et]=KDE4 rakendus loodi asukohta %{dest}
+Comment[hu]=Létrejött egy KDE4-alapú alkalmazás itt: %{dest}
+Comment[it]=È stata creata un'applicazione KDE4 in %{dest}
+Comment[nds]=In %{dest} wöör en KDE4-Programm opstellt
+Comment[nl]=Een KDE4-toepassing is aangemaakt in %{dest}
+Comment[pl]=Program dla KDE4 został utworzony w %{dest}
+Comment[pt]=Foi criada uma aplicação do KDE4 em %{dest}
+Comment[pt_BR]=Foi criada uma aplicação do KDE4 em %{dest}
+Comment[ru]=Приложение KDE 4 создано в %{dest}
+Comment[sk]=KDE4 aplikácia bola vytvorená v %{dest}
+Comment[sr]=KDE4 програм је направљен у %{dest}
+Comment[sr@Latn]=KDE4 program je napravljen u %{dest}
+Comment[sv]=Ett KDE 4-program skapades i %{dest}
+Comment[zh_TW]=一個 KDE4 應用程式已建立於 %{dest}
diff --git a/languages/cpp/app_templates/kde4app/kde4app.tdevelop b/languages/cpp/app_templates/kde4app/kde4app.tdevelop
index 32dddf16..d332fa06 100644
--- a/languages/cpp/app_templates/kde4app/kde4app.tdevelop
+++ b/languages/cpp/app_templates/kde4app/kde4app.tdevelop
@@ -10,7 +10,7 @@
       <keyword>C++</keyword>
       <keyword>Code</keyword>
       <keyword>Qt</keyword>
-      <keyword>TDE</keyword>
+      <keyword>KDE</keyword>
     </keywords>
     <projectname>%{APPNAMELC}</projectname>
     <projectdirectory>.</projectdirectory>
diff --git a/languages/cpp/app_templates/kde4app/main.cpp b/languages/cpp/app_templates/kde4app/main.cpp
index 475a4e79..2bb5b6bf 100644
--- a/languages/cpp/app_templates/kde4app/main.cpp
+++ b/languages/cpp/app_templates/kde4app/main.cpp
@@ -4,10 +4,10 @@
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
-#include <TDE/KLocale>
+#include <KDE/KLocale>
 
 static const char description[] =
-    I18N_NOOP("A TDE 4 Application");
+    I18N_NOOP("A KDE 4 Application");
 
 static const char version[] = "%{VERSION}";