diff --git a/activeshellpackage/package/metadata.desktop b/activeshellpackage/package/metadata.desktop
index 3ffe41ee..492ecb81 100644
--- a/activeshellpackage/package/metadata.desktop
+++ b/activeshellpackage/package/metadata.desktop
@@ -1,63 +1,65 @@
 [Desktop Entry]
 Comment=Plasma Active shell
 Comment[ca]=Intèrpret d'ordres del Plasma Active
 Comment[ca@valencia]=Intèrpret d'ordres del Plasma Active
 Comment[da]=Plasma Active-skal
 Comment[de]=Plasma-Active-Shell
 Comment[el]=Ενεργό Κέλυφος του Plasma
 Comment[en_GB]=Plasma Active shell
 Comment[es]=Intérprete para Plasma Active
 Comment[fi]=Plasma Active -kuori
 Comment[fr]=Environnement Plasma Active
 Comment[gl]=Shell de Plasma Active
 Comment[ko]=Plasma Active 셸
 Comment[nl]=Plasma-activiteit-shell
 Comment[pl]=Powłoka Plazma Active
 Comment[pt]=Consola do Plasma Active
 Comment[pt_BR]=Shell do Plasma Active
 Comment[sk]=Plasma Active shell
 Comment[sl]=Lupina Plasma Active
 Comment[sv]=Plasma Active skal
 Comment[tr]=Plasma Active kabuğu
 Comment[uk]=Портативна оболонка Плазми
 Comment[x-test]=xxPlasma Active shellxx
 Comment[zh_CN]=Plasma Active 外壳
+Comment[zh_TW]=Plasma Active shell
 Encoding=UTF-8
 Keywords=
 Name=Desktop
 Name[ast]=Escritoriu
 Name[ca]=Escriptori
 Name[ca@valencia]=Escriptori
 Name[cs]=Pracovní plocha
 Name[da]=Desktop
 Name[de]=Arbeitsfläche
 Name[el]=Περιβάλλον γραφείου
 Name[en_GB]=Desktop
 Name[es]=Escritorio
 Name[fi]=Työpöytä
 Name[fr]=Bureau
 Name[gl]=Escritorio
 Name[ko]=데스크톱
 Name[nl]=Bureaublad
 Name[pl]=Pulpit
 Name[pt]=Ambiente de Trabalho
 Name[pt_BR]=Ambiente de trabalho
 Name[sk]=Plocha
 Name[sl]=Namizje
 Name[sv]=Skrivbord
 Name[tr]=Masaüstü
 Name[uk]=Стільниця
 Name[x-test]=xxDesktopxx
 Name[zh_CN]=桌面
+Name[zh_TW]=桌面
 Type=Service
 
 X-KDE-ServiceTypes=Plasma/Shell
 X-KDE-ParentApp=
 X-KDE-PluginInfo-Author=Antonis Tsiapaliokas
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Email=antonis.tsiapaliokas@kde.org
 X-KDE-PluginInfo-License=GPLv2+
 X-KDE-PluginInfo-Name=org.kde.plasma.active
 X-KDE-PluginInfo-Version=
 X-KDE-PluginInfo-Website=
 X-Plasma-MainScript=layout.js
diff --git a/activetoolbox/metadata.desktop b/activetoolbox/metadata.desktop
index 24a7e445..b2dd9699 100644
--- a/activetoolbox/metadata.desktop
+++ b/activetoolbox/metadata.desktop
@@ -1,46 +1,47 @@
 [Desktop Entry]
 Name=Plasma Active Toolbox
 Name[ca]=Quadre d'eines del Plasma Active
 Name[ca@valencia]=Quadre d'eines del Plasma Active
 Name[da]=Plasma Active værktøjskasse
 Name[de]=Plasma-Active-Werkzeugkasten
 Name[el]=Ενεργή Εργαλειοθήκη του Plasma
 Name[en_GB]=Plasma Active Toolbox
 Name[es]=Caja de herramientas de Plasma Active
 Name[fi]=Plasma Active -työkalupakki
 Name[fr]=Boîte à outils Plasma Active
 Name[gl]=Barra de ferramentas de Plasma Active
 Name[ko]=Plasma Active 도구 상자
 Name[nl]=Actieve Plasma-hulpmiddelen
 Name[pl]=Pasek narzędzi Plazma Active
 Name[pt]=Ferramentas do Plasma Active
 Name[pt_BR]=Barra de ferramentas do Plasma Active
 Name[sk]=Plasma Active Toolbox
 Name[sl]=Orodjarna Plasma Active
 Name[sv]=Plasma Active verktygslåda
 Name[tr]=Plasma Active Araç Kutusu
 Name[uk]=Набір інструментів портативної Плазми
 Name[x-test]=xxPlasma Active Toolboxxx
 Name[zh_CN]=Plasma Active 工具箱
