diff --git a/containments/desktop/package/metadata.desktop b/containments/desktop/package/metadata.desktop
index 1333579e3..9d5085bb6 100644
--- a/containments/desktop/package/metadata.desktop
+++ b/containments/desktop/package/metadata.desktop
@@ -1,162 +1,162 @@
 [Desktop Entry]
 Name=Desktop
 Name[af]=Werkskerm
 Name[ar]=سطح المكتب
 Name[be]=Працоўны стол
 Name[be@latin]=Rabočy stoł
 Name[bg]=Работен плот
 Name[bn]=ডেস্কটপ
 Name[bn_IN]=ডেস্কটপ
 Name[br]=Gorretaol
 Name[bs]=Radna površina
 Name[ca]=Escriptori
 Name[ca@valencia]=Escriptori
 Name[cs]=Pracovní plocha
 Name[csb]=Pùlt
 Name[cy]=Penbwrdd
 Name[da]=Skrivebord
 Name[de]=Arbeitsfläche
 Name[el]=Επιφάνεια εργασίας
 Name[en_GB]=Desktop
 Name[eo]=Labortablo
 Name[es]=Escritorio
 Name[et]=Töölaud
 Name[eu]=Mahaigaina
 Name[fa]=رومیزی
 Name[fi]=Työpöytä
 Name[fr]=Bureau
 Name[fy]=Buroblêd
 Name[ga]=Deasc
 Name[gl]=Escritorio
 Name[gu]=ડેસ્કટોપ
 Name[he]=שולחן עבודה
 Name[hi]=डेस्कटॉप
 Name[hne]=डेस्कटाप
 Name[hr]=Radna površina
 Name[hsb]=Dźěłowy powjerch
 Name[hu]=Munkaasztal
 Name[ia]=Scriptorio
 Name[id]=Desktop
 Name[is]=Skjáborð
 Name[it]=Desktop
 Name[ja]=デスクトップ
 Name[ka]=სამუშაო დაფა
 Name[kk]=Жұмыс үстелі
 Name[kn]=ಗಣಕತೆರೆ
 Name[ko]=데스크톱
 Name[ku]=Sermasê
 Name[lt]=Darbalaukis
 Name[mai]=डेस्कटाप
 Name[mk]=Работна површина
 Name[ml]=പണിയിടം
 Name[mr]=डेस्कटॉप
 Name[ms]=Ruang Kerja
 Name[nb]=Skrivebord
 Name[nds]=Schriefdisch
 Name[ne]=डेस्कटप
 Name[nl]=Bureaublad
 Name[nn]=Skrivebord
 Name[oc]=Burèu
 Name[or]=ଡ଼େସ୍କଟପ
 Name[pa]=ਡੈਸਕਟਾਪ
 Name[pl]=Pulpit
 Name[pt]=Ambiente de Trabalho
 Name[pt_BR]=Área de Trabalho
 Name[ro]=Birou
 Name[ru]=Рабочий стол по умолчанию
 Name[se]=Čállinbeavdi
 Name[si]=වැඩතලය
 Name[sk]=Plocha
 Name[sl]=Namizje
 Name[sr]=Површ
 Name[sr@ijekavian]=Површ
 Name[sr@ijekavianlatin]=Površ
 Name[sr@latin]=Površ
 Name[sv]=Skrivbord
 Name[ta]=பணிமேசை
 Name[te]=రంగస్ఠలం
 Name[tg]=Мизи корӣ
 Name[th]=พื้นที่ทำงาน
 Name[tr]=Masaüstü
 Name[uk]=Стільниця
 Name[uz]=Ish stoli
 Name[uz@cyrillic]=Иш столи
 Name[vi]=Màn hình nền
 Name[wa]=Sicribanne
 Name[xh]=Desktop
 Name[x-test]=xxDesktopxx
 Name[zh_CN]=桌面
 Name[zh_TW]=桌面
 Comment=A clean and simple layout
 Comment[ar]=تصميم نظيف وبسيط
 Comment[bs]=Čist i jednostavan Izgled
 Comment[ca]=Una disposició neta i senzilla
 Comment[ca@valencia]=Una disposició neta i senzilla
 Comment[cs]=Čisté a jednoduché rozvržení
 Comment[da]=Et rent og simpelt layout
 Comment[de]=Ein klares und einfaches Layout
 Comment[el]=Μια σαφής και απλή διάταξη
 Comment[en_GB]=A clean and simple layout
 Comment[es]=Un esquema sencillo y claro
 Comment[et]=Puhas ja lihtne paigutus
 Comment[eu]=Diseinu garbi eta xumea
 Comment[fi]=Selkeä ja yksinkertainen asettelu
 Comment[fr]=Une disposition simple et épurée
 Comment[gl]=Unha disposición sinxela e limpa
 Comment[he]=פריסה פשוטה ונקיה
 Comment[hu]=Egy tiszta és egyszerű elrendezés
 Comment[ia]=Un disposition simple e munde
 Comment[id]=Tata letak yang bersih dan sederhana
 Comment[it]=Una disposizione semplice e pulita
 Comment[kk]=Анық және қарапайым қалыпы 
 Comment[km]=ប្លង់​សាមញ្ញ ហើយ​​ស្អាត
 Comment[ko]=깨끗하고 정돈된 레이아웃
 Comment[lt]=Švarus ir paprastas Išdėstymas
 Comment[mr]=स्वच्छ व साधी रचना
 Comment[nb]=En ren og enkel utforming
 Comment[nds]=En schier un eenfach Utsehn
 Comment[nl]=Een schone en simpele opmaak
 Comment[nn]=Ei enkel og stilrein utforming
 Comment[pa]=ਸਾਫ਼ ਅਤੇ ਸਧਾਰਨ ਲੇਆਉਟ
 Comment[pl]=Schludny i prosty układ
 Comment[pt]=Uma disposição limpa e simples
 Comment[pt_BR]=Um layout limpo e simples
 Comment[ro]=Aranjament curat și simplu
 Comment[ru]=Ясный и простой шаблон
 Comment[sk]=Čisté a jednoduché rozloženie
 Comment[sl]=Čist in preprost razpored
 Comment[sr]=Чист и једноставан распоред
 Comment[sr@ijekavian]=Чист и једноставан распоред
 Comment[sr@ijekavianlatin]=Čist i jednostavan raspored
 Comment[sr@latin]=Čist i jednostavan raspored
 Comment[sv]=En ren och enkel layout
 Comment[tr]=Temiz ve basit bir yerleşim
 Comment[uk]=Просте компонування
 Comment[vi]=Một bố trí sạch sẽ và đơn giản
 Comment[x-test]=xxA clean and simple layoutxx
 Comment[zh_CN]=简洁的布局
 Comment[zh_TW]=乾淨、簡單的佈局
 Encoding=UTF-8
 
 Type=Service
 Icon=user-desktop
 X-KDE-ParentApp=
 X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
 
 X-KDE-PluginInfo-Author=Sebastian Kügler, Eike Hein
 X-KDE-PluginInfo-Email=sebas@kde.org, hein@kde.org
 X-KDE-PluginInfo-Name=org.kde.desktopcontainment
 X-KDE-PluginInfo-Version=3.0
 X-KDE-PluginInfo-Website=http://plasma.kde.org/
 X-KDE-PluginInfo-Category=Containments
 X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=GPLv2+
