diff --git a/applets/calculator/package/metadata.desktop b/applets/calculator/package/metadata.desktop
index 3084a473e..580895daa 100644
--- a/applets/calculator/package/metadata.desktop
+++ b/applets/calculator/package/metadata.desktop
@@ -1,131 +1,131 @@
 [Desktop Entry]
 Name=Calculator
 Name[ar]=آلة حاسبة
 Name[bs]=Kalkulator
 Name[ca]=Calculadora
 Name[ca@valencia]=Calculadora
 Name[cs]=Kalkulačka
 Name[da]=Lommeregner
 Name[de]=Rechner
 Name[el]=Αριθμομηχανή
 Name[en_GB]=Calculator
 Name[eo]=Kalkulilo
 Name[es]=Calculadora
 Name[et]=Kalkulaator
 Name[eu]=Kalkulagailua
 Name[fi]=Laskin
 Name[fr]=Calculatrice
 Name[ga]=Áireamhán
 Name[gl]=Calculadora
 Name[he]=מחשבון
 Name[hr]=Kalkulator
 Name[hu]=Grafikus számológép
 Name[is]=Reiknivél
 Name[it]=Calcolatrice
 Name[ja]=計算機
 Name[kk]=Калькулятор
 Name[km]=ម៉ាស៊ីន​គិតលេខ
 Name[ko]=계산기
 Name[ku]=Makîneya Hesaban
 Name[lt]=Skaičiuoklis
 Name[lv]=Kalkulators
 Name[mr]=गणकयंत्र
 Name[nb]=Kalkulator
 Name[nds]=Taschenreekner
 Name[nl]=Rekenmachine
 Name[nn]=Kalkulator
 Name[pa]=ਕੈਲਕੂਲੇਟਰ
 Name[pl]=Kalkulator
 Name[pt]=Calculadora
 Name[pt_BR]=Calculadora
 Name[ro]=Calculator
 Name[ru]=Калькулятор
 Name[sk]=Kalkulačka
 Name[sl]=Računalo
 Name[sq]=Makina Llogaritëse
 Name[sr]=калкулатор
 Name[sr@ijekavian]=калкулатор
 Name[sr@ijekavianlatin]=kalkulator
 Name[sr@latin]=kalkulator
 Name[sv]=Miniräknare
 Name[th]=เครื่องคิดเลข
 Name[tr]=Hesap Makinesi
 Name[ug]=ھېسابلىغۇچ
 Name[uk]=Калькулятор
 Name[wa]=Carculete
 Name[x-test]=xxCalculatorxx
 Name[zh_CN]=计算器
 Name[zh_TW]=計算機
 Comment=Calculate simple sums
 Comment[ar]=احسب عمليات جمع بسيطة
 Comment[bs]=Izračunajte jednostavne izraze
 Comment[ca]=Calcula sumes senzilles
 Comment[ca@valencia]=Calcula sumes senzilles
 Comment[cs]=Jednoduché sčítání
 Comment[da]=Beregn simple summer.
 Comment[de]=Für kleine Rechenaufgaben
 Comment[el]=Υπολογισμός απλών πράξεων
 Comment[en_GB]=Calculate simple sums
 Comment[es]=Calcular sumas sencillas
 Comment[et]=Lihtne kalkulaator
 Comment[eu]=Gehiketa errazak kalkulatu
 Comment[fi]=Laske yksinkertaisia laskuja
 Comment[fr]=Calcule des sommes simples
 Comment[ga]=Áirigh suimeanna simplí
 Comment[gl]=Calcula sumas simples
 Comment[he]=מחשב סכומים פשוטים
 Comment[hr]=Izračunaj jednostavne sume
 Comment[hu]=Egyszerű számológép
 Comment[is]=Reiknar einfaldar aðgerðir
 Comment[it]=Calcola semplici somme
 Comment[ja]=簡単な合計計算ができます
 Comment[kk]=Қарапайым есептерді шығару
 Comment[km]=គណនា​ផល​បូក​ធម្មតា
 Comment[ko]=간단한 계산기
 Comment[ku]=Berhevkirinên hêsan hesab bike
 Comment[lt]=Paprasti skaičiavimai
 Comment[lv]=Aprēķina vienkāršas summas
 Comment[mr]=सोपी गणना करतो
 Comment[nb]=Regn ut enkle regnestykker
 Comment[nds]=Eenfache Saken utreken
 Comment[nl]=Eenvoudige berekeningen
 Comment[nn]=Grafisk kalkulator
 Comment[pa]=ਸਧਾਰਨ ਜੋੜ ਕੱਢੋ
 Comment[pl]=Oblicza proste sumy
 Comment[pt]=Calcular somas simples
 Comment[pt_BR]=Calcula funções matemáticas básicas
 Comment[ro]=Calculează sume simple
 Comment[ru]=Вычисление простых выражений
 Comment[sk]=Výpočet jednoduchých súm
 Comment[sl]=Izračuna preproste vsote
 Comment[sr]=Израчунајте једноставне изразе
 Comment[sr@ijekavian]=Израчунајте једноставне изразе
 Comment[sr@ijekavianlatin]=Izračunajte jednostavne izraze
 Comment[sr@latin]=Izračunajte jednostavne izraze
 Comment[sv]=Beräkna enkla summor
 Comment[th]=คำนวณหาค่าที่ง่าย ๆ
 Comment[tr]=Basit hesaplamalar yapın
 Comment[uk]=Обчисліть прості суми
 Comment[wa]=Cårculez des ptits carculs
 Comment[x-test]=xxCalculate simple sumsxx
 Comment[zh_CN]=计算简单的求和
 Comment[zh_TW]=計算簡單的算式
 Icon=accessories-calculator
 Type=Service
