diff --git a/clients/b2/b2.desktop b/clients/b2/b2.desktop
index 2846e3965f..24f56ac590 100644
--- a/clients/b2/b2.desktop
+++ b/clients/b2/b2.desktop
@@ -84,8 +84,8 @@ Name[uz]=B II
 Name[uz@cyrillic]=B II
 Name[vi]=B II
 Name[wa]=B II
-Name[xh]=B II
 Name[x-test]=xxB IIxx
+Name[xh]=B II
 Name[zh_CN]=B II
 Name[zh_TW]=B II
 X-KDE-Library=kwin3_b2
diff --git a/clients/laptop/laptop.desktop b/clients/laptop/laptop.desktop
index ccc9d54809..e93ab2c53e 100644
--- a/clients/laptop/laptop.desktop
+++ b/clients/laptop/laptop.desktop
@@ -85,8 +85,8 @@ Name[uz]=Laptop
 Name[uz@cyrillic]=Лаптоп
 Name[vi]=Máy xách tay
 Name[wa]=Poirtåve
-Name[xh]=Umphezulu osongiweyo
 Name[x-test]=xxLaptopxx
+Name[xh]=Umphezulu osongiweyo
 Name[zh_CN]=笔记本电脑
 Name[zh_TW]=筆記型電腦
 X-KDE-Library=kwin3_laptop
diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index 8c3afd7915..ca8c65400d 100644
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -154,8 +154,8 @@ Comment[uz]=Oyna sarlavhasining tashqi koʻrinishini moslash
 Comment[uz@cyrillic]=Ойна сарлавҳасининг ташқи кўринишини мослаш
 Comment[vi]=Cấu hình giao diện và cảm nhận cho tên cửa sổ
 Comment[wa]=Apontyî li rivnance eyet l' dujhance des tites des fniesses
-Comment[xh]=Qwalasela inkangeleko nemvakalelo yezihloko zeWindow
 Comment[x-test]=xxConfigure the look and feel of window titlesxx
+Comment[xh]=Qwalasela inkangeleko nemvakalelo yezihloko zeWindow
 Comment[zh_CN]=配置窗口标题的观感
 Comment[zh_TW]=設定視窗標題列的外觀與感覺
 
diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop
index e137671034..f21b30ec54 100644
--- a/kcmkwin/kwindesktop/desktop.desktop
+++ b/kcmkwin/kwindesktop/desktop.desktop
@@ -157,8 +157,8 @@ Comment[uz]=Bu yerda virtual ish stollarning sonini moslashingiz mumkin
 Comment[uz@cyrillic]=Бу ерда виртуал иш столларнинг сонини мослашингиз мумкин
 Comment[vi]=Bạn có khả năng đặt số màn hình nền ảo ở đây
 Comment[wa]=Vos ploz apontyî cobén di forveyous scribannes i gn a.
-Comment[xh]=Ungaqwalasela ukuba zizakubangakanani ii desktops ezingabonakaliyo.
 Comment[x-test]=xxYou can configure how many virtual desktops there are.xx
+Comment[xh]=Ungaqwalasela ukuba zizakubangakanani ii desktops ezingabonakaliyo.
 Comment[zh_CN]=您可以在这里配置虚拟桌面的数量。
 Comment[zh_TW]=您可以在這裡設定要有多少個虛擬桌面。
 X-KDE-Keywords=desktop,desktops,number,virtual desktop
diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop
index a14efa3c9d..7d9a64cb20 100644
--- a/kcmkwin/kwinoptions/kwinactions.desktop
+++ b/kcmkwin/kwinoptions/kwinactions.desktop
@@ -95,8 +95,8 @@ Name[uz]=Amallar
 Name[uz@cyrillic]=Амаллар
 Name[vi]=Hành động
 Name[wa]=Accions
-Name[xh]=Iintshukumo
 Name[x-test]=xxActionsxx
+Name[xh]=Iintshukumo
 Name[zh_CN]=动作
 Name[zh_TW]=動作
 
@@ -183,8 +183,8 @@ Comment[uz]=Sichqoncha va tugmatagni moslash
 Comment[uz@cyrillic]=Сичқонча ва тугматагни мослаш
 Comment[vi]=Cấu hình thiết lập bàn phím và con chuột
 Comment[wa]=Apontiaedjes del sori eyet del taprece
