diff --git a/framebuffers/qt/krfb_framebuffer_qt.desktop b/framebuffers/qt/krfb_framebuffer_qt.desktop
index 8e574b8..93b8af7 100644
--- a/framebuffers/qt/krfb_framebuffer_qt.desktop
+++ b/framebuffers/qt/krfb_framebuffer_qt.desktop
@@ -13,7 +13,7 @@ Comment[es]=Memoria intermedia de vídeo basada en Qt para KRfb.
 Comment[et]=KRfb Qt põhine kaadripuhver
 Comment[eu]=Qt-n oinarritutako KRfb-ren irteerako bideoa
 Comment[fi]=QT-perustainen Kehyspuskuri KRfb:lle
-Comment[fr]=Sortie vidéo basée sur Qt pour KRfb.
+Comment[fr]=Sortie vidéo fondée sur Qt pour KRfb.
 Comment[ga]=Maolán fráma le haghaidh KRfb, bunaithe ar Qt.
 Comment[gl]=Framebuffer baseado en Qt para KRfb.
 Comment[hr]=Međuspremnik okvira baziran na Qt-u za KRfb.
diff --git a/framebuffers/x11/krfb_framebuffer_x11.desktop b/framebuffers/x11/krfb_framebuffer_x11.desktop
index cbc5f51..2b3c19d 100644
--- a/framebuffers/x11/krfb_framebuffer_x11.desktop
+++ b/framebuffers/x11/krfb_framebuffer_x11.desktop
@@ -13,7 +13,7 @@ Comment[es]=Memoria intermedia de vídeo basada en X11 Damage/XShm para KRfb.
 Comment[et]=KRfb X11 XDamage/XShm põhine kaadripuhver
 Comment[eu]=X11 XDamage/XShm  oinarritutako KRfb-ren irteerako bideoa.
 Comment[fi]=X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.
-Comment[fr]=Sortie vidéo basée sur X11 XDamage / XShm pour KRfb.
+Comment[fr]=Sortie vidéo fondée sur X11 XDamage / XShm pour KRfb.
 Comment[ga]=Maolán fráma le haghaidh KRfb, bunaithe ar X11 XDamage/XShm
 Comment[gl]=Framebuffer baseado en Xll XDamage/Xshm para XRfb.
 Comment[hr]=Međuspreminik okvira baziran na X11 XDamage/XShm za KRfb.
diff --git a/kcm_krfb/kcmkrfb.desktop b/kcm_krfb/kcmkrfb.desktop
index 2a98cb5..68fdfbb 100644
--- a/kcm_krfb/kcmkrfb.desktop
+++ b/kcm_krfb/kcmkrfb.desktop
@@ -79,8 +79,8 @@ Name[tr]=Masaüstü Paylaşımı
 Name[ug]=ئۈستەلئۈستىنى ھەمبەھىرلەش
 Name[uk]=Спільні стільниці
 Name[vi]=Chia sẻ màn hình nền
-Name[xh]=Ukwehlulelana kwe Desktop
 Name[x-test]=xxDesktop Sharingxx
+Name[xh]=Ukwehlulelana kwe Desktop
 Name[zh_CN]=桌面共享
 Name[zh_HK]=桌面分享
 Name[zh_TW]=桌面分享
@@ -153,13 +153,14 @@ Comment[th]=ปรับแต่งการแบ่งการใช้ง
 Comment[tr]=Masaüstü Paylaşımını Yapılandır
 Comment[uk]=Налаштувати спільні стільниці
 Comment[vi]=Cấu hình chia sẻ màn hình nền
-Comment[xh]=Qwalasela Ukusebenzisa ngokuhlangeneyo kwe Desktop 
 Comment[x-test]=xxConfigure Desktop Sharingxx
+Comment[xh]=Qwalasela Ukusebenzisa ngokuhlangeneyo kwe Desktop 
 Comment[zh_CN]=配置桌面共享
 Comment[zh_HK]=設定桌面分享
 Comment[zh_TW]=設定桌面分享
 X-KDE-Keywords=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited
 X-KDE-Keywords[ca]=compartició d'escriptori,krfb,vnc,compartició,krdc,connexió d'escriptori remot,invitació,port,slp,no invitat
+X-KDE-Keywords[es]=compartición de escritorio,krfb,vnc,compartición,krdc,conexión de escritorio en remoto,invitación,puerto,slp,no invitado
 X-KDE-Keywords[it]=condivisione desktop,krfb,vnc,condivisione,krdc,connessione desktop remoto,invito,porta,slp,non invitato
 X-KDE-Keywords[kk]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited
 X-KDE-Keywords[nb]=skrivebordsdeling,krfb,vnc,deling,krdc,tilkoblng til annet skrivebord,invitasjon,port,slp,ikke invitert