-ServiceTypes=Plasma/Applet,Plasma/PopupApplet
+ServiceTypes=Plasma/Applet
 
 X-KDE-PluginInfo-Author=Henry Stanaland, Davide Bettio
 X-KDE-PluginInfo-Email=stanaland@gmail.com, bettio@kde.org
 X-KDE-PluginInfo-Name=org.kde.plasma.calculator
 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-Plasma-StandAloneApp=true
 
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/calculator.qml
 X-Plasma-Requires-FileDialog=Unused
 X-Plasma-Requires-LaunchApp=Unused
diff --git a/applets/konqprofiles/package/metadata.desktop b/applets/konqprofiles/package/metadata.desktop
index 89dd3594d..f512d29e8 100644
--- a/applets/konqprofiles/package/metadata.desktop
+++ b/applets/konqprofiles/package/metadata.desktop
@@ -1,130 +1,130 @@
 [Desktop Entry]
 Name=Konqueror Profiles
 Name[ar]=تشكيلة كنيكر
 Name[bs]=Konqueror profili
 Name[ca]=Perfils del Konqueror
 Name[ca@valencia]=Perfils del Konqueror
 Name[cs]=Profily Konqueroru
 Name[da]=Konqueror-profiler
 Name[de]=Konqueror-Profile
 Name[el]=Προφίλ Konqueror
 Name[en_GB]=Konqueror Profiles
 Name[es]=Perfiles de Konqueror
 Name[et]=Konquerori profiilid
 Name[eu]=Konquerorren profilak
 Name[fi]=Konqueror-profiilit
 Name[fr]=Profils de Konqueror
 Name[ga]=Próifílí Konqueror
 Name[gl]=Perfís de Konqueror
 Name[he]=הפרופילים של Konqueror
 Name[hr]=Profili u Konqueroru
 Name[hu]=Konqueror profilok
 Name[is]=Konqueror snið
 Name[it]=Profili di Konqueror
 Name[ja]=Konqueror プロファイル
 Name[kk]=Konqueror профильдері
 Name[km]=ទម្រង់​របស់ Konqueror
 Name[ko]=Konqueror 프로필
 Name[ku]=Profîlên Komqueror
 Name[lt]=Konqueror profiliai
 Name[lv]=Konqueror profili
 Name[mr]=कॉन्करर रूपरेषा
 Name[nb]=Konqueror-profiler
 Name[nds]=Konqueror-Profilen
 Name[nl]=Konqueror-profielen
 Name[nn]=Konqueror-profilar
 Name[pa]=ਕੋਨਕਿਊਰੋਰ ਪਰੋਫਾਇਲ
 Name[pl]=Profile Konquerora
 Name[pt]=Perfis do Konqueror
 Name[pt_BR]=Perfis do Konqueror
 Name[ro]=Profiluri Konqueror
 Name[ru]=Konqueror: профили
 Name[sk]=Profily Konquerora
 Name[sl]=Profili za Konqueror
 Name[sr]=К‑освајачеви профили
 Name[sr@ijekavian]=К‑освајачеви профили
 Name[sr@ijekavianlatin]=K‑osvajačevi profili
 Name[sr@latin]=K‑osvajačevi profili
 Name[sv]=Konquerorprofiler
 Name[th]=โพรไฟล์ต่าง ๆ ของคอนเควอร์เรอร์
 Name[tr]=Konqueror Profilleri
 Name[uk]=Профілі Konqueror
 Name[wa]=Profils di Konqueror
 Name[x-test]=xxKonqueror Profilesxx
 Name[zh_CN]=Konqueror 配置集
 Name[zh_TW]=Konqueror 設定檔
 Comment=List and launch Konqueror profiles
 Comment[ar]=تعرض و تطلق تشكيلات كنكير
 Comment[bs]=Nabraja i pokreće profile Konquerora
 Comment[ca]=Llista i llança els perfils del Konqueror
 Comment[ca@valencia]=Llista i llança els perfils del Konqueror
 Comment[cs]=Seznam a spouštění profilů Konqueroru
 Comment[da]=Vis og start Konqueror-profiler.
 Comment[de]=Konqueror-Profile anzeigen und starten
 Comment[el]=Εμφάνιση και εκτέλεση προφίλ του Konqueror
 Comment[en_GB]=List and launch Konqueror profiles
 Comment[es]=Listar y lanzar perfiles de Konqueror
 Comment[et]=Konquerori profiilide näitamine ja käivitamine
 Comment[eu]=Zerrendatu eta jaurti Konquerorren profilak
 Comment[fi]=Luettelee ja käynnistää Konqueror-profiileja
 Comment[fr]=Permet d'afficher et de lancer des profils de Konqueror
 Comment[ga]=Liostaigh agus tosaigh próifílí Konqueror
 Comment[gl]=Enumera e inicia perfís de Konqueror
 Comment[he]=הצג והפעל פרופילים של Konqueror
 Comment[hr]=Navedi i pokreni profile u Konqueroru
 Comment[hu]=Konqueror profilok listázása és indítása
 Comment[is]=Listar upp og ræsir Konqueror snið
 Comment[it]=Elenca ed esegue i profili di Konqueror
 Comment[ja]=Konqueror のプロファイルを起動します
 Comment[kk]=Konqueror профильдерін таңдап жегу
 Comment[km]=រាយ និង​ចាប់ផ្ដើម​ទម្រង់​របស់ Konqueror
 Comment[ko]=Konqueror 프로필을 보고 실행하기
 Comment[ku]=Profîlên Konqueror lîste bike û bide destpêkirin
 Comment[lt]=Rikiuoti ir įkelti Konqueror profilius
 Comment[lv]=Parāda un atver Konqueror profilus
 Comment[mr]=कॉन्करर रूपरेषांची यादी व प्रक्षेपण करा
 Comment[nb]=List opp og start Konqueror-profiler
 Comment[nds]=Konqueror-Profilen oplisten un opropen
 Comment[nl]=Toon en start Konqueror-profielen
 Comment[nn]=Vis og start Konqueror-profilar
 Comment[pa]=ਕੋਨਕਿਉਰੋਰ ਪਰੋਫਾਇਲ ਵੇਖੋ ਅਤੇ ਚਲਾਓ
 Comment[pl]=Wypisuje i uruchamia profile Konquerora
 Comment[pt]=Listar e invocar os perfis do Konqueror
 Comment[pt_BR]=Lista e carrega os perfis do Konqueror
 Comment[ro]=Enumeră și lansează profiluri Konqueror
 Comment[ru]=Запуск Konqueror для разных задач
 Comment[sk]=Zobrazenie a spustenie profilov Konquerora
 Comment[sl]=Prikažite in zaženite profile Konquerorja
 Comment[sr]=Набраја и покреће профиле К‑освајача
 Comment[sr@ijekavian]=Набраја и покреће профиле К‑освајача
 Comment[sr@ijekavianlatin]=Nabraja i pokreće profile K‑osvajača
 Comment[sr@latin]=Nabraja i pokreće profile K‑osvajača
 Comment[sv]=Lista och starta Konquerorprofiler
 Comment[th]=เรียกรายการและเรียกใช้โพรไฟล์ต่าง ๆ ของคอนเควอร์เรอร์
 Comment[tr]=Konqueror profillerini listeleyin ve çalıştırın
 Comment[uk]=Перегляньте список і запустіть профілі Konqueror
 Comment[wa]=Fé l' djivêye des profils di Konqueror eyet ls enonder
 Comment[x-test]=xxList and launch Konqueror profilesxx
 Comment[zh_CN]=罗列和启动 Konqueror 配置集
 Comment[zh_TW]=列出並啟動 Konqueror 設定檔
 
 Icon=konqueror
 Type=Service