+X-KDE-PluginInfo-License=GPL-2.0+
 X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-PluginInfo-Version=3.0
 
 X-Plasma-API=declarativeappletscript
 
 X-Plasma-MainScript=ui/main.qml
 X-Plasma-RemoteLocation=
 X-Plasma-RequiredExtensions=LaunchApp,http,localio,networkio
 X-Plasma-ContainmentType=Desktop
diff --git a/containments/folder/metadata.desktop b/containments/folder/metadata.desktop
index e8b2d32c8..418cfd50a 100644
--- a/containments/folder/metadata.desktop
+++ b/containments/folder/metadata.desktop
@@ -1,112 +1,112 @@
 [Desktop Entry]
 Name=Folder View
 Name[ar]=عرض المجلّد
 Name[ca]=Vista de carpeta
 Name[ca@valencia]=Vista de carpeta
 Name[cs]=Pohled na složku
 Name[da]=Mappevisning
 Name[de]=Ordner-Ansicht
 Name[el]=Προβολή φακέλου
 Name[en_GB]=Folder View
 Name[es]=Vista de carpetas
 Name[et]=Kataloogivaade
 Name[eu]=Karpeta ikuspegia
 Name[fi]=Kansionäkymä
 Name[fr]=Vue de dossier
 Name[gl]=Vista de cartafoles
 Name[he]=הצגת תיקיות
 Name[hu]=Mappanézet
 Name[is]=Möppusýn
 Name[it]=Vista delle cartelle
 Name[ja]=フォルダビュー
 Name[ko]=폴더 보기
 Name[lt]=Aplanko rodymas
 Name[nl]=Mapweergave
 Name[nn]=Mappevising
 Name[pa]=ਫੋਲਡਰ ਝਲਕ
 Name[pl]=Widok katalogu
 Name[pt]=Vista da Pasta
 Name[pt_BR]=Visualização de Pastas
 Name[ru]=Просмотр папки
 Name[se]=Máhppačájeheapmi
 Name[sk]=Pohľad priečinka
 Name[sl]=Prikaz mape
 Name[sr]=Приказ фасцикле
 Name[sr@ijekavian]=Приказ фасцикле
 Name[sr@ijekavianlatin]=Prikaz fascikle
 Name[sr@latin]=Prikaz fascikle
 Name[sv]=Katalogvy
 Name[tr]=Klasör Görünümü
 Name[uk]=Перегляд теки
 Name[x-test]=xxFolder Viewxx
 Name[zh_CN]=文件夹视图
 Name[zh_TW]=資料夾檢視
 Comment=Display the contents of folders
 Comment[ar]=اعرض محتويات المجلّدات
 Comment[bs]=Prikaži sadržaj fascikli
 Comment[ca]=Mostra el contingut de les carpetes
 Comment[ca@valencia]=Mostra el contingut de les carpetes
 Comment[cs]=Zobrazit obsah složek
 Comment[da]=Vis indholdet af mapper
 Comment[de]=Ordnerinhalte anzeigen
 Comment[el]=Εμφάνιση περιεχομένων των φακέλων
 Comment[en_GB]=Display the contents of folders
 Comment[es]=Mostrar el contenido de carpetas
 Comment[et]=Kataloogide sisu näitamine
 Comment[eu]=Karpeten edukia erakusten du
 Comment[fi]=Näyttää kansion sisällön
 Comment[fr]=Afficher le contenu de dossiers
 Comment[gl]=Mostra o contido dos cartafoles
 Comment[he]=מציג תוכל של תיקיה
 Comment[hu]=Megjeleníti a mappák tartalmát
 Comment[ia]=Monstra le contentos de dossieres
 Comment[id]=Tampilkan isi folder
 Comment[is]=Sýna innihald mappa
 Comment[it]=Visualizza il contenuto delle cartelle
 Comment[ja]=フォルダーの内容を表示します
 Comment[ko]=폴더의 내용 보기
 Comment[lt]=Rodyti aplankų turinį
 Comment[nb]=Vis mappers innhold
 Comment[nds]=Den Inholt vun Ornern wiesen
 Comment[nl]=Toon de inhoud van mappen
 Comment[nn]=Vis innhaldet i mapper
 Comment[pa]=ਫੋਲਡਰਾਂ ਦੀ ਸਮੱਗਰੀ ਵੇਖਾਓ
 Comment[pl]=Wyświetla zawartość katalogów
 Comment[pt]=Mostrar o conteúdo das pastas
 Comment[pt_BR]=Mostra o conteúdo das pastas
 Comment[ru]=Вывод содержимого папки
 Comment[sk]=Zobraziť obsah priečinkov
 Comment[sl]=Pokaži vsebino map
 Comment[sr]=Приказ садржаја фасцикле
 Comment[sr@ijekavian]=Приказ садржаја фасцикле
 Comment[sr@ijekavianlatin]=Prikaz sadržaja fascikle
 Comment[sr@latin]=Prikaz sadržaja fascikle
 Comment[sv]=Visa innehåll i kataloger
 Comment[tr]=Klasörün içeriklerini görüntüle
 Comment[uk]=Показ вмісту тек
 Comment[x-test]=xxDisplay the contents of foldersxx
 Comment[zh_CN]=显示文件夹的内容
 Comment[zh_TW]=顯示資料夾內容
 
 Type=Service
 Icon=org.kde.plasma.folder
 X-KDE-ParentApp=
 X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
 
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/main.qml
 X-Plasma-RootPath=org.kde.desktopcontainment
 X-Plasma-Provides=org.kde.plasma.filemanagement
 X-Plasma-RemoteLocation=
 X-Plasma-RequiredExtensions=LaunchApp,http,localio,networkio
 X-Plasma-ContainmentType=Desktop
 X-Plasma-DropMimeTypes=inode/directory
 
 X-KDE-PluginInfo-Author=Eike Hein
 X-KDE-PluginInfo-Email=hein@kde.org
 X-KDE-PluginInfo-Name=org.kde.plasma.folder
 X-KDE-PluginInfo-Version=3.0
 X-KDE-PluginInfo-Category=File System
 X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=GPLv2+
+X-KDE-PluginInfo-License=GPL-2.0+
 X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/containments/panel/metadata.desktop b/containments/panel/metadata.desktop