+Name[zh_TW]=Plasma Active 工具箱
 Encoding=UTF-8
 
 Type=Service
 Icon=plasma
 X-KDE-ParentApp=
 X-KDE-ServiceTypes=Plasma/Generic
 
 X-KDE-PluginInfo-Author=Antonis Tsiapaliokas
 X-KDE-PluginInfo-Email=antonis.tsiapaliokas@kde.org
 X-KDE-PluginInfo-Name=org.kde.plasma.activetoolbox
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-Website=http://plasma.kde.org/
 X-KDE-PluginInfo-Category=Containments
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-PluginInfo-Version=0.1
 
 X-Plasma-API=declarativeappletscript
 
 X-Plasma-MainScript=ui/ToolBoxRoot.qml
 X-Plasma-RemoteLocation=
diff --git a/applications/filebrowser/plasma-filebrowserpart.desktop b/applications/filebrowser/plasma-filebrowserpart.desktop
index 49d1c470..d5568163 100644
--- a/applications/filebrowser/plasma-filebrowserpart.desktop
+++ b/applications/filebrowser/plasma-filebrowserpart.desktop
@@ -1,48 +1,48 @@
 [Desktop Entry]
 Type=ServiceType
 X-KDE-ServiceType=Active/FileBrowserPart
 
 Comment=Plasma package to load a particular mimetype directly in the file browser
 Comment[bs]=Plasma paket za učitavanje određenog mimičkog tipa  direktno u pregledniku datoteka
 Comment[ca]=Paquet de plasma per a carregar un tipus MIME en particular directament al gestor de fitxers
 Comment[ca@valencia]=Paquet de plasma per a carregar un tipus MIME en particular directament al gestor de fitxers
 Comment[da]=Plasma-pakke til at indlæse en bestemt MIME-type direkte i filbrowseren
 Comment[de]=Plasma-Paket, um einen bestimmten MIME-Typ direkt in den Dateibrowser zu laden
 Comment[el]=Πακέτο plasma για φόρτωση ενός συγκεκριμένου τύπου mime απευθείας στον περιηγητή αρχείων
 Comment[en_GB]=Plasma package to load a particular mimetype directly in the file browser
 Comment[es]=Paquete de Plasma para cargar un tipo MIME particular directamente en el navegador de archivos
 Comment[et]=Plasma pakett konkreetse MIME tüübi laadimiseks otse failibrauseris
 Comment[fr]=Paquetage Plasma pour charger un type MIME particulier directement dans l'explorateur de fichiers
 Comment[gl]=Paquete de plasma para cargar un tipo de ficheiro MIME en concreto directamente no navegador web.
 Comment[hu]=Plasma csomag MIME-típus közvetlen betöltésére a fájlböngészőben
 Comment[it]=Pacchetto di Plasma per caricare un mimetype particolare direttamente nel browser dei file
 Comment[kk]=Кейбір MIME түрлерін файл шолғышқа тікелей жүктейтін Plasma дестесі
 Comment[km]=កញ្ចប់​ប្លាស្មា​ដែល​ត្រូវ​ផ្ទុក mimetype ជាក់លាក់​ដោយ​ផ្ទាល់​ទៅ​ក្នុង​កម្មវិធី​រក​ឯកសារ
 Comment[ko]=파일 탐색기에서 특정한 MIME 형식을 불러오는 Plasma 패키지
 Comment[nb]=Plasma-pakke som laster en bestemt mimetype direkte i filblaingen
 Comment[nds]=Plasma-Paket, mit dat sik en besünner MIME-Typ direktemang mit den Dateikieker laden lett
 Comment[nl]=Plasma-pakket voor het laden van een speciaal mimetype direct in bestandsbrowser
 Comment[pl]=Pakiet Plazmy do wczytywania poszczególnych typów mime bezpośrednio w przeglądarce plików
 Comment[pt]=Pacote do Plasma para carregar um tipo MIME em particular no gestor de ficheiros
 Comment[pt_BR]=Pacote do Plasma para carregar um tipo MIME em particular no gerenciador de arquivos
 Comment[sk]=Balík Plasma na načítanie určitého mime typu priamo do prehliadač súborov
 Comment[sl]=Paket za Plasmo, ki naloži posebno vrsto mime neposredno v brskalnik datotek
 Comment[sv]=Plasma-paket för att läsa in en viss Mime-typ direkt i filbläddraren
 Comment[tr]=Dosya türünü doğrudan dosya tarayıcısı ile tüklemek için Plasma paketi
 Comment[uk]=Пакунок Плазми для завантаження даних певного типу MIME безпосередньо з вікна програми для перегляду файлів
 Comment[wa]=Pacaedje plasma po tcherdjî ene sôre mime dinêye direk do foyteu des fitchîs
 Comment[x-test]=xxPlasma package to load a particular mimetype directly in the file browserxx
 Comment[zh_CN]=用于在文件管理器中直接载入特定 mime 类型的 Plasma 包