diff --git a/kinetd/kinetd.desktop b/kinetd/kinetd.desktop
index e14673b..c74c277 100644
--- a/kinetd/kinetd.desktop
+++ b/kinetd/kinetd.desktop
@@ -77,8 +77,8 @@ Name[uk]=Фонова служба Інтернет KDE
 Name[uz]=KDE Internet demoni
 Name[uz@cyrillic]=KDE Интернет демони
 Name[vi]=Trình nền Mạng KDE
-Name[xh]=KDE Internet Daemon
 Name[x-test]=xxKDE Internet Daemonxx
+Name[xh]=KDE Internet Daemon
 Name[zh_CN]=KDE Internet 守护进程
 Name[zh_HK]=KDE 互聯網系統程式
 Name[zh_TW]=KDE Internet 伺服程式
@@ -150,8 +150,8 @@ Comment[uk]=Фонова служба Інтернет, що запускає с
 Comment[uz]=Talab qilinganda tarmoq xizmatlarini ishga tushuruvchi Internet demoni
 Comment[uz@cyrillic]=Талаб қилинганда тармоқ хизматларини ишга тушурувчи Интернет демони
 Comment[vi]=Một trình nền Mạng mà chạy các dịch vụ mạng theo nhu cầu
-Comment[xh]=Internet daemon eqala iinkonzo zomsebenzi wonatha xa zifunwa
 Comment[x-test]=xxAn Internet daemon that starts network services on demandxx
+Comment[xh]=Internet daemon eqala iinkonzo zomsebenzi wonatha xa zifunwa
 Comment[zh_CN]=按需启动网络服务的守护进程
 Comment[zh_HK]=自動依需求起動網絡服務的互聯網系統程式
 Comment[zh_TW]=依要求起動網路服務的 Internet 伺服程式
diff --git a/kinetd/kinetd.notifyrc b/kinetd/kinetd.notifyrc
index 64e68fb..dccf53a 100644
--- a/kinetd/kinetd.notifyrc
+++ b/kinetd/kinetd.notifyrc
@@ -64,8 +64,8 @@ Comment[tg]=KInetD
 Comment[tr]=KInetD
 Comment[uk]=KInetD
 Comment[wa]=KInetD
-Comment[xh]=KInetD
 Comment[x-test]=xxKInetDxx
+Comment[xh]=KInetD
 Comment[zh_CN]=KInetD
 Comment[zh_HK]=KInetD
 Comment[zh_TW]=KInetD
@@ -134,8 +134,8 @@ Name[tg]=Пайвастшавии Воридшаванда
 Name[th]=มีการเชื่อมต่อเข้ามา
 Name[tr]=Gelen Bağlantı
 Name[uk]=IncomingConnection
-Name[xh]=Uxhumaniso Olungenayo
 Name[x-test]=xxIncomingConnectionxx
+Name[xh]=Uxhumaniso Olungenayo
 Name[zh_CN]=进入的连接
 Name[zh_HK]=進入連線
 Name[zh_TW]=進來的連線
@@ -201,8 +201,8 @@ Comment[tg]=Пайвастшавии воридшаванда қабул гар
 Comment[th]=ได้รับการเชื่อมต่อเข้ามา
 Comment[tr]=Gelen bağlantı alınıyor
 Comment[uk]=Отримано вхідне з’єднання
-Comment[xh]=Uxhulumano olungenayo olufunyenweyo
 Comment[x-test]=xxReceived incoming connectionxx
+Comment[xh]=Uxhulumano olungenayo olufunyenweyo
 Comment[zh_CN]=收到进入的连接
 Comment[zh_HK]=已接收的進入連線
 Comment[zh_TW]=接收到進來的連線
@@ -270,8 +270,8 @@ Name[tg]=Ҷараён бо Нокомӣ анҷомид
 Name[th]=โพรเซสล้มเหลว
 Name[tr]=Başarısız İşlemler
 Name[uk]=ProcessFailed
-Name[xh]=Inkqubo Yahlulekile
 Name[x-test]=xxProcessFailedxx
+Name[xh]=Inkqubo Yahlulekile
 Name[zh_CN]=处理失败
 Name[zh_HK]=程序失敗
 Name[zh_TW]=行程失敗
@@ -336,8 +336,8 @@ Comment[tg]=Барои даскории пайвастшавӣ ҷараён бо
 Comment[th]=ไม่สามารถเรียกโพรเซสเพื่อจัดการรับการเชื่อมต่อได้
 Comment[tr]=Elle bağlantıda başarısız çağrı işlemleri
 Comment[uk]=Не вдалося викликати процес для з’єднання