index 36d973304..e098bbd65 100644
--- a/containments/panel/metadata.desktop
+++ b/containments/panel/metadata.desktop
@@ -1,82 +1,82 @@
 [Desktop Entry]
 Encoding=UTF-8
 Keywords=
 Name=Panel
 Name[ar]=لوحة
 Name[be]=Панель
 Name[bn]=প্যানেল
 Name[br]=Panell
 Name[bs]=Panel
 Name[ca]=Plafó
 Name[ca@valencia]=Plafó
 Name[cs]=Panel
 Name[cy]=Panel
 Name[da]=Panel
 Name[de]=Kontrollleiste
 Name[el]=Πίνακας
 Name[en_GB]=Panel
 Name[eo]=Panelo
 Name[es]=Panel
 Name[et]=Paneel
 Name[eu]=Panela
 Name[fa]=تابلو
 Name[fi]=Paneeli
 Name[fr]=Tableau de bord
 Name[ga]=Painéal
 Name[gl]=Panel
 Name[he]=לוח
 Name[hr]=Panel
 Name[hu]=Panel
 Name[ia]=Pannello
 Name[id]=Panel
 Name[is]=Spjald
 Name[it]=Pannello
 Name[ja]=パネル
 Name[ka]=პანელი
 Name[kk]=Панель
 Name[kn]=ಪುಟೀಪು (ಪಾನಲ್)
 Name[ko]=패널
 Name[lt]=Skydelis
 Name[mr]=पटल
 Name[nb]=Panel
 Name[nds]=Paneel
 Name[nl]=Paneel
 Name[nn]=Panel
 Name[pa]=ਪੈਨਲ
 Name[pl]=Panel
 Name[pt]=Painel
 Name[pt_BR]=Painel
 Name[ro]=Panou
 Name[ru]=Панель
 Name[sk]=Panel
 Name[sl]=Pult
 Name[sr]=Панел
 Name[sr@ijekavian]=Панел
 Name[sr@ijekavianlatin]=Panel
 Name[sr@latin]=Panel
 Name[sv]=Panel
 Name[tr]=Panel
 Name[uk]=Панель
 Name[uz]=Panel
 Name[uz@cyrillic]=Панел
 Name[vi]=Bảng điều khiển
 Name[xh]=Iqela lenjongo ethile
 Name[x-test]=xxPanelxx
 Name[zh_CN]=面板
 Name[zh_TW]=面板
 Type=Service
 
 NoDisplay=true
 
 X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
 X-Plasma-API=declarativeappletscript
 X-KDE-ParentApp=
 X-KDE-PluginInfo-Author=Marco Martin
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Email=mart@kde.org
-X-KDE-PluginInfo-License=GPLv2+
+X-KDE-PluginInfo-License=GPL-2.0+
 X-KDE-PluginInfo-Name=org.kde.panel
 X-KDE-PluginInfo-Version=3.0
 X-KDE-PluginInfo-Website=
 X-Plasma-MainScript=ui/main.qml
 X-Plasma-ContainmentType=Panel
diff --git a/containments/panel/plasma-containment-panel.desktop b/containments/panel/plasma-containment-panel.desktop
index c18c468a2..512f3cb54 100644
--- a/containments/panel/plasma-containment-panel.desktop
+++ b/containments/panel/plasma-containment-panel.desktop
@@ -1,127 +1,127 @@
 [Desktop Entry]
 Name=Empty Panel
 Name[ar]=لوحة فارغة
 Name[bs]=Prazan panel
 Name[ca]=Plafó buit
 Name[ca@valencia]=Plafó buit
 Name[cs]=Prázdný panel
 Name[da]=Tomt panel
 Name[de]=Leere Kontrollleiste
 Name[el]=Κενός πίνακας
 Name[en_GB]=Empty Panel
 Name[es]=Panel vacío
 Name[et]=Tühi paneel
 Name[eu]=Panel hutsa
 Name[fi]=Tyhjä paneeli
 Name[fr]=Tableau de bord vide
 Name[ga]=Painéal Folamh
 Name[gl]=Panel baleiro
 Name[he]=לוח ריק
 Name[hr]=Prazan panel
 Name[hu]=Üres panel
 Name[ia]=Pannello vacue
 Name[id]=Panel Kosong
 Name[is]=Autt spjald
 Name[it]=Pannello vuoto
 Name[ja]=空のパネル
 Name[kn]=ಖಾಲಿ ಪುಟೀಪು (ಪ್ಯಾನಲ್)
 Name[ko]=빈 패널
 Name[lt]=Tuščias skydelis
 Name[mr]=रिकामे पटल
 Name[nb]=Tomt panel
 Name[nds]=Leddig Paneel
 Name[nl]=Leeg paneel
 Name[nn]=Tomt panel
 Name[pa]=ਖਾਲੀ ਪੈਨਲ
 Name[pl]=Pusty panel
 Name[pt]=Painel Vazio
 Name[pt_BR]=Painel vazio
 Name[ro]=Panou gol
 Name[ru]=Пустая панель
 Name[sk]=Prázdny panel
 Name[sl]=Prazen pult
 Name[sr]=празан панел
 Name[sr@ijekavian]=празан панел
 Name[sr@ijekavianlatin]=prazan panel
 Name[sr@latin]=prazan panel
 Name[sv]=Tom panel
 Name[tr]=Boş Panel
 Name[uk]=Порожня панель
 Name[vi]=Thanh điều khiển trống
 Name[x-test]=xxEmpty Panelxx
 Name[zh_CN]=空面板
 Name[zh_TW]=空白面板
 Comment=A simple linear panel
 Comment[ar]=لوحة خطّيّة بسيطة
 Comment[bs]=Jednostavan linearni panel
 Comment[ca]=Un plafó lineal senzill
 Comment[ca@valencia]=Un plafó lineal senzill
 Comment[cs]=Jednoduchý přímý panel
 Comment[da]=Et simpelt lineært panel
 Comment[de]=Eine einfache, gerade Kontrollleiste
 Comment[el]=Ένας απλός γραμμικός πίνακας
 Comment[en_GB]=A simple linear panel
 Comment[es]=Un sencillo panel lineal
 Comment[et]=Lihtne sirge paneel
 Comment[eu]=Panel lineal xume bat
 Comment[fi]=Yksinkertainen lineaarinen paneeli
 Comment[fr]=Un tableau de bord linéaire simple
 Comment[ga]=Painéal simplí líneach
 Comment[gl]=Un panel simple
 Comment[he]=לוח ישר פשוט
 Comment[hr]=Jednostavan pravocrtni panel
 Comment[hu]=Egy egyszerű, lineáris panel
 Comment[ia]=Un simple pannello linear
 Comment[id]=Panel linear sederhana
 Comment[is]=Einfalt línulegt spjald
 Comment[it]=Un semplice pannello lineare
 Comment[ja]=簡単なリニアパネル
 Comment[kk]=Жәй панель
 Comment[km]=បន្ទះ​លីនេអ៊ែរ​ធម្មតា
 Comment[kn]=ಒಂದು ಸರಳ ಹಾಗು ರೇಖೀಯ ಫಲಕ
 Comment[ko]=간단한 선형 패널
 Comment[lt]=Paprastas tiesinis pultas
 Comment[lv]=Vienkāršs, lineārs panelis
 Comment[mr]=सोपे रेषीय पटल
 Comment[nb]=En enkelt lineært panel
 Comment[nds]=En eenfach liekweg Paneel
 Comment[nl]=Een eenvoudig lineair paneel
 Comment[nn]=Eit enkelt lineært panel
 Comment[pa]=ਸਧਾਰਨ ਲੀਨੀਅਰ ਪੈਨਲ
 Comment[pl]=Prosty, liniowy panel
 Comment[pt]=Um painel linear simples
 Comment[pt_BR]=Um painel linear simples
 Comment[ro]=Un panou liniar simplu
 Comment[ru]=Простая линейная панель
 Comment[sk]=Jednoduchý lineárny panel
 Comment[sl]=Preprost linearen pult
 Comment[sr]=Једноставан линеарни панел
 Comment[sr@ijekavian]=Једноставан линеарни панел
 Comment[sr@ijekavianlatin]=Jednostavan linearni panel
 Comment[sr@latin]=Jednostavan linearni panel
 Comment[sv]=En enkel linjär panel
 Comment[th]=พาเนลแนวยาวแบบพื้นฐาน
 Comment[tr]=Basit bir doğrusal panel
 Comment[ug]=ئاددىي بىر سىزىقلىق تاختا
 Comment[uk]=Проста лінійна панель
 Comment[vi]=Một thanh điều khiển thẳng đơn giản
 Comment[wa]=On simpe et lineyåre sicriftôr
 Comment[x-test]=xxA simple linear panelxx
 Comment[zh_CN]=简单的线性面板
 Comment[zh_TW]=簡單的線性面板
 Icon=
 Type=Service
 X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
 X-Plasma-ContainmentCategories=panel
 NoDisplay=true
 
 X-KDE-Library=plasma_containment_panel
 X-KDE-PluginInfo-Author=The Plasma Team
 X-KDE-PluginInfo-Email=plasma-devel@kde.org
 X-KDE-PluginInfo-Name=panel
 X-KDE-PluginInfo-Version=3.0
 X-KDE-PluginInfo-Website=http://plasma.kde.org/
 X-KDE-PluginInfo-Category=Containments
 X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=GPLv2+