-X-KDE-ServiceTypes=Plasma/Applet,Plasma/PopupApplet
+X-KDE-ServiceTypes=Plasma/Applet
 
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/konqprofiles.qml
 
 X-KDE-PluginInfo-Author=Shaun Reich
 X-KDE-PluginInfo-Email=shaun.reich@kdemail.net
 X-KDE-PluginInfo-Name=konqprofiles
 X-KDE-PluginInfo-Version=0.1
 X-KDE-PluginInfo-Website=http://userbase.kde.org/Plasma
 X-KDE-PluginInfo-Category=Utilities
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
 
 #X-Plasma-Requires-FileDialog=Unused
 #X-Plasma-Requires-LaunchApp=Required
 #X-Plasma-NotificationArea=true
diff --git a/applets/konsoleprofiles/package/metadata.desktop b/applets/konsoleprofiles/package/metadata.desktop
index 4871616bd..1c029529a 100644
--- a/applets/konsoleprofiles/package/metadata.desktop
+++ b/applets/konsoleprofiles/package/metadata.desktop
@@ -1,130 +1,130 @@
 [Desktop Entry]
 Name=Konsole Profiles
 Name[ar]=تشكيلات كونسول
 Name[bs]=Konzolini profili
 Name[ca]=Perfils del Konsole
 Name[ca@valencia]=Perfils del Konsole
 Name[cs]=Profily Konsole
 Name[da]=Konsole-profiler
 Name[de]=Konsole-Profile
 Name[el]=Προφίλ Konsole
 Name[en_GB]=Konsole Profiles
 Name[es]=Perfiles de Konsole
 Name[et]=Konsooli profiilid
 Name[eu]=Kontsolaren profilak
 Name[fi]=Konsole-profiilit
 Name[fr]=Profils de Konsole
 Name[ga]=Próifílí Konsole
 Name[gl]=Perfís de Konsole
 Name[he]=הפרופילים של Konsole
 Name[hr]=Profili u Konsoleu
 Name[hu]=Konsole profilok
 Name[is]=Konsole snið
 Name[it]=Profili di Konsole
 Name[ja]=Konsole プロファイル
 Name[kk]=Konsole профильдері
 Name[km]=ទម្រង់​របស់ Konsole
 Name[ko]=Konsole 프로필
 Name[ku]=Profîlên Konsolê
 Name[lt]=Konsolės profiliai
 Name[lv]=Konsole profili
 Name[mr]=कंसोल रूपरेषा
 Name[nb]=Konsole-profiler
 Name[nds]=Konsole-Profilen
 Name[nl]=Konsole-profielen
 Name[nn]=Konsoll-profilar
 Name[pa]=ਕਨਸੋਲ ਪਰੋਫਾਇਲ
 Name[pl]=Profile Konsoli
 Name[pt]=Perfis do Konsole
 Name[pt_BR]=Perfis do Konsole
 Name[ro]=Profiluri konsolă
 Name[ru]=Konsole: профили
 Name[sk]=Profily Konsole
 Name[sl]=Profili za Konsole
 Name[sr]=Конзолини профили
 Name[sr@ijekavian]=Конзолини профили
 Name[sr@ijekavianlatin]=Konsolini profili
 Name[sr@latin]=Konsolini profili
 Name[sv]=Terminalprofiler
 Name[th]=โพรไฟล์คอนโซล-K
 Name[tr]=Konsole Profilleri
 Name[uk]=Профілі Konsole
 Name[wa]=Profils di Konsole
 Name[x-test]=xxKonsole Profilesxx
 Name[zh_CN]=Konsole 配置集
 Name[zh_TW]=Konsole 設定檔
 Comment=List and launch Konsole profiles
 Comment[ar]=تعرض و تطلق تشكيلات كونسول
 Comment[bs]=Nabraja i pokreće profile Konzole
 Comment[ca]=Llista i llança els perfils del Konsole
 Comment[ca@valencia]=Llista i llança els perfils del Konsole
 Comment[cs]=Seznam a spouštění profilů Konsole
 Comment[da]=Vis og start Konsole-profiler.
 Comment[de]=Konsole-Profile anzeigen und starten
 Comment[el]=Εμφάνιση και εκτέλεση προφίλ της Konsole
 Comment[en_GB]=List and launch Konsole profiles
 Comment[es]=Listar y lanzar perfiles de Konsole
 Comment[et]=Konsooli profiilide näitamine ja käivitamine
 Comment[eu]=Zerrendatu eta jaurti Kontsolaren profilak
 Comment[fi]=Luettelee ja käynnistää Konsole-profiileja
 Comment[fr]=Permet d'afficher et de lancer des profils de Konsole
 Comment[ga]=Liostaigh agus tosaigh próifílí Konsole
 Comment[gl]=Enumera e inicia perfís de Konsole
 Comment[he]=הצג והפעל פרופילים של Konsole
 Comment[hr]=Navedi i pokreni profile u Konsoleu
 Comment[hu]=Konsole profilok listázása és indítása
 Comment[is]=Listar upp og ræsir Konsole snið
 Comment[it]=Elenca ed esegue i profili di Konsole
 Comment[ja]=Konsole のプロファイルを起動します
 Comment[kk]=Konsole профильдерін таңдап жегу
 Comment[km]=រាយ និង​ចាប់ផ្ដើម​ទម្រង់​របស់ Konsole
 Comment[ko]=Konsole 프로필을 보고 실행하기
 Comment[ku]=Profîlên Konsolê lîste bike û bide destpêkirin
 Comment[lt]=Rikiuoti ir įkelti Konsole profilius
 Comment[lv]=Parāda un atver Konsole profilus
 Comment[mr]=कंसोल रूपरेषांची यादी व प्रक्षेपण करा
 Comment[nb]=List opp og start Konsole-profiler
 Comment[nds]=Konsole-Profilen oplisten un opropen
 Comment[nl]=Toon en start Konsole-profielen
 Comment[nn]=Vis og start Konsoll-profilar
 Comment[pa]=ਕਨਸੋਲ ਪਰੋਫਾਇਲ ਵੇਖੋ ਅਤੇ ਚਲਾਓ
 Comment[pl]=Wypisuje i uruchamia profile Konsoli
 Comment[pt]=Listar e invocar os perfis do Konsole
 Comment[pt_BR]=Lista e carrega os perfis do Konsole
 Comment[ro]=Enumeră și lansează profiluri de consolă
 Comment[ru]=Запуск Konsole для разных задач
 Comment[sk]=Zobrazenie a spustenie profilov Konsole
 Comment[sl]=Prikažite in zaženite profile za Konsole
 Comment[sr]=Набраја и покреће профиле Конзоле
 Comment[sr@ijekavian]=Набраја и покреће профиле Конзоле
 Comment[sr@ijekavianlatin]=Nabraja i pokreće profile Konsole
 Comment[sr@latin]=Nabraja i pokreće profile Konsole
 Comment[sv]=Lista och starta terminalprofiler
 Comment[th]=เรียกรายการและเรียกให้โพรไฟล์ของคอนโซล-K ให้ทำงาน
 Comment[tr]=Konsole profillerini listeleyin ve çalıştırın
 Comment[uk]=Перегляньте і запустіть профілі Konsole
 Comment[wa]=Fé l' djivêye des profils di Konsole eyet ls enonder
 Comment[x-test]=xxList and launch Konsole profilesxx
 Comment[zh_CN]=罗列和启动 Konsole 配置集
 Comment[zh_TW]=列出並啟動 Konsole 設定檔
 
 Icon=utilities-terminal
 Type=Service