-Comment[xh]=Qwalasela izicwangciso zebhodi yezitshixho neze mouse
 Comment[x-test]=xxConfigure keyboard and mouse settingsxx
+Comment[xh]=Qwalasela izicwangciso zebhodi yezitshixho neze mouse
 Comment[zh_CN]=配置键盘和鼠标设置
 Comment[zh_TW]=設定鍵盤與滑鼠的設定值
 
diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop
index ab46a75756..36160e8994 100644
--- a/kcmkwin/kwinoptions/kwinadvanced.desktop
+++ b/kcmkwin/kwinoptions/kwinadvanced.desktop
@@ -94,8 +94,8 @@ Name[uz]=Qoʻshimcha
 Name[uz@cyrillic]=Қўшимча
 Name[vi]=Nâng cao
 Name[wa]=Sipepieus
-Name[xh]=Ebhekisa phambili
 Name[x-test]=xxAdvancedxx
+Name[xh]=Ebhekisa phambili
 Name[zh_CN]=高级
 Name[zh_TW]=進階
 
@@ -181,8 +181,8 @@ Comment[uz]=Oyna boshqaruvning koʻshimcha imkoniyatlarini moslash
 Comment[uz@cyrillic]=Ойна бошқарувнинг кўшимча имкониятларини мослаш
 Comment[vi]=Cấu hình các tính năng quản lý cửa sổ nâng cao
 Comment[wa]=Apontiaedje des spepieusès fonccionålités do manaedjaedje des fniesses
-Comment[xh]=Qwalasela imisebenzi esemqoka ebhekisa phambili yophatho lwe window
 Comment[x-test]=xxConfigure advanced window management featuresxx
+Comment[xh]=Qwalasela imisebenzi esemqoka ebhekisa phambili yophatho lwe window
 Comment[zh_CN]=配置高级窗口管理特性
 Comment[zh_TW]=設定進階視窗管理功能
 
diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop
index 95ce97a051..c769f7ca97 100644
--- a/kcmkwin/kwinoptions/kwinfocus.desktop
+++ b/kcmkwin/kwinoptions/kwinfocus.desktop
@@ -92,8 +92,8 @@ Name[uz]=Fokus
 Name[uz@cyrillic]=Фокус
 Name[vi]=Tiêu điểm
 Name[wa]=Focus
-Name[xh]=Focus
 Name[x-test]=xxFocusxx
+Name[xh]=Focus
 Name[zh_CN]=焦点
 Name[zh_TW]=焦點
 
@@ -178,8 +178,8 @@ Comment[uz]=Oynani fokuslash qoidasini moslash
 Comment[uz@cyrillic]=Ойнани фокуслаш қоидасини мослаш
 Comment[vi]=Cấu hình chính sách về tiêu điểm trên cửa sổ
 Comment[wa]=Apontyî l' politike do focus des fniesses
-Comment[xh]=Qwalasela inkqubo yobekiso lwe window
 Comment[x-test]=xxConfigure the window focus policyxx
+Comment[xh]=Qwalasela inkqubo yobekiso lwe window
 Comment[zh_CN]=配置窗口焦点策略
 Comment[zh_TW]=設定視窗焦點政策
 
diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop
index d3ced0e43d..45a678b841 100644
--- a/kcmkwin/kwinoptions/kwinmoving.desktop
+++ b/kcmkwin/kwinoptions/kwinmoving.desktop
@@ -93,8 +93,8 @@ Name[uz]=Koʻchirish
 Name[uz@cyrillic]=Кўчириш
 Name[vi]=Di chuyển
 Name[wa]=Bodjî
-Name[xh]=Iyahamba
 Name[x-test]=xxMovingxx
+Name[xh]=Iyahamba
 Name[zh_CN]=移动
 Name[zh_TW]=移動
 
@@ -180,8 +180,8 @@ Comment[uz]=Oynalarni koʻchirish yoʻlini moslash
 Comment[uz@cyrillic]=Ойналарни кўчириш йўлини мослаш
 Comment[vi]=Cấu hình cách di chuyển cửa sổ
 Comment[wa]=Apontyî l' manire di bodjî des fniesses
-Comment[xh]=Qwalasela iindlela ii windows ezshukunyiswa ngayo
 Comment[x-test]=xxConfigure the way that windows are movedxx