+X-KDE-PluginInfo-License=GPL-2.0+
 X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/dataengines/kimpanel/plasma-dataengine-kimpanel.desktop b/dataengines/kimpanel/plasma-dataengine-kimpanel.desktop
index ba2462c4c..b02e15441 100644
--- a/dataengines/kimpanel/plasma-dataengine-kimpanel.desktop
+++ b/dataengines/kimpanel/plasma-dataengine-kimpanel.desktop
@@ -1,87 +1,87 @@
 [Desktop Entry]
 Name=DataEngine for Kimpanel
 Name[ca]=Motor de dades pel Kimpanel
 Name[ca@valencia]=Motor de dades pel Kimpanel
 Name[cs]=Datový nástroj pro Kimpanel
 Name[da]=Datamotor for Kimpanel
 Name[de]=Datenmodul für Kimpanel
 Name[el]=Μηχανή δεδομένων για το Kimpanel
 Name[en_GB]=DataEngine for Kimpanel
 Name[es]=Motor de datos para Kimpanel
 Name[et]=Kimpaneli andmemootor
 Name[eu]=Kimpanel-en datuen motorea
 Name[fi]=Tietomoottori Kimpaneliin
 Name[fr]=Moteur de données pour Kimpanel
 Name[gl]=Un motor de datos para Kimpanel.
 Name[hu]=Kimpanel adatmodul
 Name[it]=Motore dati per Kimpanel
 Name[ko]=Kimpanel 데이터 엔진
 Name[nb]=Datamotor for Kimpanel
 Name[nl]=Gegevens-engine voor Kimpanel
 Name[nn]=Datamotor for Kimpanel
 Name[pl]=Silnik danych dla Kimpanel
 Name[pt]=Motor de dados do Kimpanel
 Name[pt_BR]=Mecanismo de dados para o Kimpanel
 Name[ru]=Модуль данных для панели метода ввода
 Name[sk]=Dátový engine pre Kimpanel
 Name[sl]=Podatkovni pogon za Kimpanel
 Name[sr]=Датомотор за К‑ИМ‑панел
 Name[sr@ijekavian]=Датомотор за К‑ИМ‑панел
 Name[sr@ijekavianlatin]=Datomotor za KIMPanel
 Name[sr@latin]=Datomotor za KIMPanel
 Name[sv]=Datagränssnitt för Kimpanel
 Name[tr]=Kimpanel için DataEngine
 Name[uk]=Рушій даних для Kimpanel
 Name[x-test]=xxDataEngine for Kimpanelxx
 Name[zh_CN]=Kimpanel 的数据引擎
 Name[zh_TW]=Kimpanel 資料引擎
 Comment=DataEngine for Kimpanel
 Comment[ca]=Motor de dades pel Kimpanel
 Comment[ca@valencia]=Motor de dades pel Kimpanel
 Comment[cs]=Datový nástroj pro Kimpanel
 Comment[da]=Datamotor for Kimpanel
 Comment[de]=Datenmodul für Kimpanel
 Comment[el]=Μηχανή δεδομένων για το Kimpanel
 Comment[en_GB]=DataEngine for Kimpanel
 Comment[es]=Motor de datos para Kimpanel
 Comment[et]=Kimpaneli andmemootor
 Comment[eu]=Kimpanel-en datuen motorea
 Comment[fi]=Tietomoottori Kimpaneliin
 Comment[fr]=Moteur de données pour Kimpanel
 Comment[gl]=Un motor de datos para Kimpanel.
 Comment[hu]=Adatmodul a Kimpanelhez
 Comment[it]=Motore dati per Kimpanel
 Comment[ko]=Kimpanel 데이터 엔진
 Comment[nb]=Datamotor for Kimpanel
 Comment[nl]=Gegevens-engine voor Kimpanel
 Comment[nn]=Datamotor for Kimpanel
 Comment[pl]=Silnik danych dla Kimpanel
 Comment[pt]=Motor de dados do Kimpanel
 Comment[pt_BR]=Mecanismo de dados para o Kimpanel
 Comment[ru]=Модуль данных для панели метода ввода
 Comment[sk]=Dátový engine pre Kimpanel
 Comment[sl]=Podatkovni pogon za Kimpanel
 Comment[sr]=Датомотор за К‑ИМ‑панел
 Comment[sr@ijekavian]=Датомотор за К‑ИМ‑панел
 Comment[sr@ijekavianlatin]=Datomotor za KIMPanel
 Comment[sr@latin]=Datomotor za KIMPanel
 Comment[sv]=Datagränssnitt för Kimpanel
 Comment[tr]=Kimpanel için DataEngine
 Comment[uk]=Рушій даних для Kimpanel
 Comment[x-test]=xxDataEngine for Kimpanelxx
 Comment[zh_CN]=Kimpanel 的数据引擎
 Comment[zh_TW]=Kimpanel 資料引擎
 Type=Service
 Icon=draw-freehand
 
 X-KDE-ServiceTypes=Plasma/DataEngine
 X-KDE-Library=plasma_engine_kimpanel
 
 X-KDE-PluginInfo-Author=Xuetian Weng
 X-KDE-PluginInfo-Email=wengxt@gmail.com
 X-KDE-PluginInfo-Name=kimpanel
 X-KDE-PluginInfo-Version=0.1
 X-KDE-PluginInfo-Website=http://plasma.kde.org/
 X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=GPLv2+
+X-KDE-PluginInfo-License=GPL-2.0+
 X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/desktoppackage/metadata.desktop b/desktoppackage/metadata.desktop