-X-KDE-ServiceTypes=Plasma/Applet,Plasma/PopupApplet
+X-KDE-ServiceTypes=Plasma/Applet
 
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/konsoleprofiles.qml
 
 X-KDE-PluginInfo-Author=Shaun Reich
 X-KDE-PluginInfo-Email=shaun.reich@kdemail.net
 X-KDE-PluginInfo-Name=org.kde.plasma.konsoleprofiles
 X-KDE-PluginInfo-Version=0.1
 X-KDE-PluginInfo-Website=http://userbase.kde.org/Plasma
 X-KDE-PluginInfo-Category=Utilities
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-FormFactors=desktop
 #X-Plasma-Requires-FileDialog=Unused
 #X-Plasma-Requires-LaunchApp=Required
 #X-Plasma-NotificationArea=true
diff --git a/applets/mediaframe/package/metadata.desktop b/applets/mediaframe/package/metadata.desktop
index c0b08c5c5..64378baec 100644
--- a/applets/mediaframe/package/metadata.desktop
+++ b/applets/mediaframe/package/metadata.desktop
@@ -1,88 +1,88 @@
 [Desktop Entry]
 Name=Media frame
 Name[ca]=Marc multimèdia
 Name[ca@valencia]=Marc multimèdia
 Name[cs]=Rámec médií
 Name[da]=Medieramme
 Name[de]=Medien-Rahmen
 Name[el]=Πλαίσιο μέσου
 Name[en_GB]=Media frame
 Name[es]=Marco multimedia
 Name[et]=Meediaraam
 Name[eu]=Multimedia markoa
 Name[fi]=Mediakehys
 Name[fr]=Cadre du lecteur de média
 Name[gl]=Marco de contido
 Name[it]=Cornice media
 Name[ko]=미디어 프레임
 Name[lt]=Paveikslėlių rėmelis
 Name[nl]=Mediaframe
 Name[nn]=Medieramme
 Name[pl]=Ramka multimedialna
 Name[pt]=Moldura multimédia
 Name[pt_BR]=Quadro multimídia
 Name[ru]=Фоторамка
 Name[sk]=Snímka médií
 Name[sl]=Predstavnostni okvir
 Name[sr]=урамљени медијум
 Name[sr@ijekavian]=урамљени медијум
 Name[sr@ijekavianlatin]=uramljeni medijum
 Name[sr@latin]=uramljeni medijum
 Name[sv]=Media frame
 Name[uk]=Медіарамка
 Name[x-test]=xxMedia framexx
 Name[zh_CN]=媒体相框
 Name[zh_TW]=媒體框架
 Comment=(Picture) Frame
 Comment[ca]=Marc (fotografies)
 Comment[ca@valencia]=Marc (fotografies)
 Comment[cs]=Rámeček (obrázku)
 Comment[da]=(Billed)ramme
 Comment[de]=(Bilder)-Rahmen
 Comment[el]=Πλαίσιο (εικόνας)
 Comment[en_GB]=(Picture) Frame
 Comment[es]=Marco (de retrato)
 Comment[et]=(Pildi)raam
 Comment[eu]=(Irudi) markoa
 Comment[fi]=Kehys kuville ja muulle
 Comment[fr]=Cadre de photos
 Comment[gl]=Portarretratos
 Comment[it]=(Immagine) Cornice
 Comment[ko]=(사진) 프레임
 Comment[lt]=Paveikslėlių rėmelis
 Comment[nl]=(Afbeelding) frame
 Comment[nn]=Biletramme
 Comment[pl]=(Zdjęcie) Ramka
 Comment[pt]=Moldura (de Imagens)
 Comment[pt_BR]=Quadro (Imagens)
 Comment[ru]=Слайд-шоу из любимых изображений
 Comment[sk]=Snímka obrázku
 Comment[sl]=Okvir s sliko
 Comment[sr]=Рам за слике
 Comment[sr@ijekavian]=Рам за слике
 Comment[sr@ijekavianlatin]=Ram za slike
 Comment[sr@latin]=Ram za slike
 Comment[sv]=Bildram
 Comment[uk]=(Картинна) рамка
 Comment[x-test]=xx(Picture) Framexx
 Comment[zh_CN]=(图片) 像框
 Comment[zh_TW]=（圖片）框架
 Icon=image-x-generic
 Type=Service
