diff --git a/examples/developerguide/basic/metadata.desktop b/examples/developerguide/basic/metadata.desktop
index d6d8c405a..bbee55926 100644
--- a/examples/developerguide/basic/metadata.desktop
+++ b/examples/developerguide/basic/metadata.desktop
@@ -1,94 +1,94 @@
 [Desktop Entry]
 Comment=Basic App
 Comment[ar]=تطبيق أساسيّ
 Comment[ast]=Aplicación básica
 Comment[ca]=Aplicació bàsica
 Comment[ca@valencia]=Aplicació bàsica
 Comment[da]=Basal app
 Comment[de]=Einfache Anwendung
 Comment[en_GB]=Basic App
 Comment[es]=Aplicación básica
 Comment[et]=Lihtrakendus
 Comment[eu]=Oinarrizko aplikazioa
 Comment[fi]=Perussovellus
 Comment[fr]=Application basique
 Comment[gd]=Aplacaid bhunaiteach
-Comment[gl]=Programa básico
+Comment[gl]=Aplicativo básico
 Comment[ia]=App Basic
 Comment[it]=Applicazione di base
 Comment[ko]=기본 앱
 Comment[nl]=Basis app
 Comment[nn]=Grunnleggjande program
 Comment[pl]=Podstawowa aplikacja
 Comment[pt]=Aplicação Básica
 Comment[pt_BR]=Aplicativo básico
 Comment[ru]=Простейшее приложение
 Comment[sk]=Základná aplikácia
 Comment[sl]=Osnovni program
 Comment[sr]=Основни програм
 Comment[sr@ijekavian]=Основни програм
 Comment[sr@ijekavianlatin]=Osnovni program
 Comment[sr@latin]=Osnovni program
 Comment[sv]=Enkel applikation
 Comment[tr]=Temel Uygulama
 Comment[uk]=Базова програма
 Comment[x-test]=xxBasic Appxx
 Comment[zh_CN]=基础小程序
 Comment[zh_TW]=基本應用程式
 Name=Bug
 Name[ar]=علّة
 Name[ca]=Error
 Name[ca@valencia]=Error
 Name[cs]=Chyba
 Name[da]=Programfejl
 Name[de]=Fehler
 Name[en_GB]=Bug
 Name[es]=Fallo
 Name[et]=Viga
 Name[eu]=Akatsa
 Name[fi]=Vika
 Name[fr]=Bogue
 Name[gd]=Buga
 Name[gl]=Erro
 Name[hu]=Hiba
 Name[ia]=Bug
 Name[it]=Bug
 Name[ko]=버그
 Name[lt]=Vabalas
 Name[nb]=Feil
 Name[nds]=Fehler
 Name[nl]=Bug
 Name[nn]=Feil
 Name[pa]=ਬੱਗ
 Name[pl]=Błąd
 Name[pt]=Insecto
 Name[pt_BR]=Erro
 Name[ru]=Ошибка
 Name[sk]=Chyba
 Name[sl]=Hrošč
 Name[sr]=Грешка
 Name[sr@ijekavian]=Грешка
 Name[sr@ijekavianlatin]=Greška
 Name[sr@latin]=Greška
 Name[sv]=Fel
 Name[tr]=Hata
 Name[uk]=Вада
 Name[x-test]=xxBugxx
 Name[zh_CN]=臭虫
 Name[zh_TW]=錯誤
 Icon=kbugbuster
 
 Type=Application
 Exec=kpackagelauncherqml -a org.kde.example.developerguide.basic %u
 
 X-KDE-PluginInfo-Author=Sebastian Kügler
 X-KDE-PluginInfo-Category=Development
 X-KDE-PluginInfo-Email=sebas@kde.org
 X-KDE-PluginInfo-License=LGPLv2+
 X-KDE-PluginInfo-Name=org.kde.example.developerguide.basic
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-Website=http://www.kde.org
 X-KDE-ServiceTypes=KPackage/GenericQML
 
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/main.qml
diff --git a/templates/cpp-plasmoid/src/package/metadata.desktop b/templates/cpp-plasmoid/src/package/metadata.desktop
index cbb1a0ec1..9925a3f32 100644
--- a/templates/cpp-plasmoid/src/package/metadata.desktop
+++ b/templates/cpp-plasmoid/src/package/metadata.desktop
@@ -1,97 +1,97 @@
 [Desktop Entry]
 Name=%{APPNAME}
 Name[ar]=%{APPNAME}
 Name[ast]=%{APPNAME}
 Name[ca]=%{APPNAME}
 Name[ca@valencia]=%{APPNAME}
 Name[cs]=%{APPNAME}
 Name[da]=%{APPNAME}
 Name[de]=%{APPNAME}
 Name[en_GB]=%{APPNAME}
 Name[es]=%{APPNAME}
 Name[et]=%{APPNAME}
 Name[eu]=%{APPNAME}
 Name[fi]=%{APPNAME}
 Name[fr]=%{APPNAME}
 Name[gd]=%{APPNAME}
 Name[gl]=%{APPNAME}
 Name[ia]=%{APPNAME}
 Name[it]=%{APPNAME}
 Name[ko]=%{APPNAME}
 Name[nb]=%{APPNAME}
 Name[nl]=%{APPNAME}
 Name[nn]=%{APPNAME}
 Name[pl]=%{APPNAME}
 Name[pt]=%{APPNAME}
 Name[pt_BR]=%{APPNAME}
 Name[ru]=%{APPNAME}
 Name[sk]=%{APPNAME}
 Name[sl]=%{APPNAME}
 Name[sr]=%{APPNAME}
 Name[sr@ijekavian]=%{APPNAME}
 Name[sr@ijekavianlatin]=%{APPNAME}
 Name[sr@latin]=%{APPNAME}
 Name[sv]=%{APPNAME}
 Name[tr]=%{APPNAME}
 Name[uk]=%{APPNAME}
 Name[x-test]=xx%{APPNAME}xx
 Name[zh_CN]=%{APPNAME}
 Name[zh_TW]=%{APPNAME}
 Comment=what your app does in a few words
 Comment[ar]=ما يفعله تطبيقك ببضع كلمات
 Comment[ast]=lo que fai la to aplicación nunes pallabres
 Comment[ca]=Què fa aquesta aplicació en poques paraules
 Comment[ca@valencia]=Què fa esta aplicació en poques paraules
 Comment[da]=nogle få ord om hvad din app gør
 Comment[de]=In ein paar Worten, was Ihre Anwendung tut
 Comment[en_GB]=what your app does in a few words
 Comment[es]=lo que hace su aplicación, en pocas palabras
 Comment[et]=Mõne sõnaga, mida rakendus teeb
 Comment[eu]=zure aplikazioak egiten duena hitz gutxitan
 Comment[fi]=ohjelmasi toiminta muutamalla sanalla
 Comment[fr]=que fait votre application en quelques mots
 Comment[gd]=na nì an aplacaid agad ann am beagan fhaclan