index a7d84afd8..3e016cb5f 100644
--- a/desktoppackage/metadata.desktop
+++ b/desktoppackage/metadata.desktop
@@ -1,147 +1,147 @@
 [Desktop Entry]
 Comment=Desktop view furniture
 Comment[bs]=Namjesti pogled radne površine
 Comment[ca]=Accessori de vista d'escriptori
 Comment[ca@valencia]=Accessori de vista d'escriptori
 Comment[da]=Møbler til skrivebordsvisning
 Comment[de]=Einrichtung der Ansicht einer Arbeitsfläche
 Comment[el]=Παρουσίαση της επιφάνειας εργασίας
 Comment[en_GB]=Desktop view furniture
 Comment[es]=Accesorio de vista del escritorio
 Comment[et]=Töölauavaate sisustus
 Comment[eu]=Mahaigaina atontzeko tresnak
 Comment[fi]=Työpöydän sisustus
 Comment[fr]=Aménagement du bureau
 Comment[gl]=Contidos da vista do escritorio
 Comment[hu]=Munkaasztal nézet bútor
 Comment[ia]=Vista de accessorio de Scriptorio
 Comment[id]=Furnitur tampilan desktop
 Comment[it]=Componenti della vista del desktop
 Comment[kk]=Үстел көрініс әбзелдері
 Comment[ko]=데스크톱 보기 가구
 Comment[lt]=Darbalaukio vaizdo baldai
 Comment[nb]=Skrivebord, vis møbler
 Comment[nds]=Möbelmang för Schriefdisch-Ansicht
 Comment[nl]=Meubilair voor weergave op het bureaublad
 Comment[nn]=Skrivebordsvisingmøblar
 Comment[pa]=ਡੈਸਕਟਾਪ ਵੇਖਣ ਫਰਨੀਚਰ
 Comment[pl]=Widok umeblowania pulpitu
 Comment[pt]=Disposição do ecrã
 Comment[pt_BR]=Acessório de visualização da área de trabalho
 Comment[ru]=Компоненты пользовательского интерфейса Plasma
 Comment[sk]=Zobrazenie plochy nábytok
 Comment[sl]=Delovna površina prikaza namizja
 Comment[sr]=Намештај приказа површи
 Comment[sr@ijekavian]=Намештај приказа површи
 Comment[sr@ijekavianlatin]=Nameštaj prikaza površi
 Comment[sr@latin]=Nameštaj prikaza površi
 Comment[sv]=Visa skrivbordsmöbler
 Comment[tr]=Masaüstü mobilya görünümü
 Comment[uk]=Компоненти для перегляду стільниці
 Comment[vi]=Xem nội dung bàn làm việc
 Comment[x-test]=xxDesktop view furniturexx
 Comment[zh_CN]=桌面视图家具
 Comment[zh_TW]=桌面檢視設備
 Encoding=UTF-8
 Keywords=
 Name=Desktop
 Name[af]=Werkskerm
 Name[ar]=سطح المكتب
 Name[be]=Працоўны стол
 Name[be@latin]=Rabočy stoł
 Name[bg]=Работен плот
 Name[bn]=ডেস্কটপ
 Name[bn_IN]=ডেস্কটপ
 Name[br]=Gorretaol
 Name[bs]=Radna površina
 Name[ca]=Escriptori
 Name[ca@valencia]=Escriptori
 Name[cs]=Pracovní plocha
 Name[csb]=Pùlt
 Name[cy]=Penbwrdd
 Name[da]=Skrivebord
 Name[de]=Arbeitsfläche
 Name[el]=Επιφάνεια εργασίας
 Name[en_GB]=Desktop
 Name[eo]=Labortablo
 Name[es]=Escritorio
 Name[et]=Töölaud
 Name[eu]=Mahaigaina
 Name[fa]=رومیزی
 Name[fi]=Työpöytä
 Name[fr]=Bureau
 Name[fy]=Buroblêd
 Name[ga]=Deasc
 Name[gl]=Escritorio
 Name[gu]=ડેસ્કટોપ
 Name[he]=שולחן עבודה
 Name[hi]=डेस्कटॉप
 Name[hne]=डेस्कटाप
 Name[hr]=Radna površina
 Name[hsb]=Dźěłowy powjerch
 Name[hu]=Munkaasztal
 Name[ia]=Scriptorio
 Name[id]=Desktop
 Name[is]=Skjáborð
 Name[it]=Desktop
 Name[ja]=デスクトップ
 Name[ka]=სამუშაო დაფა
 Name[kk]=Жұмыс үстелі
 Name[kn]=ಗಣಕತೆರೆ
 Name[ko]=데스크톱
 Name[ku]=Sermasê
 Name[lt]=Darbalaukis
 Name[mai]=डेस्कटाप
 Name[mk]=Работна површина
 Name[ml]=പണിയിടം
 Name[mr]=डेस्कटॉप
 Name[ms]=Ruang Kerja
 Name[nb]=Skrivebord
 Name[nds]=Schriefdisch
 Name[ne]=डेस्कटप
 Name[nl]=Bureaublad
 Name[nn]=Skrivebord
 Name[oc]=Burèu
 Name[or]=ଡ଼େସ୍କଟପ
 Name[pa]=ਡੈਸਕਟਾਪ
 Name[pl]=Pulpit
 Name[pt]=Ambiente de Trabalho
 Name[pt_BR]=Área de Trabalho
 Name[ro]=Birou
 Name[ru]=Рабочий стол по умолчанию
 Name[se]=Čállinbeavdi
 Name[si]=වැඩතලය
 Name[sk]=Plocha
 Name[sl]=Namizje
 Name[sr]=Површ
 Name[sr@ijekavian]=Површ
 Name[sr@ijekavianlatin]=Površ
 Name[sr@latin]=Površ
 Name[sv]=Skrivbord
 Name[ta]=பணிமேசை
 Name[te]=రంగస్ఠలం
 Name[tg]=Мизи корӣ
 Name[th]=พื้นที่ทำงาน
 Name[tr]=Masaüstü
 Name[uk]=Стільниця
 Name[uz]=Ish stoli
 Name[uz@cyrillic]=Иш столи
 Name[vi]=Màn hình nền
 Name[wa]=Sicribanne
 Name[xh]=Desktop
 Name[x-test]=xxDesktopxx
 Name[zh_CN]=桌面
 Name[zh_TW]=桌面
 Type=Service
 Icon=user-desktop
 
 X-KDE-ServiceTypes=Plasma/Shell
 X-KDE-ParentApp=
 X-KDE-PluginInfo-Author=Marco Martin
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Email=mart@kde.org
-X-KDE-PluginInfo-License=GPLv2+
+X-KDE-PluginInfo-License=GPL-2.0+
 X-KDE-PluginInfo-Name=org.kde.plasma.desktop
 X-KDE-PluginInfo-Version=
 X-KDE-PluginInfo-Website=
 X-Plasma-MainScript=layout.js