+Comment[xh]=Qwalasela iindlela ii windows ezshukunyiswa ngayo
 Comment[zh_CN]=配置窗口移动的方式
 Comment[zh_TW]=設定視窗移動的方式
 
diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop
index 5b464b03fc..0ddbe83826 100644
--- a/kcmkwin/kwinoptions/kwinoptions.desktop
+++ b/kcmkwin/kwinoptions/kwinoptions.desktop
@@ -96,8 +96,8 @@ Name[uz]=Oynaning xususiyatlari
 Name[uz@cyrillic]=Ойнанинг хусусиятлари
 Name[vi]=Ứng xử của Cửa sổ
 Name[wa]=Dujhance des fniesses
-Name[xh]=Ukuziphatha kwe Window
 Name[x-test]=xxWindow Behaviorxx
+Name[xh]=Ukuziphatha kwe Window
 Name[zh_CN]=窗口行为
 Name[zh_TW]=視窗行為
 
diff --git a/kwin.notifyrc b/kwin.notifyrc
index bd8a93e9f6..69e41ad2e7 100644
--- a/kwin.notifyrc
+++ b/kwin.notifyrc
@@ -146,8 +146,8 @@ Name[uk]=Перейти до стільниці 1
 Name[uz]=Ish stoli 1ga oʻtish
 Name[uz@cyrillic]=Иш столи 1га ўтиш
 Name[wa]=Candjî viè Scribanne 1
-Name[xh]=Tshintshela kwi Desktop 1
 Name[x-test]=xxChange to Desktop 1xx
+Name[xh]=Tshintshela kwi Desktop 1
 Name[zh_CN]=转到桌面 1
 Name[zh_TW]=切換到桌面 1
 Comment=Virtual desktop one is selected
@@ -322,8 +322,8 @@ Name[uk]=Перейти до стільниці 2
 Name[uz]=Ish stoli 2ga oʻtish
 Name[uz@cyrillic]=Иш столи 2га ўтиш
 Name[wa]=Candjî viè Scribanne 2
-Name[xh]=Tshintshela kwi Desktop 2
 Name[x-test]=xxChange to Desktop 2xx
+Name[xh]=Tshintshela kwi Desktop 2
 Name[zh_CN]=转到桌面 2
 Name[zh_TW]=切換到桌面 2
 Comment=Virtual desktop two is selected
@@ -498,8 +498,8 @@ Name[uk]=Перейти до стільниці 3
 Name[uz]=Ish stoli 3ga oʻtish
 Name[uz@cyrillic]=Иш столи 3га ўтиш
 Name[wa]=Candjî viè Scribanne 3
-Name[xh]=Tshintshela kwi Desktop 3
 Name[x-test]=xxChange to Desktop 3xx
+Name[xh]=Tshintshela kwi Desktop 3
 Name[zh_CN]=转到桌面 3
 Name[zh_TW]=切換到桌面 3
 Comment=Virtual desktop three is selected
@@ -674,8 +674,8 @@ Name[uk]=Перейти до стільниці 4
 Name[uz]=Ish stoli 4ga oʻtish
 Name[uz@cyrillic]=Иш столи 4га ўтиш
 Name[wa]=Candjî viè Scribanne 4
-Name[xh]=Tshintshela kwi Desktop 4
 Name[x-test]=xxChange to Desktop 4xx
+Name[xh]=Tshintshela kwi Desktop 4
 Name[zh_CN]=转到桌面 4
 Name[zh_TW]=切換到桌面 4
 Comment=Virtual desktop four is selected
@@ -850,8 +850,8 @@ Name[uk]=Перейти до стільниці 5
 Name[uz]=Ish stoli 5ga oʻtish
 Name[uz@cyrillic]=Иш столи 5га ўтиш
 Name[wa]=Candjî viè Scribanne 5
-Name[xh]=Tshintshela kwi Desktop 5
 Name[x-test]=xxChange to Desktop 5xx
+Name[xh]=Tshintshela kwi Desktop 5
 Name[zh_CN]=转到桌面 5
 Name[zh_TW]=切換到桌面 5
 Comment=Virtual desktop five is selected