-Comment[gl]=o que fai o seu programa en poucas palabras
+Comment[gl]=o que fai o seu aplicativo en poucas palabras
 Comment[ia]=cosa tu app face in pauc parolas
 Comment[it]=Cosa fa la tua applicazione in poche parole
 Comment[ko]=프로그램이 하는 일에 대한 간단한 설명
 Comment[nb]=hva programmet gjør, med noen få ord
 Comment[nl]=wat uw app doet in een paar woorden
 Comment[nn]=nokre få ord om kva programmet gjer
 Comment[pl]=w kilku słowach opis co robi twój program
 Comment[pt]=o que faz a sua aplicação, em poucas palavras
 Comment[pt_BR]=breve descrição do que o seu aplicativo faz
 Comment[ru]=Несколько слов о том, что делает ваша программа
 Comment[sk]=čo vaša aplikácia robí v niekoľkých slovách
 Comment[sl]=kaj vaš program dela, v nekaj besedah
 Comment[sr]=Укратко о томе шта ваш програм ради
 Comment[sr@ijekavian]=Укратко о томе шта ваш програм ради
 Comment[sr@ijekavianlatin]=Ukratko o tome šta vaš program radi
 Comment[sr@latin]=Ukratko o tome šta vaš program radi
 Comment[sv]=vad programmet gör med några få ord
 Comment[tr]=uygulamanızın yaptığı şey, birkaç sözcükte
 Comment[uk]=призначення вашої програми у декількох словах
 Comment[x-test]=xxwhat your app does in a few wordsxx
 Comment[zh_CN]=简单几个词概括您的小程序的功能
 Comment[zh_TW]=以數個字描述您的應用程式的用途
 
 
 Icon=applications-system
 Type=Service
 ServiceTypes=Plasma/Applet
 
 X-KDE-Library=plasma_applet_%{APPNAMELC}
 X-KDE-PluginInfo-Author=%{AUTHOR}
 X-KDE-PluginInfo-Email=%{EMAIL}
 X-KDE-PluginInfo-Name=%{APPNAMELC}
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-Website=http://plasma.kde.org/
 X-KDE-PluginInfo-Category=Utilities
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-PluginInfo-Name=org.kde.%{APPNAMELC}
 
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/main.qml
 