diff --git a/kcms/desktoptheme/package/metadata.desktop b/kcms/desktoptheme/package/metadata.desktop
index 4004bb2ef..6b29c2d4f 100644
--- a/kcms/desktoptheme/package/metadata.desktop
+++ b/kcms/desktoptheme/package/metadata.desktop
@@ -1,125 +1,125 @@
 [Desktop Entry]
 Name=Desktop Theme
 Name[ar]=سمة سطح المكتب
 Name[bg]=Тема за работния плот
 Name[bn]=ডেস্কটপ থীম
 Name[bs]=Tema površi
 Name[ca]=Tema d'escriptori
 Name[ca@valencia]=Tema d'escriptori
 Name[cs]=Motiv plochy
 Name[da]=Skrivebordstema
 Name[de]=Arbeitsflächen-Design
 Name[el]=Θέμα επιφάνειας εργασίας
 Name[en_GB]=Desktop Theme
 Name[es]=Tema de escritorio
 Name[et]=Töölauateema
 Name[eu]=Mahaigaineko gaia
 Name[fi]=Työpöytäteema
 Name[fr]=Thème de bureau
 Name[ga]=Téama Deisce
 Name[gl]=Tema do escritorio
 Name[gu]=ડેસ્કટોપ થીમ
 Name[he]=ערכת־הנושא לשולחן־העבודה
 Name[hi]=डेस्कटॉप प्रसंग
 Name[hr]=Tema radne površine
 Name[hu]=Asztali téma
 Name[ia]=Thema de scriptorio
 Name[id]=Tema Desktop
 Name[is]=Skjáborðsþema
 Name[it]=Tema del desktop
 Name[ja]=デスクトップテーマ
 Name[kk]=Үстел нақышы
 Name[km]=ស្បែក​ផ្ទៃតុ
 Name[kn]=ಗಣಕತೆರೆ ಪರಿಸರವಿನ್ಯಾಸ
 Name[ko]=데스크톱 테마
 Name[lt]=Darbalaukio apipavidalinimas
 Name[lv]=Darbvirsmas tēma
 Name[mr]=डेस्कटॉप शैली
 Name[nb]=Skrivebordstema
 Name[nds]=Schriefdischmuster
 Name[nl]=Bureaubladthema
 Name[nn]=Skrivebordstema
 Name[pa]=ਡੈਸਕਟਾਪ ਥੀਮ
 Name[pl]=Wygląd pulpitu
 Name[pt]=Tema do Ambiente de Trabalho
 Name[pt_BR]=Tema da área de trabalho
 Name[ro]=Tematica de birou
 Name[ru]=Тема рабочего стола
 Name[si]=වැඩතල තේමාව
 Name[sk]=Téma plochy
 Name[sl]=Namizna tema
 Name[sr]=Тема површи
 Name[sr@ijekavian]=Тема површи
 Name[sr@ijekavianlatin]=Tema površi
 Name[sr@latin]=Tema površi
 Name[sv]=Skrivbordstema
 Name[tg]=Мавзӯъи мизи корӣ
 Name[th]=ชุดตกแต่งพื้นที่ทำงาน
 Name[tr]=Masaüstü Teması
 Name[ug]=ئۈستەلئۈستى ئۆرنىكى
 Name[uk]=Тема стільниці
 Name[vi]=Sắc thái màn hình
 Name[wa]=Tinme do scribanne
 Name[x-test]=xxDesktop Themexx
 Name[zh_CN]=桌面主题
 Name[zh_TW]=桌面主題
 Comment=Desktop Theme
 Comment[ar]=سمة سطح المكتب
 Comment[bs]=Tema radne površine
 Comment[ca]=Tema d'escriptori
 Comment[ca@valencia]=Tema d'escriptori
 Comment[cs]=Motiv plochy
 Comment[da]=Skrivebordstema
 Comment[de]=Arbeitsflächen-Design
 Comment[el]=Θέμα επιφάνειας εργασίας
 Comment[en_GB]=Desktop Theme
 Comment[es]=Tema de escritorio
 Comment[et]=Töölauateema
 Comment[eu]=Mahaigaineko gaia
 Comment[fi]=Työpöytäteema
 Comment[fr]=Thème de bureau
 Comment[gl]=Tema do escritorio
 Comment[he]=ערכת־הנושא לשולחן־העבודה
 Comment[hu]=Asztali téma
 Comment[id]=Tema Desktop
 Comment[is]=Skjáborðsþema
 Comment[it]=Tema del desktop
 Comment[ja]=デスクトップテーマ
 Comment[ko]=데스크톱 테마
 Comment[lt]=Darbalaukio apipavidalinimas
 Comment[mr]=डेस्कटॉप शैली
 Comment[nb]=Skrivebordstema
 Comment[nds]=Schriefdischmuster
 Comment[nl]=Bureaubladthema
 Comment[nn]=Skrivebordstema
 Comment[pa]=ਡੈਸਕਟਾਪ ਥੀਮ
 Comment[pl]=Wygląd pulpitu
 Comment[pt]=Tema do Ambiente de Trabalho
 Comment[pt_BR]=Tema da área de trabalho
 Comment[ru]=Тема рабочего стола
 Comment[sk]=Téma plochy
 Comment[sl]=Namizna tema
 Comment[sr]=Тема површи
 Comment[sr@ijekavian]=Тема површи
 Comment[sr@ijekavianlatin]=Tema površi
 Comment[sr@latin]=Tema površi
 Comment[sv]=Skrivbordstema
 Comment[tr]=Masaüstü Teması
 Comment[uk]=Тема стільниці
 Comment[x-test]=xxDesktop Themexx
 Comment[zh_CN]=桌面主题
 Comment[zh_TW]=桌面主題
 Icon=preferences-desktop-theme
 Keywords=
 Type=Service
 X-KDE-ParentApp=
 X-KDE-PluginInfo-Author=David Rosca
 X-KDE-PluginInfo-Email=nowrep@gmail.com
-X-KDE-PluginInfo-License=GPLv2+
+X-KDE-PluginInfo-License=GPL-2.0+
 X-KDE-PluginInfo-Name=kcm_desktoptheme
 X-KDE-PluginInfo-Version=
 X-KDE-PluginInfo-Website=
 X-KDE-ServiceTypes=Plasma/Generic
 X-Plasma-API=declarativeappletscript
 
 X-Plasma-MainScript=ui/main.qml