-Comment[xh]=Ayikwazanga ukubiza inkqubo ezakuphatha uxhulumano
 Comment[x-test]=xxCould not call process to handle connectionxx
+Comment[xh]=Ayikwazanga ukubiza inkqubo ezakuphatha uxhulumano
 Comment[zh_CN]=无法调用进程处理连接
 Comment[zh_HK]=無法呼叫處理連線的程序
 Comment[zh_TW]=無法呼叫行程來處理此連線
diff --git a/kinetd/kinetdmodule.desktop b/kinetd/kinetdmodule.desktop
index 40675c6..5e6a427 100644
--- a/kinetd/kinetdmodule.desktop
+++ b/kinetd/kinetdmodule.desktop
@@ -69,8 +69,8 @@ Name[tg]=Навъи Модули KInetD
 Name[tr]=KInetD Modül Türü
 Name[uk]=Тип модулю KinetD
 Name[vi]=Kiểu môđun KInetD
-Name[xh]=Udidi Lomqongo womlinganiselo we KInetD
 Name[x-test]=xxKInetD Module Typexx
+Name[xh]=Udidi Lomqongo womlinganiselo we KInetD
 Name[zh_CN]=KInetD 模块类型
 Name[zh_HK]=KInetD 模組類型
 Name[zh_TW]=KInetD 模組類型
diff --git a/krfb/krfb.notifyrc b/krfb/krfb.notifyrc
index 8e3dda7..83fd123 100644
--- a/krfb/krfb.notifyrc
+++ b/krfb/krfb.notifyrc
@@ -65,8 +65,8 @@ Comment[th]=ใช้งานพื้นที่ทำงานร่วม
 Comment[tr]=Masaüstü Paylaşımı
 Comment[ug]=ئۈستەلئۈستىنى ھەمبەھىرلەش
 Comment[uk]=Спільні стільниці
-Comment[xh]=Ulwahlulelano lwe Desktop
 Comment[x-test]=xxDesktop Sharingxx
+Comment[xh]=Ulwahlulelano lwe Desktop
 Comment[zh_CN]=桌面共享
 Comment[zh_HK]=桌面分享
 Comment[zh_TW]=桌面分享
@@ -193,8 +193,8 @@ Comment[tg]=Корванд пайвастшавиро қабул мекунад
 Comment[th]=ผู้ใช้ยอมรับการเชื่อมต่อ
 Comment[tr]=Kullanıcı bağlantıyı kabul etti
 Comment[uk]=Користувач приймає з’єднання
-Comment[xh]=Umsebenzisi wamkela uxhulumaniso
 Comment[x-test]=xxUser accepts connectionxx
+Comment[xh]=Umsebenzisi wamkela uxhulumaniso
 Comment[zh_CN]=用户接受连接
 Comment[zh_HK]=用戶接受連線
 Comment[zh_TW]=使用者接受連線
@@ -322,8 +322,8 @@ Comment[tg]=Корванд пайвастшавиро рад мекунад
 Comment[th]=ผู้ใช้ปฏิเสธการเชื่อมต่อ
 Comment[tr]=Kullanıcı bağlantıyı reddetti
 Comment[uk]=Користувач не приймає з’єднання
-Comment[xh]=Umsebenzisi wala uxhulumaniso
 Comment[x-test]=xxUser refuses connectionxx
+Comment[xh]=Umsebenzisi wala uxhulumaniso
 Comment[zh_CN]=用户拒绝连接
 Comment[zh_HK]=用戶拒絕連線
 Comment[zh_TW]=使用者拒絕連線使用者
@@ -458,8 +458,8 @@ Comment[ug]=باغلىنىش تاقالدى
 Comment[uk]=З'єднання закрито
 Comment[uz]=Aloqa uzildi
 Comment[uz@cyrillic]=Алоқа узилди
-Comment[xh]=Uxhulumaniso luvaliwe
 Comment[x-test]=xxConnection closedxx
+Comment[xh]=Uxhulumaniso luvaliwe
 Comment[zh_CN]=连接关闭
 Comment[zh_HK]=連線已關閉
 Comment[zh_TW]=連線已關閉
@@ -598,8 +598,8 @@ Comment[uk]=Неправильний пароль
 Comment[uz]=Maxfiy soʻz haqiqiy emas
 Comment[uz@cyrillic]=Махфий сўз ҳақиқий эмас
 Comment[wa]=Sicret nén valide
-Comment[xh]=Igama lokugqitha elingasebenziyo
 Comment[x-test]=xxInvalid passwordxx