diff --git a/templates/qml-plasmoid-with-qml-extension/package/metadata.desktop b/templates/qml-plasmoid-with-qml-extension/package/metadata.desktop
index 79bb1bab8..6e8ed6432 100644
--- a/templates/qml-plasmoid-with-qml-extension/package/metadata.desktop
+++ b/templates/qml-plasmoid-with-qml-extension/package/metadata.desktop
@@ -1,97 +1,97 @@
 [Desktop Entry]
 Name=%{APPNAME}
 Name[ar]=%{APPNAME}
 Name[ast]=%{APPNAME}
 Name[ca]=%{APPNAME}
 Name[ca@valencia]=%{APPNAME}
 Name[cs]=%{APPNAME}
 Name[da]=%{APPNAME}
 Name[de]=%{APPNAME}
 Name[en_GB]=%{APPNAME}
 Name[es]=%{APPNAME}
 Name[et]=%{APPNAME}
 Name[eu]=%{APPNAME}
 Name[fi]=%{APPNAME}
 Name[fr]=%{APPNAME}
 Name[gd]=%{APPNAME}
 Name[gl]=%{APPNAME}
 Name[ia]=%{APPNAME}
 Name[it]=%{APPNAME}
 Name[ko]=%{APPNAME}
 Name[nb]=%{APPNAME}
 Name[nl]=%{APPNAME}
 Name[nn]=%{APPNAME}
 Name[pl]=%{APPNAME}
 Name[pt]=%{APPNAME}
 Name[pt_BR]=%{APPNAME}
 Name[ru]=%{APPNAME}
 Name[sk]=%{APPNAME}
 Name[sl]=%{APPNAME}
 Name[sr]=%{APPNAME}
 Name[sr@ijekavian]=%{APPNAME}
 Name[sr@ijekavianlatin]=%{APPNAME}
 Name[sr@latin]=%{APPNAME}
 Name[sv]=%{APPNAME}
 Name[tr]=%{APPNAME}
 Name[uk]=%{APPNAME}
 Name[x-test]=xx%{APPNAME}xx
 Name[zh_CN]=%{APPNAME}
 Name[zh_TW]=%{APPNAME}
 Comment=what your app does in a few words
 Comment[ar]=ما يفعله تطبيقك ببضع كلمات
 Comment[ast]=lo que fai la to aplicación nunes pallabres
 Comment[ca]=Què fa aquesta aplicació en poques paraules
 Comment[ca@valencia]=Què fa esta aplicació en poques paraules
 Comment[da]=nogle få ord om hvad din app gør
 Comment[de]=In ein paar Worten, was Ihre Anwendung tut
 Comment[en_GB]=what your app does in a few words
 Comment[es]=lo que hace su aplicación, en pocas palabras
 Comment[et]=Mõne sõnaga, mida rakendus teeb
 Comment[eu]=zure aplikazioak egiten duena hitz gutxitan
 Comment[fi]=ohjelmasi toiminta muutamalla sanalla
 Comment[fr]=que fait votre application en quelques mots
 Comment[gd]=na nì an aplacaid agad ann am beagan fhaclan