diff --git a/kcms/lookandfeel/autotests/lookandfeel/metadata.desktop b/kcms/lookandfeel/autotests/lookandfeel/metadata.desktop
index 6e165219e..352373a82 100644
--- a/kcms/lookandfeel/autotests/lookandfeel/metadata.desktop
+++ b/kcms/lookandfeel/autotests/lookandfeel/metadata.desktop
@@ -1,96 +1,96 @@
 [Desktop Entry]
 Comment=Test Look and Feel package
 Comment[ast]=Paquete d'aspeutu y sentir de prueba
 Comment[bs]=Test paketa Pogledaj i Osjeti
 Comment[ca]=Prova el paquet d'aspecte i comportament
 Comment[ca@valencia]=Prova el paquet d'aspecte i comportament
 Comment[cs]=Otestovat balíček vzhledu a chování
 Comment[da]=Test pakke med udseende og fremtoning
 Comment[de]=Testpaket für das Erscheinungsbild
 Comment[el]=Δοκιμή του πακέτου εμφάνισης και αίσθησης
 Comment[en_GB]=Test Look and Feel package
 Comment[es]=Probar paquete de aspecto visual
 Comment[et]=Välimuse testimine
 Comment[fi]=Ulkoasun ja tuntuman testipaketti
 Comment[fr]=Tester le paquet d'apparence
 Comment[gl]=Paquete de aparencia e comportamento de probas
 Comment[hu]=A megjelenés csomag tesztelése
 Comment[id]=Paket Tes Lihat dan Rasakan
 Comment[it]=Prova il pacchetto dell'aspetto
 Comment[ja]=外観パッケージをテスト
 Comment[ko]=모습과 느낌 테스트 패키지
 Comment[nb]=Test pakka Utseende og oppførsel
 Comment[nds]=Test-Utsehn- un Bedenen-Paket
 Comment[nl]=Pakket voor uiterlijk en gedrag testen
 Comment[nn]=Testpakke for utsjånad og åtferd
 Comment[pl]=Wypróbuj pakiet wrażeń wzrokowych i dotykowych
 Comment[pt]=Pacote de teste da Aparência e Comportamento
 Comment[pt_BR]=Pacote de teste de Aparência
 Comment[ru]=Тестовое оформление рабочей среды
 Comment[sk]=Balík pre vzhľad a nastavenie
 Comment[sl]=Preizkusni paket za Videz in občutek
 Comment[sr]=Пробни пакет изгледа и осећаја
 Comment[sr@ijekavian]=Пробни пакет изгледа и осећаја
 Comment[sr@ijekavianlatin]=Probni paket izgleda i osećaja
 Comment[sr@latin]=Probni paket izgleda i osećaja
 Comment[sv]=Prova paket för utseende och känsla
 Comment[tr]=Görünüm ve Duyum paketini dene
 Comment[uk]=Перевірка пакунка вигляду і поведінки
 Comment[x-test]=xxTest Look and Feel packagexx
 Comment[zh_CN]=测试观感包
 Comment[zh_TW]=測試外觀與感覺套件
 Encoding=UTF-8
 Name=Test
 Name[bs]=Test
 Name[ca]=Prova
 Name[ca@valencia]=Prova
 Name[cs]=Test
 Name[da]=Test
 Name[de]=Test
 Name[el]=Δοκιμή
 Name[en_GB]=Test
 Name[es]=Probar
 Name[et]=Test
 Name[fi]=Testi
 Name[fr]=Tester
 Name[gl]=Proba
 Name[hu]=Teszt
 Name[id]=Tes
 Name[it]=Prova
 Name[ja]=テスト
 Name[ko]=시험
 Name[nb]=Test
 Name[nds]=Test
 Name[nl]=Test
 Name[nn]=Test
 Name[pa]=ਟੈਸਟ
 Name[pl]=Próba
 Name[pt]=Teste
 Name[pt_BR]=Teste
 Name[ru]=Тест
 Name[se]=Geahččaleapmi
 Name[sk]=Test
 Name[sl]=Preizkus
 Name[sr]=Проба
 Name[sr@ijekavian]=Проба
 Name[sr@ijekavianlatin]=Proba
 Name[sr@latin]=Proba
 Name[sv]=Prova
 Name[tr]=Test
 Name[uk]=Тест
 Name[x-test]=xxTestxx
 Name[zh_CN]=测试
 Name[zh_TW]=測試
 
 Type=Service
 
 X-KDE-ServiceTypes=Plasma/LookAndFeel
 X-KDE-ParentApp=
 X-KDE-PluginInfo-Author=KDE Visual Design Group
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Email=plasma-devel@kde.org
-X-KDE-PluginInfo-License=GPLv2+
+X-KDE-PluginInfo-License=GPL-2.0+
 X-KDE-PluginInfo-Name=org.kde.test
 X-KDE-PluginInfo-Version=2.0
 X-KDE-PluginInfo-Website=http://www.kde.org
 X-Plasma-MainScript=defaults
diff --git a/kcms/touchpad/src/applet/dataengine.desktop b/kcms/touchpad/src/applet/dataengine.desktop
index 32f47ef1f..11353b20a 100644
--- a/kcms/touchpad/src/applet/dataengine.desktop
+++ b/kcms/touchpad/src/applet/dataengine.desktop
@@ -1,54 +1,54 @@
 [Desktop Entry]
 Name=Touchpad DataEngine
 Name[ar]=محرّك بيانات لوحة اللمس
 Name[ca]=Motor de dades del ratolí tàctil
 Name[ca@valencia]=Motor de dades del ratolí tàctil
 Name[cs]=Datový stroj pro touchpad
 Name[da]=Touchpad-datamotor
 Name[de]=Touchpad-Datenquelle
 Name[el]=Μηχανή δεδομένων επιφάνειας αφής
 Name[en_GB]=Touchpad DataEngine
 Name[es]=Motor de datos del panel táctil
 Name[et]=Puutepadja andmemootor
 Name[eu]=Ukimen-saguen datuen motorea
 Name[fi]=Kosketuslevyn tietomoottori
 Name[fr]=Moteur de données du pavé tactile
 Name[gl]=DataEngine de touchpad
 Name[hu]=Érintőtábla adatmodul
 Name[is]=Gagnavél snertiplatta
 Name[it]=Motore di dati del touchpad
 Name[ko]=터치패드 데이터 엔진
 Name[lt]=Jutiklinio kilimėlio duomenų variklis
 Name[nl]=Gegevensengine voor touchpad
 Name[nn]=DataEngine for styreplate
 Name[pa]=ਟੱਚਪੈਡ ਡਾਟਾਇੰਜਣ
 Name[pl]=Silnik danych gładzika
 Name[pt]=Motor de Dados do Rato por Toque
 Name[pt_BR]=Mecanismo de dados do touchpad
 Name[ru]=Модуль данных сенсорной панели
 Name[sk]=Touchpad DataEngine
 Name[sl]=PodatkovniPogon za sledilno ploščico
 Name[sr]=Датомотор додирника
 Name[sr@ijekavian]=Датомотор додирника
 Name[sr@ijekavianlatin]=Datomotor dodirnika
 Name[sr@latin]=Datomotor dodirnika
 Name[sv]=Datagränssnitt för tryckplatta
 Name[tr]=Dokunmatik Yüzey Veri Motoru
 Name[uk]=Рушій даних сенсорної панелі
 Name[x-test]=xxTouchpad DataEnginexx
 Name[zh_CN]=触摸板数据引擎
 Name[zh_TW]=觸控板資料引擎
 Icon=input-touchpad
 Type=Service
 
 X-KDE-ServiceTypes=Plasma/DataEngine
 X-KDE-Library=plasma_engine_touchpad
 X-KDE-PluginInfo-Name=touchpad
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Author=Alexander Mezin
 X-KDE-PluginInfo-Email=mezin.alexander@gmail.com
 X-KDE-PluginInfo-Version=@TOUCHPAD_KCM_VERSION@
 X-KDE-PluginInfo-Website=https://projects.kde.org/projects/playground/utils/kcm-touchpad/
 X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=GPLv2+
+X-KDE-PluginInfo-License=GPL-2.0+
 X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/kcms/touchpad/src/applet/qml/metadata.desktop b/kcms/touchpad/src/applet/qml/metadata.desktop