-Comment[zh_TW]=直接在檔案瀏覽器直接載入特別的 MIME 型態的 Plasma 套件
+Comment[zh_TW]=直接在檔案瀏覽器直接載入特別的 MIME 型態的 Plasma 套件包
 
 #At the moment supported Browser and Viewer
 [PropertyDef::SupportedComponents]
 Type=QStringList
 
 #MimeTypes, such as image/jpeg
 [PropertyDef::MimeTypes]
 Type=QStringList
 
 #Nepomuk types, such as nfo:Image
 [PropertyDef::ResourceTypes]
 Type=QStringList
diff --git a/containments/activepanel/metadata.desktop b/containments/activepanel/metadata.desktop
index 93d41142..9bb5f942 100644
--- a/containments/activepanel/metadata.desktop
+++ b/containments/activepanel/metadata.desktop
@@ -1,74 +1,75 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Mobile Panel
 Name[ca]=Plafó mòbil
 Name[ca@valencia]=Plafó mòbil
 Name[da]=Mobilpanel
 Name[de]=Kontrollleiste für Mobile
 Name[el]=Mobile Panel
 Name[en_GB]=Mobile Panel
 Name[es]=Panel móvil
 Name[fr]=Panneau mobile
 Name[gl]=Panel móbil
 Name[ko]=모바일 패널
 Name[nl]=Paneel voor mobiel
 Name[pl]=Panel mobilny
 Name[pt]=Painel Móvel
 Name[pt_BR]=Painel móvel
 Name[sk]=Mobilný panel
 Name[sl]=Pult za Mobile
 Name[sv]=Mobil panel
 Name[tr]=Mobil Panel
 Name[uk]=Мобільна панель
 Name[x-test]=xxMobile Panelxx
 Name[zh_CN]=移动面板
+Name[zh_TW]=行動面板
 Comment=A system tray applet for mobile shell
 Comment[bs]=Programčić u sistemskom tray za mobilne školjke
 Comment[ca]=Una miniaplicació de safata del sistema per a l'àrea de treball del mòbil
 Comment[ca@valencia]=Una miniaplicació de safata del sistema per a l'àrea de treball del mòbil
 Comment[da]=En statusområde-applet til Mobil-skallen
 Comment[de]=Mobile-Shell-Miniprogramm im Systemabschnitt der Kontrollleiste
 Comment[el]=Μικροεφαρμογή πλαισίου συστήματος για κέλυφος κινητού
 Comment[en_GB]=A system tray applet for mobile shell
 Comment[es]=Una miniaplicación de la bandeja del sistema para entornos móviles
 Comment[et]=Süsteemisalve aplett mobiilile
 Comment[fr]=Une applet de boîte à miniatures pour une console de réseau mobile
 Comment[gl]=Un miniaplicativo de área de notificación para shells móbiles.
 Comment[hu]=Egy paneltálca a mobil felülethez
 Comment[it]=Applet per il vassoio di sistema mobile
 Comment[kk]=Ұялыға арналған жүйелік сөре апплеті
 Comment[km]=ថាស​ប្រព័ន្ធ​អាប់ភ្លេត​សម្រាប់​សែល​ចល័ត
 Comment[ko]=모바일 셸을 위한 시스템 트레이 애플릿
 Comment[nb]=Et systemkurv-miniprogram for mobilt skall
 Comment[nds]=En Systeemafsnitt-Lüttprogramm för de Mobil-Konsool
 Comment[nl]=Een systeemvak-applet voor de mobiele shell
 Comment[pa]=ਮੋਬਾਇਲ ਸੈੱਲ ਲਈ ਸਿਸਟਮ ਟਰੇ ਐਪਲਿਟ
 Comment[pl]=Aplet tacki systemowej dla powłoki Mobile
 Comment[pt]=Uma 'applet' da bandeja para a área de trabalho móvel
 Comment[pt_BR]=Um miniaplicativo de área de notificação para a área de trabalho móvel
 Comment[sk]=Applet systémovej lišty pre mobilný shell
 Comment[sl]=Aplet sistemske vrstice za lupino za Mobile
 Comment[sv]=Ett miniprogram för systembrickan i mobila skal
 Comment[tr]=Mobil kabuk için sistem çekmecesi gereci
 Comment[uk]=Аплет системного лотка для командної оболонки керування мобільним телефоном
 Comment[wa]=Ene boesse ås imådjetes sistinme pol shell axhlåve
 Comment[x-test]=xxA system tray applet for mobile shellxx
 Comment[zh_CN]=用于移动外壳的系统托盘小程序
 Comment[zh_TW]=Mobile shell 使用的系統匣
 Icon=preferences-desktop-notification
 Type=Service
 X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
 
 X-KDE-ParentAppp=plasma-mobile
 X-Plasma-API=declarativeappletscript
 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.plasma.activepanel
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-Website=http://plasma.kde.org/
 X-KDE-PluginInfo-Category=Windows and Tasks
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL v2+
 X-KDE-PluginInfo-EnabledByDefault=true
 X-Plasma-ContainmentType=Panel