-Comment[gl]=o que fai o seu programa en poucas palabras
+Comment[gl]=o que fai o seu aplicativo en poucas palabras
 Comment[ia]=cosa tu app face in pauc parolas
 Comment[it]=Cosa fa la tua applicazione in poche parole
 Comment[ko]=프로그램이 하는 일에 대한 간단한 설명
 Comment[nb]=hva programmet gjør, med noen få ord
 Comment[nl]=wat uw app doet in een paar woorden
 Comment[nn]=nokre få ord om kva programmet gjer
 Comment[pl]=w kilku słowach opis co robi twój program
 Comment[pt]=o que faz a sua aplicação, em poucas palavras
 Comment[pt_BR]=breve descrição do que o seu aplicativo faz
 Comment[ru]=Несколько слов о том, что делает ваша программа
 Comment[sk]=čo vaša aplikácia robí v niekoľkých slovách
 Comment[sl]=kaj vaš program dela, v nekaj besedah
 Comment[sr]=Укратко о томе шта ваш програм ради
 Comment[sr@ijekavian]=Укратко о томе шта ваш програм ради
 Comment[sr@ijekavianlatin]=Ukratko o tome šta vaš program radi
 Comment[sr@latin]=Ukratko o tome šta vaš program radi
 Comment[sv]=vad programmet gör med några få ord
 Comment[tr]=uygulamanızın yaptığı şey, birkaç sözcükte
 Comment[uk]=призначення вашої програми у декількох словах
 Comment[x-test]=xxwhat your app does in a few wordsxx
 Comment[zh_CN]=简单几个词概括您的小程序的功能
 Comment[zh_TW]=以數個字描述您的應用程式的用途
 
 Icon=applications-system
 Type=Service
 ServiceTypes=Plasma/Applet
 
 X-KDE-PluginInfo-Author=%{AUTHOR}
 X-KDE-PluginInfo-Email=%{EMAIL}
 X-KDE-PluginInfo-Name=%{APPNAMELC}
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-Website=http://plasma.kde.org/
 X-KDE-PluginInfo-Category=Utilities
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-PluginInfo-Name=org.kde.%{APPNAMELC}
 
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/main.qml
 X-Plasma-Requires-FileDialog=Unused
 X-Plasma-Requires-LaunchApp=Unused
 X-Plasma-DefaultSize=200,300