index 02b5c1c85..1ff4cdaad 100644
--- a/kcms/touchpad/src/applet/qml/metadata.desktop
+++ b/kcms/touchpad/src/applet/qml/metadata.desktop
@@ -1,141 +1,141 @@
 [Desktop Entry]
 Comment=Shows current touchpad state
 Comment[ar]=أظهر حالة لوحة اللمس الحاليّة
 Comment[ca]=Mostra l'estat actual del ratolí tàctil
 Comment[ca@valencia]=Mostra l'estat actual del ratolí tàctil
 Comment[cs]=Zobrazí současný stav touchpadu
 Comment[da]=Vis aktuel touchpad-tilstand
 Comment[de]=Zeigt den aktuellen Status des Touchpads an
 Comment[el]=Δείχνει την τρέχουσα κατάσταση της επιφάνειας αφής
 Comment[en_GB]=Shows current touchpad state
 Comment[es]=Muestra el estado actual del panel táctil
 Comment[et]=Puutepadja aktiivse oleku näitamine
 Comment[eu]=Erakutsi uneko ukimen-saguaren egoera
 Comment[fi]=Näyttää kosketuslevyn nykyisen tilan
 Comment[fr]=Afficher l'état actuel du pavé tactile
 Comment[gl]=Mostra o estado do touchpad actual
 Comment[he]=הראה את מצב לוח המגע
 Comment[hu]=Az érintőtábla állapotának megjelenítése
 Comment[is]=Birtir stöðu snertiplatta
 Comment[it]=Mostra lo stato attuale del touchpad
 Comment[ja]=現在のタッチパッドの状態を表示
 Comment[ko]=현재 터치패드 상태 표시
 Comment[lt]=Rodo esamą jutiklinio kilimėlio būseną
 Comment[nl]=Huidige status van touchpad tonen
 Comment[nn]=Vis gjeldande styreplatestatus
 Comment[pa]=ਮੌਜੂਦਾ ਟੱਚਪੈਠ ਦੀ ਹਾਲਤ ਦਿਖਾਉਂਦਾ ਹੈ
 Comment[pl]=Pokazuje bieżący stan gładzika
 Comment[pt]=Mostra o estado actual do rato por toque
 Comment[pt_BR]=Mostra o estado atual do touchpad
 Comment[ru]=Показывает текущее состояние сенсорной панели
 Comment[sk]=Zobrazí aktuálny stav touchpadu
 Comment[sl]=Prikazuje trenutno stanje sledilne ploščice
 Comment[sr]=Приказ тренутног стања додирника
 Comment[sr@ijekavian]=Приказ тренутног стања додирника
 Comment[sr@ijekavianlatin]=Prikaz trenutnog stanja dodirnika
 Comment[sr@latin]=Prikaz trenutnog stanja dodirnika
 Comment[sv]=Visar tryckplattans nuvarande tillstånd
 Comment[tr]=Dokunmatik yüzeyin durumunu gösterir
 Comment[uk]=Показує поточний стан сенсорної панелі
 Comment[x-test]=xxShows current touchpad statexx
 Comment[zh_CN]=显示当前触摸板状态
 Comment[zh_TW]=顯示目前的觸控板狀態
 Encoding=UTF-8
 Icon=input-touchpad
 Keywords=Touchpad
 Keywords[ca]=Ratolí tàctil
 Keywords[ca@valencia]=Ratolí tàctil
 Keywords[cs]=Touchpad
 Keywords[da]=Touchpad
 Keywords[de]=Touchpad
 Keywords[el]=Επιφάνεια αφής
 Keywords[en_GB]=Touchpad
 Keywords[es]=Panel táctil
 Keywords[et]=Puutepadi
 Keywords[eu]=Ukimen-sagua
 Keywords[fi]=Kosketuslevy
 Keywords[fr]=Pavé tactile
 Keywords[gl]=Touchpad
 Keywords[he]=לוח מגע
 Keywords[hu]=Érintőtábla
 Keywords[is]=Snertiplatti
 Keywords[it]=Touchpad
 Keywords[ja]=タッチパッド
 Keywords[ko]=터치패드
 Keywords[lt]=Jutiklinis kilimėlis
 Keywords[nl]=Touchpad
 Keywords[nn]=Styreplate
 Keywords[pa]=ਟੱਚਪੈਡ
 Keywords[pl]=Gładzik
 Keywords[pt]=Rato por Toque
 Keywords[pt_BR]=Touchpad
 Keywords[ru]=сенсорная панель
 Keywords[sk]=Touchpad
 Keywords[sl]=Sledilna ploščica
 Keywords[sr]=touchpad;додирник;
 Keywords[sr@ijekavian]=touchpad;додирник;
 Keywords[sr@ijekavianlatin]=touchpad;dodirnik;
 Keywords[sr@latin]=touchpad;dodirnik;
 Keywords[sv]=Tryckplatta
 Keywords[tr]=Dokunmatik yüzey
 Keywords[uk]=Сенсорна панель
 Keywords[x-test]=xxTouchpadxx
 Keywords[zh_CN]=触摸板
 Keywords[zh_TW]=觸控板
 Name=Touchpad
 Name[ar]=لوحة اللمس
 Name[ca]=Ratolí tàctil
 Name[ca@valencia]=Ratolí tàctil
 Name[cs]=Touchpad
 Name[da]=Touchpad
 Name[de]=Touchpad
 Name[el]=Επιφάνεια αφής
 Name[en_GB]=Touchpad
 Name[es]=Panel táctil
 Name[et]=Puutepadi
 Name[eu]=Ukimen-sagua
 Name[fi]=Kosketuslevy
 Name[fr]=Pavé tactile
 Name[gl]=Touchpad
 Name[he]=לוח מגע
 Name[hu]=Érintőtábla
 Name[is]=Snertiplatti
 Name[it]=Touchpad
 Name[ja]=タッチパッド
 Name[ko]=터치패드
 Name[lt]=Jutiklinis kilimėlis
 Name[nl]=Touchpad
 Name[nn]=Styreplate
 Name[pa]=ਟੱਚਪੈਡ
 Name[pl]=Gładzik
 Name[pt]=Rato por Toque
 Name[pt_BR]=Touchpad
 Name[ru]=Сенсорная панель
 Name[sk]=Touchpad
 Name[sl]=Sledilna ploščica
 Name[sr]=Додирник
 Name[sr@ijekavian]=Додирник
 Name[sr@ijekavianlatin]=Dodirnik
 Name[sr@latin]=Dodirnik
 Name[sv]=Tryckplatta
 Name[tr]=Dokunmatik yüzey
 Name[uk]=Сенсорна панель
 Name[x-test]=xxTouchpadxx
 Name[zh_CN]=触摸板
 Name[zh_TW]=觸控板
 Type=Service
 X-KDE-ParentApp=
 X-KDE-PluginInfo-Author=Alexander Mezin
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Email=mezin.alexander@gmail.com
-X-KDE-PluginInfo-License=GPLv2+
+X-KDE-PluginInfo-License=GPL-2.0+
 X-KDE-PluginInfo-Name=touchpad
 X-KDE-PluginInfo-Version=@TOUCHPAD_KCM_VERSION@
 X-KDE-PluginInfo-Website=https://projects.kde.org/projects/playground/utils/kcm-touchpad/
 X-KDE-ServiceTypes=Plasma/Applet
 X-Plasma-API=declarativeappletscript
 X-Plasma-ConfigPlugins=kcm_touchpad
 X-Plasma-DefaultSize=32,32
 X-Plasma-MainScript=ui/touchpad.qml
 X-Plasma-NotificationArea=true
 X-Plasma-RemoteLocation=