@@ -1026,8 +1026,8 @@ Name[uk]=Перейти до стільниці 6
 Name[uz]=Ish stoli 6ga oʻtish
 Name[uz@cyrillic]=Иш столи 6га ўтиш
 Name[wa]=Candjî viè Scribanne 6
-Name[xh]=Tshintshela kwi Desktop 6
 Name[x-test]=xxChange to Desktop 6xx
+Name[xh]=Tshintshela kwi Desktop 6
 Name[zh_CN]=转到桌面 6
 Name[zh_TW]=切換到桌面 6
 Comment=Virtual desktop six is selected
@@ -1200,8 +1200,8 @@ Name[uk]=Перейти до стільниці 7
 Name[uz]=Ish stoli 7ga oʻtish
 Name[uz@cyrillic]=Иш столи 7га ўтиш
 Name[wa]=Candjî viè Scribanne 7
-Name[xh]=Tshintshela kwi Desktop 7
 Name[x-test]=xxChange to Desktop 7xx
+Name[xh]=Tshintshela kwi Desktop 7
 Name[zh_CN]=转到桌面 7
 Name[zh_TW]=切換到桌面 7
 Comment=Virtual desktop seven is selected
@@ -1376,8 +1376,8 @@ Name[uk]=Перейти до стільниці 8
 Name[uz]=Ish stoli 8ga oʻtish
 Name[uz@cyrillic]=Иш столи 8га ўтиш
 Name[wa]=Candjî viè Scribanne 8
-Name[xh]=Tshintshela kwi Desktop 8
 Name[x-test]=xxChange to Desktop 8xx
+Name[xh]=Tshintshela kwi Desktop 8
 Name[zh_CN]=转到桌面 8
 Name[zh_TW]=切換到桌面 8
 Comment=Virtual desktop eight is selected
@@ -3787,8 +3787,8 @@ Name[uz]=Yangi oyna
 Name[uz@cyrillic]=Янги ойна
 Name[vi]=Cửa sổ mới
 Name[wa]=Novele finiesse
-Name[xh]=Window Entsha
 Name[x-test]=xxNew Windowxx
+Name[xh]=Window Entsha
 Name[zh_CN]=新建窗口
 Name[zh_TW]=新視窗
 Comment=New window
@@ -4130,8 +4130,8 @@ Name[uk]=Закрити вікно
 Name[uz]=Oynani yopish
 Name[uz@cyrillic]=Ойнани ёпиш
 Name[wa]=Cloyaedje del finiesse
-Name[xh]=Window Iyavala
 Name[x-test]=xxWindow Closexx
+Name[xh]=Window Iyavala
 Name[zh_CN]=窗口关闭
 Name[zh_TW]=視窗關閉
 Comment=A window closes
@@ -4299,8 +4299,8 @@ Name[tr]=Pencere Yukarı
 Name[ug]=كۆزنەكنى قاتلا
 Name[uk]=Згортає вікно вгору
 Name[wa]=Rexhaedje di l' ombion del finiesse
-Name[xh]=Window Yenza umthunzi Phezulu
 Name[x-test]=xxWindow Shade Upxx
+Name[xh]=Window Yenza umthunzi Phezulu
 Name[zh_CN]=窗口卷起
 Name[zh_TW]=視窗層級往上
 Comment=A window is shaded up
@@ -4460,8 +4460,8 @@ Name[tr]=Pencere Aşağı
 Name[ug]=كۆنەكنى ياي
 Name[uk]=Згортає вікно вниз
 Name[wa]=Mete a l' ombion l' finiesse
-Name[xh]=Window Yenza umthunzi Ezantsi
 Name[x-test]=xxWindow Shade Downxx
+Name[xh]=Window Yenza umthunzi Ezantsi
 Name[zh_CN]=窗口展开
 Name[zh_TW]=視窗層級往下
 Comment=A window is shaded down
@@ -4955,8 +4955,8 @@ Name[uk]=Максимізація вікна
 Name[uz]=Oynani yoyish
 Name[uz@cyrillic]=Ойнани ёйиш
 Name[wa]=Finiesse å pus grand
-Name[xh]=Window Yenza nkulu
 Name[x-test]=xxWindow Maximizexx
+Name[xh]=Window Yenza nkulu
 Name[zh_CN]=窗口最大化
 Name[zh_TW]=視窗最大化
 Comment=A window is maximized