diff --git a/templates/qml-plasmoid/package/metadata.desktop b/templates/qml-plasmoid/package/metadata.desktop
index 79bb1bab8..6e8ed6432 100644
--- a/templates/qml-plasmoid/package/metadata.desktop
+++ b/templates/qml-plasmoid/package/metadata.desktop
@@ -1,97 +1,97 @@
 [Desktop Entry]
 Name=%{APPNAME}
 Name[ar]=%{APPNAME}
 Name[ast]=%{APPNAME}
 Name[ca]=%{APPNAME}
 Name[ca@valencia]=%{APPNAME}
 Name[cs]=%{APPNAME}
 Name[da]=%{APPNAME}
 Name[de]=%{APPNAME}
 Name[en_GB]=%{APPNAME}
 Name[es]=%{APPNAME}
 Name[et]=%{APPNAME}
 Name[eu]=%{APPNAME}
 Name[fi]=%{APPNAME}
 Name[fr]=%{APPNAME}
 Name[gd]=%{APPNAME}
 Name[gl]=%{APPNAME}
 Name[ia]=%{APPNAME}
 Name[it]=%{APPNAME}
 Name[ko]=%{APPNAME}
 Name[nb]=%{APPNAME}
 Name[nl]=%{APPNAME}
 Name[nn]=%{APPNAME}
 Name[pl]=%{APPNAME}
 Name[pt]=%{APPNAME}
 Name[pt_BR]=%{APPNAME}
 Name[ru]=%{APPNAME}
 Name[sk]=%{APPNAME}
 Name[sl]=%{APPNAME}
 Name[sr]=%{APPNAME}
 Name[sr@ijekavian]=%{APPNAME}
 Name[sr@ijekavianlatin]=%{APPNAME}
 Name[sr@latin]=%{APPNAME}
 Name[sv]=%{APPNAME}
 Name[tr]=%{APPNAME}
 Name[uk]=%{APPNAME}
 Name[x-test]=xx%{APPNAME}xx
 Name[zh_CN]=%{APPNAME}
 Name[zh_TW]=%{APPNAME}
 Comment=what your app does in a few words
 Comment[ar]=ما يفعله تطبيقك ببضع كلمات
 Comment[ast]=lo que fai la to aplicación nunes pallabres
 Comment[ca]=Què fa aquesta aplicació en poques paraules
 Comment[ca@valencia]=Què fa esta aplicació en poques paraules
 Comment[da]=nogle få ord om hvad din app gør
 Comment[de]=In ein paar Worten, was Ihre Anwendung tut
 Comment[en_GB]=what your app does in a few words
 Comment[es]=lo que hace su aplicación, en pocas palabras
 Comment[et]=Mõne sõnaga, mida rakendus teeb
 Comment[eu]=zure aplikazioak egiten duena hitz gutxitan
 Comment[fi]=ohjelmasi toiminta muutamalla sanalla
 Comment[fr]=que fait votre application en quelques mots
 Comment[gd]=na nì an aplacaid agad ann am beagan fhaclan
-Comment[gl]=o que fai o seu programa en poucas palabras
+Comment[gl]=o que fai o seu aplicativo en poucas palabras
 Comment[ia]=cosa tu app face in pauc parolas
 Comment[it]=Cosa fa la tua applicazione in poche parole
 Comment[ko]=프로그램이 하는 일에 대한 간단한 설명
 Comment[nb]=hva programmet gjør, med noen få ord
 Comment[nl]=wat uw app doet in een paar woorden
 Comment[nn]=nokre få ord om kva programmet gjer
 Comment[pl]=w kilku słowach opis co robi twój program
 Comment[pt]=o que faz a sua aplicação, em poucas palavras
 Comment[pt_BR]=breve descrição do que o seu aplicativo faz
 Comment[ru]=Несколько слов о том, что делает ваша программа
 Comment[sk]=čo vaša aplikácia robí v niekoľkých slovách
 Comment[sl]=kaj vaš program dela, v nekaj besedah
 Comment[sr]=Укратко о томе шта ваш програм ради
 Comment[sr@ijekavian]=Укратко о томе шта ваш програм ради
 Comment[sr@ijekavianlatin]=Ukratko o tome šta vaš program radi
 Comment[sr@latin]=Ukratko o tome šta vaš program radi
 Comment[sv]=vad programmet gör med några få ord
 Comment[tr]=uygulamanızın yaptığı şey, birkaç sözcükte
 Comment[uk]=призначення вашої програми у декількох словах
 Comment[x-test]=xxwhat your app does in a few wordsxx
 Comment[zh_CN]=简单几个词概括您的小程序的功能
 Comment[zh_TW]=以數個字描述您的應用程式的用途
 
 Icon=applications-system
 Type=Service
 ServiceTypes=Plasma/Applet
 
 X-KDE-PluginInfo-Author=%{AUTHOR}
 X-KDE-PluginInfo-Email=%{EMAIL}
 X-KDE-PluginInfo-Name=%{APPNAMELC}
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-Website=http://plasma.kde.org/
 X-KDE-PluginInfo-Category=Utilities
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-PluginInfo-Name=org.kde.%{APPNAMELC}
 
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/main.qml
 X-Plasma-Requires-FileDialog=Unused
 X-Plasma-Requires-LaunchApp=Unused
 X-Plasma-DefaultSize=200,300