-ServiceTypes=Plasma/Applet,Plasma/PopupApplet
+ServiceTypes=Plasma/Applet
 
 X-KDE-PluginInfo-Author=Lars Pontoppidan
 X-KDE-PluginInfo-Email=dev.larpon@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.mediaframe
 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-Plasma-StandAloneApp=true
 
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/main.qml
 X-Plasma-Requires-FileDialog=True
 X-Plasma-Requires-LaunchApp=Unused
diff --git a/applets/weatherstation/package/metadata.desktop b/applets/weatherstation/package/metadata.desktop
index d75bde59a..8bf40b4c3 100644
--- a/applets/weatherstation/package/metadata.desktop
+++ b/applets/weatherstation/package/metadata.desktop
@@ -1,61 +1,61 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=LCD Weather Station (QML)
 Name[ar]=محطة الطقس المسطحة (QML)
 Name[bs]=LCD Meteroloska stanica (QML)
 Name[ca]=Estació meteorològica LCD (QML)
 Name[ca@valencia]=Estació meteorològica LCD (QML)
 Name[cs]=LCD meteostanice (QML)
 Name[da]=LCD-vejrstation (QML)
 Name[de]=LCD-Wetterstation (QML)
 Name[el]=Μετεωρολογικός σταθμός LCD (QML)
 Name[en_GB]=LCD Weather Station (QML)
 Name[es]=Estación meteorológica LCD (QML)
 Name[et]=LCD ilmateade (QML)
 Name[eu]=LCD estazio meteorologikoa (QML)
 Name[fi]=LCD-sääasema (QML)
 Name[fr]=Station météo LCD (QML)
 Name[ga]=Stáisiún Aimsire LCD (QML)
 Name[gl]=Estación meteorolóxica LCD (QML)
 Name[he]=דיווחי מזג האוויר LCD
 Name[hu]=LCD időjárásjelző állomás (QML)
 Name[it]=Stazione meteorologica LCD (QML)
 Name[kk]=СК-дисплейдегі ауа райы (QML)
 Name[ko]=LCD 날씨 스테이션 (QML)
 Name[lt]=LCD orų stotelė (QML)
 Name[mr]=LCD हवामान स्थानक (QML)
 Name[nb]=LCD værstasjon (QML)
 Name[nds]=LCD-Wederstatschoon (QML)
 Name[nl]=LCD weerstation (QML)
 Name[nn]=LCD-vêrstasjon (QML)
 Name[pa]=LCD ਮੌਸਮ ਸਟੇਸ਼ਨ (QML)
 Name[pl]=Stacja pogodowa LCD (QML)
 Name[pt]=Estação Meteorológica LCD (QML)
 Name[pt_BR]=Estação meteorológica LCD (QML)
 Name[ro]=Stație meteo ECL (QML)
 Name[ru]=ЖКД-метеосводка (на QML)
 Name[sk]=LCD meteorologická stanica (QML)
 Name[sl]=Vremenska postaja LCD (QML)
 Name[sr]=ЛЦД метеостаница (КуМЛ)
 Name[sr@ijekavian]=ЛЦД метеостаница (КуМЛ)
 Name[sr@ijekavianlatin]=LCD meteostanica (QML)
 Name[sr@latin]=LCD meteostanica (QML)
 Name[sv]=LCD-väderstation (QML)
 Name[tr]=LCD Hava Durumu İstasyonu (QML)
 Name[uk]=Метеорологічна станція на дисплеї (QML)
 Name[x-test]=xxLCD Weather Station (QML)xx
 Name[zh_CN]=液晶气象站 (QML)
 Name[zh_TW]=LCD 氣象站 (QML)
 Type=Service