@@ -5122,8 +5122,8 @@ Name[tr]=Pencereyi Küçült
 Name[ug]=كۆزنەكنى چوڭايتما
 Name[uk]=Скасувати максимізацію вікна
 Name[wa]=Dismete finiesse å pu grand
-Name[xh]=Window Sukwenza ubukhulu
 Name[x-test]=xxWindow Unmaximizexx
+Name[xh]=Window Sukwenza ubukhulu
 Name[zh_CN]=窗口取消最大化
 Name[zh_TW]=視窗解除最大化
 Comment=A window loses maximization
@@ -5616,8 +5616,8 @@ Name[uk]=Нове діалогове вікно
 Name[uz]=Yangi dialog
 Name[uz@cyrillic]=Янги диалог
 Name[wa]=Noû purnea di dvize
-Name[xh]=Incoko yababini Entsha 
 Name[x-test]=xxNew Dialogxx
+Name[xh]=Incoko yababini Entsha 
 Name[zh_CN]=新对话框
 Name[zh_TW]=新對話框
 Comment=Transient window (a dialog) appears
@@ -5780,8 +5780,8 @@ Name[uk]=Вилучити діалогове вікно
 Name[uz]=Dialogni oʻchirish
 Name[uz@cyrillic]=Диалогни ўчириш
 Name[wa]=Disfacer purnea di dvize
-Name[xh]=Cima Incoko yababini
 Name[x-test]=xxDelete Dialogxx
+Name[xh]=Cima Incoko yababini
 Name[zh_CN]=删除对话框
 Name[zh_TW]=刪除對話框
 Comment=Transient window (a dialog) is removed
@@ -5943,8 +5943,8 @@ Name[uk]=Початок руху вікна
 Name[uz]=Oynani koʻchirishni boshlash
 Name[uz@cyrillic]=Ойнани кўчиришни бошлаш
 Name[wa]=Cominçmint do movmint del finiesse
-Name[xh]=Isiqalo Sentshukumo ye Window
 Name[x-test]=xxWindow Move Startxx
+Name[xh]=Isiqalo Sentshukumo ye Window
 Name[zh_CN]=窗口移动开始
 Name[zh_TW]=視窗移動開始
 Comment=A window has begun moving
@@ -6107,8 +6107,8 @@ Name[uk]=Кінець руху вікна
 Name[uz]=Oynani koʻchirishni tugatish
 Name[uz@cyrillic]=Ойнани кўчиришни тугатиш
 Name[wa]=Difén do movmint del finiesse
-Name[xh]=Isiphelo Sentshukumo ye Window
 Name[x-test]=xxWindow Move Endxx
+Name[xh]=Isiphelo Sentshukumo ye Window
 Name[zh_CN]=窗口移动结束
 Name[zh_TW]=視窗移動結束
 Comment=A window has completed its moving
@@ -6271,8 +6271,8 @@ Name[uk]=Початок зміни розміру вікна
 Name[uz]=Oynaning oʻlchamini oʻzgartirish boshlandi
 Name[uz@cyrillic]=Ойнанинг ўлчамини ўзгартириш бошланди
 Name[wa]=Cominçmint do candjmint d' grandeu del finiesse
-Name[xh]=Isiqalo Soniko kwakhona sobungakanani se Window
 Name[x-test]=xxWindow Resize Startxx
+Name[xh]=Isiqalo Soniko kwakhona sobungakanani se Window
 Name[zh_CN]=开始更改窗口大小
 Name[zh_TW]=視窗調整大小開始
 Comment=A window has begun resizing
@@ -6435,8 +6435,8 @@ Name[uk]=Кінець зміни розміру вікна
 Name[uz]=Oynaning oʻlchamini oʻzgartirish tugadi
 Name[uz@cyrillic]=Ойнанинг ўлчамини ўзгартириш тугади
 Name[wa]=Difén do candjmint d' grandeu del finiesse
-Name[xh]=Isiphelo Sobungakanani kwakhona se Window
 Name[x-test]=xxWindow Resize Endxx
+Name[xh]=Isiphelo Sobungakanani kwakhona se Window
 Name[zh_CN]=更改窗口大小结束
 Name[zh_TW]=視窗調整大小結束
 Comment=A window has finished resizing