+Comment[xh]=Igama lokugqitha elingasebenziyo
 Comment[zh_CN]=无效密码
 Comment[zh_HK]=無效的密碼
 Comment[zh_TW]=不正確的密碼
@@ -726,8 +726,8 @@ Comment[tg]=Корванди дурдаст гузарвожаи нодурус
 Comment[th]=ผู้เข้าร่วมการเชิญชวนส่งรหัสผ่านมาไม่ถูกต้อง ทำการปฏิเสธการเชื่อมต่อ
 Comment[tr]=Davet edilenden gönderilmiş geçersiz parola. Bağlantı reddedildi.
 Comment[uk]=Запрошений учасник надіслав некоректний пароль. У з’єднанні відмовлено.
-Comment[xh]=Umhlangano omenyiweyo uthumele igama lokugqitha elisebenzayo. Uxhulumano lwa liwe.
 Comment[x-test]=xxThe invited party sent an invalid password. Connection refused.xx
+Comment[xh]=Umhlangano omenyiweyo uthumele igama lokugqitha elisebenzayo. Uxhulumano lwa liwe.
 Comment[zh_CN]=受邀请方发送的密码不对。连接被拒绝。
 Comment[zh_HK]=被邀請的一方送出無效的密碼。已拒絕連線。
 Comment[zh_TW]=邀請的人送出了不合法的密碼邀請。連線已拒絕。
@@ -855,8 +855,8 @@ Comment[tg]=Пайвастшавӣ дархоста шудааст, корван
 Comment[th]=มีการร้องขอเชื่อมต่อมา ผู้ใช้ต้องทำการยอมรับก่อน
 Comment[tr]=Bağlantı isteği, kullanıcı kabul etmeli
 Comment[uk]=Отримано запит на з’єднання, користувач має його прийняти
-Comment[xh]=Uxhulumaniso luceliwe, umsebenzisi kufanele amkele
 Comment[x-test]=xxConnection requested, user must acceptxx
+Comment[xh]=Uxhulumaniso luceliwe, umsebenzisi kufanele amkele
 Comment[zh_CN]=连接已请求，用户必须接受
 Comment[zh_HK]=已請求連線，用戶必須接受
 Comment[zh_TW]=連線已要求，必須等使用者接受
@@ -984,8 +984,8 @@ Comment[tg]=Пайвастшавии нав ба таври худкор бар
 Comment[th]=การเชื่อมต่อใหม่จะถูกทำการเชื่อมต่อโดยอัตโนมัติ
 Comment[tr]=Yeni bağlantı otomatik olarak kuruldu
 Comment[uk]=Автоматично встановлено нове з’єднання
-Comment[xh]=Uxhulumaniso olutsha lufunyenwe ngokuzenzekelayo
 Comment[x-test]=xxNew connection automatically establishedxx
+Comment[xh]=Uxhulumaniso olutsha lufunyenwe ngokuzenzekelayo
 Comment[zh_CN]=自动建立新连接
 Comment[zh_HK]=已自動建立新連線
 Comment[zh_TW]=新連線自動建立
@@ -1116,8 +1116,8 @@ Comment[tr]=Meşgul, bağlantı reddedildi
 Comment[uk]=Зайнято, у з’єднанні відмовлено
 Comment[uz]=Band, aloqa rad etildi
 Comment[uz@cyrillic]=Банд, алоқа рад этилди
-Comment[xh]=Uxhulumaniso, olu xakekileyo lwaliwe
 Comment[x-test]=xxBusy, connection refusedxx
+Comment[xh]=Uxhulumaniso, olu xakekileyo lwaliwe
 Comment[zh_CN]=对方处于忙碌状态，连接被拒绝
 Comment[zh_HK]=忙碌，已拒絕連線
 Comment[zh_TW]=忙碌，連線被拒
@@ -1246,8 +1246,8 @@ Comment[tg]=Пайвастшавии ғайричашмдош қабул гар
 Comment[th]=ได้รับการเชื่อมต่อมาอย่างไม่คาดคิด ทำการยกเลิก
 Comment[tr]=Beklenmeyen bir bağlantı alındı, vazgeçiliyor
 Comment[uk]=Отримано з’єднання, яке не очікувалось, припиняється
-Comment[xh]=Ufumene uxhulumaniso olungalindelekanga, lahla
 Comment[x-test]=xxReceived unexpected connection, abortxx
+Comment[xh]=Ufumene uxhulumaniso olungalindelekanga, lahla
 Comment[zh_CN]=收到意外连接，已中止
 Comment[zh_HK]=接收到非預期的連線，中止
 Comment[zh_TW]=已接收到未知的連線，中止。