-ServiceTypes=Plasma/Applet,Plasma/PopupApplet
+ServiceTypes=Plasma/Applet
 Icon=accessories-dictionary
 X-Plasma-MainScript=ui/main.qml
 X-KDE-PluginInfo-Author=Luís Gabriel Lima
 X-KDE-PluginInfo-Email=lampih@gmail.com
 X-KDE-PluginInfo-Name=org.kde.lcdweather
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-Website=http://plasma.kde.org/
 X-KDE-PluginInfo-Category=Examples
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPLv2+
 X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/wallpapers/haenau/metadata.desktop b/wallpapers/haenau/metadata.desktop
index 371303c0f..87af5194e 100644
--- a/wallpapers/haenau/metadata.desktop
+++ b/wallpapers/haenau/metadata.desktop
@@ -1,58 +1,58 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Haenau
 Name[bs]=Haenau
 Name[ca]=Haenau
 Name[ca@valencia]=Haenau
 Name[cs]=Haenau
 Name[da]=Haenau
 Name[de]=Haenau
 Name[el]=Haenau
 Name[en_GB]=Haenau
 Name[es]=Haenau
 Name[et]=Haenau
 Name[eu]=Haenau
 Name[fi]=Haenau
 Name[fr]=Haenau
 Name[gl]=Haenau
 Name[hu]=Haenau
 Name[it]=Haenau
 Name[kk]=Ханау
 Name[ko]=Haenau
 Name[lt]=Haenau
 Name[mr]=हेनोउ
 Name[nb]=Haenau
 Name[nds]=Haenau
 Name[nl]=Haenau
 Name[nn]=Haenau
 Name[pl]=Haenau
 Name[pt]=Haenau
 Name[pt_BR]=Haenau
 Name[ro]=Haenau
 Name[ru]=Haenau
 Name[sk]=Haenau
 Name[sl]=Haenau
 Name[sr]=Хаенау
 Name[sr@ijekavian]=Хаенау
 Name[sr@ijekavianlatin]=Haenau
 Name[sr@latin]=Haenau
 Name[sv]=Haenau
 Name[tr]=Haenau
 Name[uk]=Ганау
 Name[wa]=Haenau
 Name[x-test]=xxHaenauxx
 Name[zh_CN]=层次
 Name[zh_TW]=Haenau
 
 
 Type=Service
-ServiceTypes=Plasma/DeclarativeWallpaper
+ServiceTypes=Plasma/Wallpaper
 Icon=preferences-desktop-wallpaper
 X-Plasma-MainScript=ui/main.qml
 X-KDE-PluginInfo-Author=Marco Martin
 X-KDE-PluginInfo-Email=mart@kde.org
 X-KDE-PluginInfo-Name=org.kde.haenau
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-Website=http://kde.org/
 X-KDE-PluginInfo-License=LGPL
 X-KDE-PluginInfo-EnabledByDefault=true