Update translation files

Updated by Update PO files to match POT (msgmerge) hook in Weblate.

65 files changed, 3624 insertions, 5570 deletions

diff --git a/tde-i18n-af/messages/tdebase/joystick.po b/tde-i18n-af/messages/tdebase/joystick.po
index 70c78c6c7c0..8835688691e 100644
--- a/tde-i18n-af/messages/tdebase/joystick.po
+++ b/tde-i18n-af/messages/tdebase/joystick.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick stable\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-10-06 21:18+0200\n"
 "Last-Translator: Kobus Venter <kabousv@therugby.co.za>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Kobus Venter"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,55 +51,38 @@ msgstr "(gewoonlik Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibrasie gaan nou bepaal wat die bereik van jou toestel se waardereeks "
-"is."
-"<br>"
-"<br>Skuif asb <b>as %1 %2</b> op jou toestel na die <b>minimum</b> posissie."
-"<br>"
-"<br>Druk enige knoppie op die toestel of kliek op die 'Volgende' knoppie  om "
-"voort te gaan na die volgende stap.</qt>"
+"is.<br><br>Skuif asb <b>as %1 %2</b> op jou toestel na die <b>minimum</b> "
+"posissie.<br><br>Druk enige knoppie op die toestel of kliek op die "
+"'Volgende' knoppie  om voort te gaan na die volgende stap.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibrasie gaan nou bepaal wat die bereik van jou toestel se waardereeks "
-"is."
-"<br>"
-"<br>Skuif asb <b>as %1 %2</b> op jou toestel na die <b>middel</b> posissie."
-"<br>"
-"<br>Druk enige knoppie op die toestel of kliek op die 'Volgende' knoppie  om "
-"voort te gaan na die volgende stap.</qt>"
+"is.<br><br>Skuif asb <b>as %1 %2</b> op jou toestel na die <b>middel</b> "
+"posissie.<br><br>Druk enige knoppie op die toestel of kliek op die "
+"'Volgende' knoppie  om voort te gaan na die volgende stap.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibrasie gaan nou bepaal wat die bereik van jou toestel se waardereeks "
-"is."
-"<br>"
-"<br>Skuif asb <b>as %1 %2</b> op jou toestel na die <b>maksimum</b> posissie."
-"<br>"
-"<br>Druk enige knoppie op die toestel of kliek op die 'Volgende' knoppie  om "
-"voort te gaan na die volgende stap.</qt>"
+"is.<br><br>Skuif asb <b>as %1 %2</b> op jou toestel na die <b>maksimum</b> "
+"posissie.<br><br>Druk enige knoppie op die toestel of kliek op die "
+"'Volgende' knoppie  om voort te gaan na die volgende stap.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -132,8 +115,8 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "Die lopende kernel aandrywer weergawe (%1.%2.%3) is nie die een waarvoor "
 "hierdie module saamgestel is nie (%4.%5.%6)."
@@ -181,39 +164,29 @@ msgstr "TDE Beheer Sentrum Module om Speelstokke te toets"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Joystick</h1>Hierdie module toets of jou speelstok reg werk."
-"<br>Indien dit foutiewe waardes vir die asse gee, kan jy probeer om dit met "
-"kalibrering reg te maak."
-"<br>Hierdie module probeer om alle beskikbare speelstok toestelle te vind deur "
-"/dev/js[0-4] en /dev/input/js[0-4]"
-"<br>Indien jy 'n ander toestel aandrywer lêer het, sleutel dit in in die "
-"saamgestelde boks."
+"<h1>Joystick</h1>Hierdie module toets of jou speelstok reg werk.<br>Indien "
+"dit foutiewe waardes vir die asse gee, kan jy probeer om dit met kalibrering "
+"reg te maak.<br>Hierdie module probeer om alle beskikbare speelstok "
+"toestelle te vind deur /dev/js[0-4] en /dev/input/js[0-4]<br>Indien jy 'n "
+"ander toestel aandrywer lêer het, sleutel dit in in die saamgestelde boks."
 "<br>Die Knoppie lys dui die stand van die knoppies aan op jou speelstok, die "
-"asse lys dui die huuidige waardevan al die asse aan."
-"<br>NOTA: Die huidige Linux toestelaandrywer (Kernel 2.4, 2.6) kan slegs die "
-"volgende automaties vind:"
-"<ul>"
-"<li>2-asse, 4-knoppies speelstok</li>"
-"<li>3-asse, 4-knoppies speelstok</li>"
-"<li>4-asse, 4-knoppies speelstok</li>"
-"<li>Saitek Cyborg 'digitale' speelstok</li></ul>(Vir verdere inligting "
-"raadpleeg jou Linux bron /Documentation/input/joystick.txt)"
+"asse lys dui die huuidige waardevan al die asse aan.<br>NOTA: Die huidige "
+"Linux toestelaandrywer (Kernel 2.4, 2.6) kan slegs die volgende automaties "
+"vind:<ul><li>2-asse, 4-knoppies speelstok</li><li>3-asse, 4-knoppies "
+"speelstok</li><li>4-asse, 4-knoppies speelstok</li><li>Saitek Cyborg "
+"'digitale' speelstok</li></ul>(Vir verdere inligting raadpleeg jou Linux "
+"bron /Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -253,15 +226,14 @@ msgstr "Kalibreer"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Geen speelstok toestel was automaties gevind op hierdie rekenaar.\n"
 "<br>Toetse was gedoen in: /dev/js[0-4] en /dev/input/js[0-4]\n"
-"<br>Indien jy weet dat een gekoppel is, voeg asb die korrekte toestel aandrywer "
-"lêer in."
+"<br>Indien jy weet dat een gekoppel is, voeg asb die korrekte toestel "
+"aandrywer lêer in."
 
 #: joywidget.cpp:236
 msgid ""
@@ -283,19 +255,13 @@ msgstr "Toestel Fout"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibrering gaan nou die juistheid bepaal "
-"<br>"
-"<br><b>Skuif asseblief alle asse na die middel posissie en los dan die toestel "
-"alleen </b>"
-"<br>"
-"<br>Kliek REG om die kalibrering te begin.</qt>"
+"<qt>Kalibrering gaan nou die juistheid bepaal <br><br><b>Skuif asseblief "
+"alle asse na die middel posissie en los dan die toestel alleen </"
+"b><br><br>Kliek REG om die kalibrering te begin.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-ar/messages/tdebase/joystick.po b/tde-i18n-ar/messages/tdebase/joystick.po
index 5eb5dbaa3a9..dbf68956056 100644
--- a/tde-i18n-ar/messages/tdebase/joystick.po
+++ b/tde-i18n-ar/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2006-12-25 17:24+0100\n"
 "Last-Translator: محمد سعد  Mohamed SAAD <metehyi@free.fr>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Mohamed SAAD محمد سعد"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -49,33 +49,25 @@ msgstr "(عادتاً الصاد)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -108,11 +100,11 @@ msgstr "لم أتمكن من الحصول على إصدار سائق النوا�
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"إنّ إصدار سائق النواة الجاري حالياً (%1.%2.%3) ليس هو ذلك اللذي تم تصريف الوحدة "
-"النمطية (%4.%5.%6) له."
+"إنّ إصدار سائق النواة الجاري حالياً (%1.%2.%3) ليس هو ذلك اللذي تم تصريف "
+"الوحدة النمطية (%4.%5.%6) له."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -153,21 +145,16 @@ msgstr "وحدة مركز التحكم TDE لإختبار عصا الألعاب"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 
 #: joywidget.cpp:43
@@ -208,10 +195,9 @@ msgstr "معايرة"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 
 #: joywidget.cpp:236
@@ -231,12 +217,9 @@ msgstr "خطأ في الجهاز"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 
 #: joywidget.cpp:372
diff --git a/tde-i18n-be/messages/tdebase/joystick.po b/tde-i18n-be/messages/tdebase/joystick.po
index 34ca67beecd..39ca5ce4aad 100644
--- a/tde-i18n-be/messages/tdebase/joystick.po
+++ b/tde-i18n-be/messages/tdebase/joystick.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2007-02-03 06:12+0100\n"
 "Last-Translator: Siarhei Liantsevich <serzh.by@gmail.com>\n"
 "Language-Team: Belarusian\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Дарафей Праляскоўскі, Сяржук Лянцэвіч"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -53,54 +53,40 @@ msgstr "(звычайна Y)"
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Працэдура каліброўкі гатовая вызначыць дыяпазон адчувальнасці прылады."
-"<br>"
-"<br>Перасуньце паказальнік па  <b>восі %1 %2</b> у <b>мінімальнае</b> "
-"становішча."
-"<br>"
-"<br>Для пераходу да наступнага этапу націсніце любую кнопку на прыладзе.</qt>"
+"<br><br>Перасуньце паказальнік па  <b>восі %1 %2</b> у <b>мінімальнае</b> "
+"становішча.<br><br>Для пераходу да наступнага этапу націсніце любую кнопку "
+"на прыладзе.</qt>"
 
 #: caldialog.cpp:107
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Працэдура каліброўкі гатовая вызначыць дыяпазон адчувальнасці прылады."
-"<br>"
-"<br>Перасуньце паказальнік па <b>восі %1 %2</b> у <b>цэнтральнае</b> "
-"становішча."
-"<br>"
-"<br>Для пераходу да наступнага этапу націсніце любую кнопку на прыладзе.</qt>"
+"<br><br>Перасуньце паказальнік па <b>восі %1 %2</b> у <b>цэнтральнае</b> "
+"становішча.<br><br>Для пераходу да наступнага этапу націсніце любую кнопку "
+"на прыладзе.</qt>"
 
 #: caldialog.cpp:124
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Працэдура каліброўкі гатовая вызначыць дыяпазон адчувальнасці прылады."
-"<br>"
-"<br>Перасуньце паказальнік па <b>восі %1 %2</b> у <b>максімальнае</b> "
-"становішча."
-"<br>"
-"<br>Для пераходу да наступнага этапу націсніце любую кнопку на прыладзе.</qt>"
+"<br><br>Перасуньце паказальнік па <b>восі %1 %2</b> у <b>максімальнае</b> "
+"становішча.<br><br>Для пераходу да наступнага этапу націсніце любую кнопку "
+"на прыладзе.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 #, fuzzy
@@ -140,8 +126,8 @@ msgstr "Не атрымоўваецца загрузіць модуль ядра
 #: joydevice.cpp:80
 #, fuzzy
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "Бягучая версія ядра (%1.%2.%3) адрозніваецца ад той, для якой быў сабраны "
 "модуль (%4.%5.%6)."
@@ -174,8 +160,8 @@ msgstr ""
 #, fuzzy
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"Не атрымоўваецца ініцыялізаваць значэнні каліброўкі для прылады джойсціка %1: "
-"%2"
+"Не атрымоўваецца ініцыялізаваць значэнні каліброўкі для прылады джойсціка "
+"%1: %2"
 
 #: joydevice.cpp:117
 #, fuzzy
@@ -202,36 +188,29 @@ msgstr "Модуль Цэнтра кіравання TDE для праверкі
 #, fuzzy
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Джойсцік</h1>Гэты модуль дазваляе праверыць правільнасць працы джойсціка."
 "<br>Калі значэнні для восяў паказаныя няслушна, гэта можна выправіць з "
-"дапамогай працэдуры каліброўкі."
-"<br>Прылады джойсціка апытваюцца для /dev/js[0-4] і /dev/input/js[0-4]"
-"<br>Калі ваш джойсцік працуе на іншай прыладзе, пакажыце яго ў поле ўводу."
-"<br>У спісе Кнопкі паказана стан кнопак джойсціка, а спісе Восі - стан восяў."
-"<br>Нататка: у бягучай рэалізацыі драйвер джойсціка ядра Linux (для 2.4 і 2.6) "
-"можа правільна вызначыць наступныя прылады:"
-"<ul>"
-"<li>джойсцік з двума восямі і чатырма кнопкамі</li>"
-"<li>джойсцік з трыма восямі і чатырма кнопкамі</li>"
-"<li>джойсцік з чатырма восямі і чатырма кнопкамі</li>"
-"<li>лічбавыя джойсцікі Saitek Cyborg</li></ul>(Падрабязней аб гэтым гл. "
-"дакументацыю ядра Linux, файл Documentation/input/joystick.txt)"
+"дапамогай працэдуры каліброўкі.<br>Прылады джойсціка апытваюцца для /dev/"
+"js[0-4] і /dev/input/js[0-4]<br>Калі ваш джойсцік працуе на іншай прыладзе, "
+"пакажыце яго ў поле ўводу.<br>У спісе Кнопкі паказана стан кнопак джойсціка, "
+"а спісе Восі - стан восяў.<br>Нататка: у бягучай рэалізацыі драйвер "
+"джойсціка ядра Linux (для 2.4 і 2.6) можа правільна вызначыць наступныя "
+"прылады:<ul><li>джойсцік з двума восямі і чатырма кнопкамі</li><li>джойсцік "
+"з трыма восямі і чатырма кнопкамі</li><li>джойсцік з чатырма восямі і "
+"чатырма кнопкамі</li><li>лічбавыя джойсцікі Saitek Cyborg</li></"
+"ul>(Падрабязней аб гэтым гл. дакументацыю ядра Linux, файл Documentation/"
+"input/joystick.txt)"
 
 #: joywidget.cpp:43
 #, fuzzy
@@ -277,14 +256,13 @@ msgstr "Каліброўка"
 #: joywidget.cpp:190
 #, fuzzy
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Джойсцікі не выяўленыя."
-"<br>Правяраліся прылады /dev/js[0-4] і /dev/input/js[0-4]"
-"<br>Калі вы ведаеце, на якой прыладзе працуе джойсцік, пакажыце гэтае значэнне."
+"Джойсцікі не выяўленыя.<br>Правяраліся прылады /dev/js[0-4] і /dev/input/"
+"js[0-4]<br>Калі вы ведаеце, на якой прыладзе працуе джойсцік, пакажыце гэтае "
+"значэнне."
 
 #: joywidget.cpp:236
 #, fuzzy
@@ -310,19 +288,13 @@ msgstr "Памылка прылады"
 #: joywidget.cpp:337
 #, fuzzy
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Пачынаецца каліброўка адчувальнасці."
-"<br>"
-"<br><b>Перасуньце джойсцік у цэнтральнае становішча па абедзвюх восям і больш "
-"не чапайце яго.</b>"
-"<br>"
-"<br>Для пачатку каліброўкі націсніце OK.</qt>"
+"<qt>Пачынаецца каліброўка адчувальнасці.<br><br><b>Перасуньце джойсцік у "
+"цэнтральнае становішча па абедзвюх восям і больш не чапайце яго.</"
+"b><br><br>Для пачатку каліброўкі націсніце OK.</qt>"
 
 #: joywidget.cpp:372
 #, fuzzy, c-format
diff --git a/tde-i18n-bg/messages/tdebase/joystick.po b/tde-i18n-bg/messages/tdebase/joystick.po
index 175c9751dff..a27d6ddda2f 100644
--- a/tde-i18n-bg/messages/tdebase/joystick.po
+++ b/tde-i18n-bg/messages/tdebase/joystick.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2007-04-20 12:16+0000\n"
 "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Радостин Раднев"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -53,58 +53,41 @@ msgstr "(обикновено Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Калибрирането служи за проверка на данните, които идват от устройството. "
-"Става въпрос за минимална, максимална стойност и др."
-"<br>"
-"<br>Моля, преместете <b>ос %1 %2</b> на устройството до <b>минималната</b> "
-"позиция. "
-"<br>"
-"<br>Натиснете произволен бутон на устройството, за да продължите със следващата "
-"стъпка.</qt>"
+"Става въпрос за минимална, максимална стойност и др.<br><br>Моля, преместете "
+"<b>ос %1 %2</b> на устройството до <b>минималната</b> позиция. "
+"<br><br>Натиснете произволен бутон на устройството, за да продължите със "
+"следващата стъпка.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Калибрирането служи за проверка на данните, които идват от устройството. "
-"Става въпрос за минимална, максимална стойност и др."
-"<br>"
-"<br>Моля, преместете <b>ос %1 %2</b> на устройството до <b>средната</b> "
-"позиция. "
-"<br>"
-"<br>Натиснете произволен бутон на устройството, за да продължите със следващата "
-"стъпка.</qt>"
+"Става въпрос за минимална, максимална стойност и др.<br><br>Моля, преместете "
+"<b>ос %1 %2</b> на устройството до <b>средната</b> позиция. "
+"<br><br>Натиснете произволен бутон на устройството, за да продължите със "
+"следващата стъпка.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Калибрирането служи за проверка на данните, които идват от устройството. "
-"Става въпрос за минимална, максимална стойност и др."
-"<br>"
-"<br>Моля, преместете <b>ос %1 %2</b> на устройството до <b>максималната</b> "
-"позиция. "
-"<br>"
-"<br>Натиснете произволен бутон на устройството, за да продължите със следващата "
-"стъпка.</qt>"
+"Става въпрос за минимална, максимална стойност и др.<br><br>Моля, преместете "
+"<b>ос %1 %2</b> на устройството до <b>максималната</b> позиция. "
+"<br><br>Натиснете произволен бутон на устройството, за да продължите със "
+"следващата стъпка.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -137,8 +120,8 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "Текущата версия на драйвера (%1.%2.%3) не е същата, за която е компилиран "
 "модулът (%4.%5.%6)."
@@ -154,8 +137,8 @@ msgstr "Броят на осите на джойстика \"%1\" не може
 #: joydevice.cpp:99
 msgid "Could not get calibration values for joystick device %1: %2"
 msgstr ""
-"Стойностите от калибрирането на джойстика \"%1\" не могат да бъдат определени: "
-"%2"
+"Стойностите от калибрирането на джойстика \"%1\" не могат да бъдат "
+"определени: %2"
 
 #: joydevice.cpp:105
 msgid "Could not restore calibration values for joystick device %1: %2"
@@ -172,8 +155,8 @@ msgstr ""
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
 msgstr ""
-"Стойностите от калибрирането на джойстика \"%1\" не могат да бъдат приложени: "
-"%2"
+"Стойностите от калибрирането на джойстика \"%1\" не могат да бъдат "
+"приложени: %2"
 
 #: joydevice.cpp:121
 msgid "internal error - code %1 unknown"
@@ -190,21 +173,16 @@ msgstr "Контролен модул за настройка на джойст�
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr "<h1>Джойстик</h1>От тук може да настроите джойстик, ако имате."
 
 #: joywidget.cpp:43
@@ -245,10 +223,9 @@ msgstr "Калибриране"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Операцията по автоматично откриване на джойстик не можа да намери нищо.\n"
 "<br>Бяха проверени следните устройства /dev/js[0-4] и /dev/input/js[0-4].\n"
@@ -261,7 +238,8 @@ msgid ""
 "enter a device file, like /dev/js0."
 msgstr ""
 "Зададеното устройство е невалидно, защото не съдържа /dev.\n"
-"Моля, изберете устройство от списъка или въведете устройство от типа /dev/js0."
+"Моля, изберете устройство от списъка или въведете устройство от типа /dev/"
+"js0."
 
 #: joywidget.cpp:238
 msgid "Unknown Device"
@@ -273,20 +251,14 @@ msgstr "Грешка на устройството"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 "<qt>Калибрирането служи за проверка на данните, които идват от устройството. "
-"Става въпрос за минимална, максимална стойност и др."
-"<br>"
-"<br>Моля, преместете всички оси в средно положение и не пипайте устройството "
-"повече. "
-"<br>"
-"<br>Натиснете \"ОК\", за да започнете с операцията по калибриране.</qt>"
+"Става въпрос за минимална, максимална стойност и др.<br><br>Моля, преместете "
+"всички оси в средно положение и не пипайте устройството повече. "
+"<br><br>Натиснете \"ОК\", за да започнете с операцията по калибриране.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-br/messages/tdebase/joystick.po b/tde-i18n-br/messages/tdebase/joystick.po
index f92a4fef87f..81f9a47530f 100644
--- a/tde-i18n-br/messages/tdebase/joystick.po
+++ b/tde-i18n-br/messages/tdebase/joystick.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2004-09-19 14:11+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud.com>\n"
 "Language-Team: Brezhoneg <Suav.Icb.fr>\n"
@@ -12,13 +12,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Thierry Vignaud, Jañ-Mai Drapier"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -47,33 +47,25 @@ msgstr ""
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -106,8 +98,8 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 
 #: joydevice.cpp:87
@@ -149,21 +141,16 @@ msgstr ""
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 
 #: joywidget.cpp:43
@@ -204,10 +191,9 @@ msgstr ""
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 
 #: joywidget.cpp:236
@@ -227,12 +213,9 @@ msgstr "Fazi er drobarzhell"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 
 #: joywidget.cpp:372
diff --git a/tde-i18n-bs/messages/tdebase/joystick.po b/tde-i18n-bs/messages/tdebase/joystick.po
index 48c2ff025cd..7c20e1298f0 100644
--- a/tde-i18n-bs/messages/tdebase/joystick.po
+++ b/tde-i18n-bs/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2006-02-11 19:15+0100\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Vedran Ljubović"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -50,56 +50,38 @@ msgstr "(obično Y)"
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracija će sada provjeriti raspon vrijednosti koje isporučuje vaš "
-"uređaj. "
-"<br>"
-"<br>Molim postavite <b>osu %1 %s</b> na vašem uređaju u <b>minimalni</b> "
-"položaj."
-"<br>"
-"<br>Pritisnite bilo koje dugme na uređaju ili kliknite na dugme 'Dalje' za "
-"prelazak na sljedeći korak.</qt>"
+"uređaj. <br><br>Molim postavite <b>osu %1 %s</b> na vašem uređaju u "
+"<b>minimalni</b> položaj.<br><br>Pritisnite bilo koje dugme na uređaju ili "
+"kliknite na dugme 'Dalje' za prelazak na sljedeći korak.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracija će sada provjeriti raspon vrijednosti koje isporučuje vaš "
-"uređaj. "
-"<br>"
-"<br>Molim postavite <b>osu %1 %2</b> na vašem uređaju u <b>centralni</b> "
-"položaj."
-"<br>"
-"<br>Pritisnite bilo koje dugme na uređaju za prelazak na sljedeći korak.</qt>"
+"uređaj. <br><br>Molim postavite <b>osu %1 %2</b> na vašem uređaju u "
+"<b>centralni</b> položaj.<br><br>Pritisnite bilo koje dugme na uređaju za "
+"prelazak na sljedeći korak.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracija će sada provjeriti raspon vrijednosti koje isporučuje vaš "
-"uređaj. "
-"<br>"
-"<br>Molim postavite <b>osu %1 %2</b> na vašem uređaju u <b>maksimalni</b> "
-"položaj."
-"<br>"
-"<br>Pritisnite bilo koje dugme na uređaju za prelazak na sljedeći korak.</qt>"
+"uređaj. <br><br>Molim postavite <b>osu %1 %2</b> na vašem uređaju u "
+"<b>maksimalni</b> položaj.<br><br>Pritisnite bilo koje dugme na uređaju za "
+"prelazak na sljedeći korak.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -131,11 +113,11 @@ msgstr "Ne mogu pronaći kernelski drajver za vaš joystick uređaj %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Trenutno je aktivna verzija kernelskog drajvera (%1.%2.%3) nije ona za koju je "
-"modul kompajliran (%4.%5.%6)."
+"Trenutno je aktivna verzija kernelskog drajvera (%1.%2.%3) nije ona za koju "
+"je modul kompajliran (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -178,40 +160,29 @@ msgstr "TDE modul kontrolnog centra za testiranje joysticka"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Joystick</h1>Ovaj modul vam pomaže da provjerite da li vaš joystick radi "
-"ispravno."
-"<br>Ako su vam prikazane pogrešne vrijednosti za ose, možete probati to "
-"riješiti kalibracijom."
-"<br>Ovaj modul pokušava pronaći sve dostupne joystick uređaje provjeravajući "
-"/dev/js[0-4] i /dev/input/js[0-4]"
-"<br>Ako imate neku postojeću konfiguracijsku datoteku, unesite je u kombinirano "
-"polje."
-"<br>Lista Dugmad prikazuje stanje dugmadi na joysticku, lista Ose prikazuje "
-"trenutne vrijednosti za sve ose."
-"<br>NAPOMENA: trenutni Linux drajver uređaja (kerneli 2.4, 2.6) može prepoznati "
-"samo"
-"<ul>"
-"<li>joystick sa 2 ose i 4 dugmeta</li>"
-"<li>joystick sa 3 ose i 4 dugmeta</li>"
-"<li>joystick sa 4 ose i 4 dugmeta</li>"
-"<li>Saitek Cyborg 'digitalni' joystick</li></ul>(Za detalje možete pogledati "
-"datoteku /Documentation/input/joystick.txt u u Linux izvornom kodu)"
+"ispravno.<br>Ako su vam prikazane pogrešne vrijednosti za ose, možete "
+"probati to riješiti kalibracijom.<br>Ovaj modul pokušava pronaći sve "
+"dostupne joystick uređaje provjeravajući /dev/js[0-4] i /dev/input/"
+"js[0-4]<br>Ako imate neku postojeću konfiguracijsku datoteku, unesite je u "
+"kombinirano polje.<br>Lista Dugmad prikazuje stanje dugmadi na joysticku, "
+"lista Ose prikazuje trenutne vrijednosti za sve ose.<br>NAPOMENA: trenutni "
+"Linux drajver uređaja (kerneli 2.4, 2.6) može prepoznati "
+"samo<ul><li>joystick sa 2 ose i 4 dugmeta</li><li>joystick sa 3 ose i 4 "
+"dugmeta</li><li>joystick sa 4 ose i 4 dugmeta</li><li>Saitek Cyborg "
+"'digitalni' joystick</li></ul>(Za detalje možete pogledati datoteku /"
+"Documentation/input/joystick.txt u u Linux izvornom kodu)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -251,15 +222,13 @@ msgstr "Kalibriraj"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Nijedan joystick uređaj nije pronađen na ovom računaru."
-"<br>Provjere su vršene za /dev/js[0-4] i /dev/input/js[0-4]"
-"<br>Ako znate kako je priključen joystick, molimo unesite ispravnu datoteku "
-"uređaja."
+"Nijedan joystick uređaj nije pronađen na ovom računaru.<br>Provjere su "
+"vršene za /dev/js[0-4] i /dev/input/js[0-4]<br>Ako znate kako je priključen "
+"joystick, molimo unesite ispravnu datoteku uređaja."
 
 #: joywidget.cpp:236
 msgid ""
@@ -281,19 +250,13 @@ msgstr "Greška uređaja"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibracija će sada provjeriti preciznost."
-"<br>"
-"<br><b>Molim pomjerite sve ose u njihov centralni položaj i ne dirajte više "
-"joystick.</b>"
-"<br>"
-"<br>Kliknite na U redu da započnete kalibraciju.</qt>"
+"<qt>Kalibracija će sada provjeriti preciznost.<br><br><b>Molim pomjerite sve "
+"ose u njihov centralni položaj i ne dirajte više joystick.</"
+"b><br><br>Kliknite na U redu da započnete kalibraciju.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-ca/messages/tdebase/joystick.po b/tde-i18n-ca/messages/tdebase/joystick.po
index b6f3701839c..607078354f3 100644
--- a/tde-i18n-ca/messages/tdebase/joystick.po
+++ b/tde-i18n-ca/messages/tdebase/joystick.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2006-01-22 17:22+0100\n"
 "Last-Translator: Sebastià Pla i Sanz <sps@sastia.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Sebastià Pla i Sanz"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,58 +51,39 @@ msgstr "(normalment Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>El calibratge està a punt de comprovar l'amplitud de valors que proporciona "
-"el dispositiu."
-"<br>"
-"<br>Si us plau, moveu <b>l'eix %1 %2</b> del dispositiu a la posició <b>"
-"mínima</b>."
-"<br>"
-"<br>Premeu qualsevol botó del dispositiu o al botó 'Següent' per a continuar "
-"amb el pas següent.</qt>"
+"<qt>El calibratge està a punt de comprovar l'amplitud de valors que "
+"proporciona el dispositiu.<br><br>Si us plau, moveu <b>l'eix %1 %2</b> del "
+"dispositiu a la posició <b>mínima</b>.<br><br>Premeu qualsevol botó del "
+"dispositiu o al botó 'Següent' per a continuar amb el pas següent.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>El calibratge està a punt de comprovar l'amplitud de valors que proporciona "
-"el dispositiu. "
-"<br>"
-"<br>Si us plau, moveu <b>l'eix %1 %2</b> del dispositiu a la posició <b>"
-"central</b>."
-"<br>"
-"<br>Premeu qualsevol botó del dispositiu o cliqueu el botó 'Següent' per a "
-"continuar amb el pas següent.</qt>"
+"<qt>El calibratge està a punt de comprovar l'amplitud de valors que "
+"proporciona el dispositiu. <br><br>Si us plau, moveu <b>l'eix %1 %2</b> del "
+"dispositiu a la posició <b>central</b>.<br><br>Premeu qualsevol botó del "
+"dispositiu o cliqueu el botó 'Següent' per a continuar amb el pas següent.</"
+"qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>El calibratge ara comprovarà l'amplitud de valors que proporciona el "
-"dispositiu. "
-"<br>"
-"<br>Si us plau, moveu <b>l'eix %1 %2</b> del dispositiu a la posició <b>"
-"màxima</b>. "
-"<br>"
-"<br>Premeu qualsevol botó del dispositiu o cliqueu al botó 'Següent' per a "
-"continuar amb el pas següent.</qt>"
+"dispositiu. <br><br>Si us plau, moveu <b>l'eix %1 %2</b> del dispositiu a la "
+"posició <b>màxima</b>. <br><br>Premeu qualsevol botó del dispositiu o "
+"cliqueu al botó 'Següent' per a continuar amb el pas següent.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -136,8 +117,8 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "La versió del controlador del kernel actualment en execució (%1.%2.%3) no és "
 "aquella per a la que es va compilar aquest mòdul (%4.%5.%6)."
@@ -145,8 +126,8 @@ msgstr ""
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
 msgstr ""
-"No s'ha pogut obtenir el número de botons per al dispositiu palanca de control "
-"%1: %2"
+"No s'ha pogut obtenir el número de botons per al dispositiu palanca de "
+"control %1: %2"
 
 #: joydevice.cpp:93
 msgid "Could not get number of axes for joystick device %1: %2"
@@ -163,14 +144,14 @@ msgstr ""
 #: joydevice.cpp:105
 msgid "Could not restore calibration values for joystick device %1: %2"
 msgstr ""
-"No s'han pogut restaurar els valors de calibratge per al dispositiu palanca de "
-"jocs %1: %2"
+"No s'han pogut restaurar els valors de calibratge per al dispositiu palanca "
+"de jocs %1: %2"
 
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"No s'han pogut inicialitzar els valors de calibratge per al dispositiu palanca "
-"de jocs %1: %2"
+"No s'han pogut inicialitzar els valors de calibratge per al dispositiu "
+"palanca de jocs %1: %2"
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
@@ -193,39 +174,30 @@ msgstr "Mòdul del centre de control TDE per a provar palanques de control"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Palanca de control</h1>Aquest mòdul ajuda a comprovar si la palanca de "
-"control funciona correctament."
-"<br>Si proporciona valors incorrectes pels eixos, podeu provar de solucionar-ho "
-"amb el calibratge. "
-"<br>Aquest mòdul prova de trobar tots els dispositius de palanca de control "
-"disponibles comprovant /dev/js[0-4] i /dev/input/js[0-4] "
-"<br>Si teniu un altre fitxer dispositiu, introduïu-lo al quadre combinat."
-"<br>La llista de botons mostra l'estat dels botons de la palanca de control, la "
-"llista d'eixos mostra el valor actual per a tots els eixos. "
-"<br>NOTA: el controlador de dispositius actual de Linux (Kernel 2.4, 2.6) només "
-"pot autodetectar "
-"<ul> "
-"<li>palanca amb 2 eixos i 4 botons</li> "
-"<li>palanca amb 3 eixos i 4 botons</li> "
-"<li>palanca amb 4 eixos i 4 botons</li> "
-"<li>palanques Saitek Cyborg 'digital'</li></ul>(Per a més detalls podeu mirar a "
-"Linux source/Documentation/input/joystick.txt)"
+"control funciona correctament.<br>Si proporciona valors incorrectes pels "
+"eixos, podeu provar de solucionar-ho amb el calibratge. <br>Aquest mòdul "
+"prova de trobar tots els dispositius de palanca de control disponibles "
+"comprovant /dev/js[0-4] i /dev/input/js[0-4] <br>Si teniu un altre fitxer "
+"dispositiu, introduïu-lo al quadre combinat.<br>La llista de botons mostra "
+"l'estat dels botons de la palanca de control, la llista d'eixos mostra el "
+"valor actual per a tots els eixos. <br>NOTA: el controlador de dispositius "
+"actual de Linux (Kernel 2.4, 2.6) només pot autodetectar <ul> <li>palanca "
+"amb 2 eixos i 4 botons</li> <li>palanca amb 3 eixos i 4 botons</li> "
+"<li>palanca amb 4 eixos i 4 botons</li> <li>palanques Saitek Cyborg "
+"'digital'</li></ul>(Per a més detalls podeu mirar a Linux source/"
+"Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -265,14 +237,12 @@ msgstr "Calibra"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "No s'ha trobat automàticament cap dispositiu palanca de control en aquest "
-"ordinador."
-"<br>S'han fet comprovacions a /dev/js[0-4] i /dev/input/js[0-4] "
+"ordinador.<br>S'han fet comprovacions a /dev/js[0-4] i /dev/input/js[0-4] "
 "<br>Si sabeu que n'hi ha un connectat, si us plau, introduïu el fitxer "
 "dispositiu correcte."
 
@@ -296,19 +266,13 @@ msgstr "Error de dispositiu"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>El calibratge està a punt de comprovar la precisió. "
-"<br> "
-"<br><b>Moveu tots els eixos a la posició central i no torneu a tocar la "
-"palanca.</b>"
-"<br>"
-"<br>Cliqueu Bé per a engegar el calibratge.</qt>"
+"<qt>El calibratge està a punt de comprovar la precisió. <br> <br><b>Moveu "
+"tots els eixos a la posició central i no torneu a tocar la palanca.</"
+"b><br><br>Cliqueu Bé per a engegar el calibratge.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-cs/messages/tdebase/joystick.po b/tde-i18n-cs/messages/tdebase/joystick.po
index 7b5423d7232..2d7ef8c8e30 100644
--- a/tde-i18n-cs/messages/tdebase/joystick.po
+++ b/tde-i18n-cs/messages/tdebase/joystick.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-09-04 19:14+0200\n"
 "Last-Translator: Lukáš Tinkl <lukas@kde.org>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -16,16 +16,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Klára Cihlářová"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -54,52 +54,35 @@ msgstr "(obvykle Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibrace spočívá v kontrole rozsahu hodnot zařízení."
-"<br>"
-"<br>Přesuňte <b>osu %1 %2</b> zařízení na <b>minimum</b>."
-"<br>"
-"<br>Stisknutím libovolného tlačítka na zařízení nebo tlačítka 'Další' přejdete "
-"na další krok.</qt>"
+"<qt>Kalibrace spočívá v kontrole rozsahu hodnot zařízení.<br><br>Přesuňte "
+"<b>osu %1 %2</b> zařízení na <b>minimum</b>.<br><br>Stisknutím libovolného "
+"tlačítka na zařízení nebo tlačítka 'Další' přejdete na další krok.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibrace spočívá v kontrole rozsahu hodnot zařízení."
-"<br>"
-"<br>Přesuňte <b>osu %1 %2</b> zařízení na <b>střed</b>."
-"<br>"
-"<br>Stisknutím libovolného tlačítka na zařízení nebo tlačítka 'Další' přejdete "
-"na další krok.</qt>"
+"<qt>Kalibrace spočívá v kontrole rozsahu hodnot zařízení.<br><br>Přesuňte "
+"<b>osu %1 %2</b> zařízení na <b>střed</b>.<br><br>Stisknutím libovolného "
+"tlačítka na zařízení nebo tlačítka 'Další' přejdete na další krok.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibrace spočívá v kontrole rozsahu hodnot zařízení."
-"<br>"
-"<br>Přesuňte <b>osu %1 %2</b> zařízení na <b>maximum</b>."
-"<br>"
-"<br>Stisknutím libovolného tlačítka na zařízení nebo tlačítka 'Další' přejdete "
-"na další krok.</qt>"
+"<qt>Kalibrace spočívá v kontrole rozsahu hodnot zařízení.<br><br>Přesuňte "
+"<b>osu %1 %2</b> zařízení na <b>maximum</b>.<br><br>Stisknutím libovolného "
+"tlačítka na zařízení nebo tlačítka 'Další' přejdete na další krok.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -131,11 +114,11 @@ msgstr "Nelze získat verzi ovladače z jádra pro zařízení %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Aktuální běžící verze ovladače z jádra (%1.%2.%3) není určena pro tento modul "
-"(%4.%5.%6)."
+"Aktuální běžící verze ovladače z jádra (%1.%2.%3) není určena pro tento "
+"modul (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -176,39 +159,28 @@ msgstr "TDE modul ovládacího centra pro test joysticku"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Joystick</h1>Tento modul vám pomůže zjistit, zda váš joystick pracuje "
-"správně."
-"<br>Pokud předává chybné hodnoty os, můžete problém vyřešit kalibrací."
-"<br>Modul se také pokusí vyhledat všechna dostupná zařízení kontrolou "
-"/dev/js[0-4] a /dev/input/js[0-4]"
-"<br> Pokud je vaše zařízení připojené jinde, zadejte jméno zařízení."
-"<br> Seznam tlačítek obsahuje stav tlačítek vašeho joysticku, seznam os pak "
-"aktuální nastavené hodnoty pro osy."
+"správně.<br>Pokud předává chybné hodnoty os, můžete problém vyřešit "
+"kalibrací.<br>Modul se také pokusí vyhledat všechna dostupná zařízení "
+"kontrolou /dev/js[0-4] a /dev/input/js[0-4]<br> Pokud je vaše zařízení "
+"připojené jinde, zadejte jméno zařízení.<br> Seznam tlačítek obsahuje stav "
+"tlačítek vašeho joysticku, seznam os pak aktuální nastavené hodnoty pro osy."
 "<br>POZNÁMKA: aktuální linuxový ovladač (jádra 2.4, 2.6) umí automaticky "
-"detekovat pouze "
-"<ul>"
-"<li>2-osý, 4-tlačítkový joystick</li>"
-"<li>3-osý, 4-tlačítkový joystick</li>"
-"<li>4-osý, 4-tlačítkový joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticky</li></ul>(Více informací najdete v "
-"adresáři se zdrojovými kódy jádra v podadresáři "
-"/Documentation/input/joystick.txt)"
+"detekovat pouze <ul><li>2-osý, 4-tlačítkový joystick</li><li>3-osý, 4-"
+"tlačítkový joystick</li><li>4-osý, 4-tlačítkový joystick</li><li>Saitek "
+"Cyborg 'digital' joysticky</li></ul>(Více informací najdete v adresáři se "
+"zdrojovými kódy jádra v podadresáři /Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -248,15 +220,13 @@ msgstr "Kalibrovat"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Automaticky nebyl nalezen žádný připojený joystick."
-"<br>Překontrolujte /dev/js[0-4] a /dev/input/js[0-4]"
-"<br>Pokud jste si jistí, že je joystick správně připojen, zadejte správný "
-"soubor zařízení."
+"Automaticky nebyl nalezen žádný připojený joystick.<br>Překontrolujte /dev/"
+"js[0-4] a /dev/input/js[0-4]<br>Pokud jste si jistí, že je joystick správně "
+"připojen, zadejte správný soubor zařízení."
 
 #: joywidget.cpp:236
 msgid ""
@@ -278,19 +248,13 @@ msgstr "Chyba zařízení"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibrace spočívá ve zjištění přesnosti."
-"<br>"
-"<br><b> Přesuňte všechny osy do jejich centrální polohy a dále se již joysticku "
-"nedotýkejte.</b>"
-"<br>"
-"<br>Kalibraci spustíte stisknutím tlačítka OK.</qt>"
+"<qt>Kalibrace spočívá ve zjištění přesnosti.<br><br><b> Přesuňte všechny osy "
+"do jejich centrální polohy a dále se již joysticku nedotýkejte.</"
+"b><br><br>Kalibraci spustíte stisknutím tlačítka OK.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-csb/messages/tdebase/joystick.po b/tde-i18n-csb/messages/tdebase/joystick.po
index e5f0d7a42f3..726aeac6d43 100644
--- a/tde-i18n-csb/messages/tdebase/joystick.po
+++ b/tde-i18n-csb/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2007-02-25 16:32+0100\n"
 "Last-Translator: Mark Kwidzińsczi <mark@linuxcsb.org>\n"
 "Language-Team: Kashubian\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "||n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Mark Kwidzińsczi, Michôł Òstrowsczi"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,58 +51,41 @@ msgstr "(zwëczajno Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibracëjô dôwô mòżnotã sprôwdzeniô òbjimù wôrtnotë ùprzistãpnianą przez "
-"Twoje ùrządzenié."
-"<br>"
-"<br>Proszã przesënąc manipùlator <b>osë %1 %2</b> Twojegò ùrządzenia do <b>"
-"minimalnégò</b> pòłożenia."
-"<br> "
-"<br>Proszã wcësną równo jaką knąpã na urządzeniu abò knąpã 'Dali', bë przéńc do "
-"nôslédnegò krokù.</qt>"
+"<qt>Kalibracëjô dôwô mòżnotã sprôwdzeniô òbjimù wôrtnotë ùprzistãpnianą "
+"przez Twoje ùrządzenié.<br><br>Proszã przesënąc manipùlator <b>osë %1 %2</b> "
+"Twojegò ùrządzenia do <b>minimalnégò</b> pòłożenia.<br> <br>Proszã wcësną "
+"równo jaką knąpã na urządzeniu abò knąpã 'Dali', bë przéńc do nôslédnegò "
+"krokù.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibracëjô dôwô mòżnotã sprôwdzeniô òbjimù wôrtnotë ùprzistãpnianą przez "
-"Twoje ùrządzenié."
-"<br>"
-"<br>Proszã przesënąc manipùlator <b>osë %1 %2</b> Twojegò ùrządzenia do <b>"
-"westrzódnegò</b> pòłożenia."
-"<br> "
-"<br>Proszã wcësną równo jaką knąpã na urządzeniu abò knąpã 'Dali', bë przéńc do "
-"nôslédnegò krokù.</qt>"
+"<qt>Kalibracëjô dôwô mòżnotã sprôwdzeniô òbjimù wôrtnotë ùprzistãpnianą "
+"przez Twoje ùrządzenié.<br><br>Proszã przesënąc manipùlator <b>osë %1 %2</b> "
+"Twojegò ùrządzenia do <b>westrzódnegò</b> pòłożenia.<br> <br>Proszã wcësną "
+"równo jaką knąpã na urządzeniu abò knąpã 'Dali', bë przéńc do nôslédnegò "
+"krokù.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibracëjô dôwô mòżnotã sprôwdzeniô òbjimù wôrtnotë ùprzistãpnianą przez "
-"Twoje ùrządzenié."
-"<br>"
-"<br>Proszã przesënąc manipùlator <b>osë %1 %2</b> Twojegò ùrządzenia do <b>"
-"maksymalnegò</b> pòłożenia."
-"<br> "
-"<br>Proszã wcësną równo jaką knąpã na urządzeniu abò knąpã 'Dali', bë przéńc do "
-"nôslédnegò krokù.</qt>"
+"<qt>Kalibracëjô dôwô mòżnotã sprôwdzeniô òbjimù wôrtnotë ùprzistãpnianą "
+"przez Twoje ùrządzenié.<br><br>Proszã przesënąc manipùlator <b>osë %1 %2</b> "
+"Twojegò ùrządzenia do <b>maksymalnegò</b> pòłożenia.<br> <br>Proszã wcësną "
+"równo jaką knąpã na urządzeniu abò knąpã 'Dali', bë przéńc do nôslédnegò "
+"krokù.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -135,11 +118,11 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Wersëjô aktualno dzéjającegò czérownika jądra (%1.%2.%3) nie je ną, dlô jaczi "
-"nen mòdul òstôł skòmpilowóny (%4.%5.%6)."
+"Wersëjô aktualno dzéjającegò czérownika jądra (%1.%2.%3) nie je ną, dlô "
+"jaczi nen mòdul òstôł skòmpilowóny (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -184,40 +167,28 @@ msgstr "Mòduł Centróm Kòntrolë TDE do testowaniô joysticków"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Joystick</h1> Nen mòduł zezwôlô sprôwdzëc, czë Twój joystick dzéjô "
-"poprôwno."
-"<br> Eżlë pòdôwô niepòprôwné wôrtnotë dlô jedny z osë, mòżesz spróbòwac to "
-"zmienic przez przeprowadzenié kalibracëji."
-"<br> Nen mòduł próbùje nalezc przistãpné ùrządzenia joysticków sprôwdzając "
-"ùrządzenia /dev/js[0-4] ë /dev/input/js[0-4]"
-"<br> Eżlë ùrządzenié joysticka mô jinszé miono, proszã je pòdac w môlu "
-"rozwijóny lëstë."
-"<br> Lësta Knąpë pòkazëwô stón knąpów joysticka, lësta Òsë pòkazëwô aktualné "
-"wôrtnotë dlô wszëtczich òsë."
-"<br> BÔCZËNK: bieżny czérownik dlô Linuksa (jądra 2.4 ë 2.6) wëkrëwô aùtomatno "
-"blós joysticki:"
-"<ul>"
-"<li>2-òsowé, 4-knąpòwé</li>"
-"<li>3-òsowé, 4-knąpòwé</li>"
-"<li>4-òsowé, 4-knąpòwé</li> "
-"<li>cyfrowé Saitek Cyborg</li></ul> (Wicy nalezesz w zdrojach Linuksa, w lopku "
-"source/Documentation/input/joystick.txt)"
+"poprôwno.<br> Eżlë pòdôwô niepòprôwné wôrtnotë dlô jedny z osë, mòżesz "
+"spróbòwac to zmienic przez przeprowadzenié kalibracëji.<br> Nen mòduł "
+"próbùje nalezc przistãpné ùrządzenia joysticków sprôwdzając ùrządzenia /dev/"
+"js[0-4] ë /dev/input/js[0-4]<br> Eżlë ùrządzenié joysticka mô jinszé miono, "
+"proszã je pòdac w môlu rozwijóny lëstë.<br> Lësta Knąpë pòkazëwô stón knąpów "
+"joysticka, lësta Òsë pòkazëwô aktualné wôrtnotë dlô wszëtczich òsë.<br> "
+"BÔCZËNK: bieżny czérownik dlô Linuksa (jądra 2.4 ë 2.6) wëkrëwô aùtomatno "
+"blós joysticki:<ul><li>2-òsowé, 4-knąpòwé</li><li>3-òsowé, 4-knąpòwé</"
+"li><li>4-òsowé, 4-knąpòwé</li> <li>cyfrowé Saitek Cyborg</li></ul> (Wicy "
+"nalezesz w zdrojach Linuksa, w lopku source/Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -257,14 +228,13 @@ msgstr "Kalibrëjë"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Nie òsta aùtomatno nalazłé niżódné ùrządzenia joysticka na tim kòmpùtrze."
-"<br>Sprôwdzoné òstałë ùrządzenia /dev/js[0-4] ë /dev/input/js[0-4]"
-"<br>Eżlë jest gwës, że joystick je przëłączony, pòdôj pòprôwné miono ùrządzenia "
+"<br>Sprôwdzoné òstałë ùrządzenia /dev/js[0-4] ë /dev/input/js[0-4]<br>Eżlë "
+"jest gwës, że joystick je przëłączony, pòdôj pòprôwné miono ùrządzenia "
 "joysticka."
 
 #: joywidget.cpp:236
@@ -287,19 +257,13 @@ msgstr "Fela ùrządzenia"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibracëjnô programa sprôwdzë terô akùratnosc."
-"<br>"
-"<br><b>Proszã przesënąc wszëtczé manipulatorë osë do westrzódnegò pòłożnia ë "
-"nié tëkac joysticka.</b>"
-"<br> "
-"<br>Proszã klëknąc OK, bë zacząc kalibracëjã.</qt>"
+"<qt>Kalibracëjnô programa sprôwdzë terô akùratnosc.<br><br><b>Proszã "
+"przesënąc wszëtczé manipulatorë osë do westrzódnegò pòłożnia ë nié tëkac "
+"joysticka.</b><br> <br>Proszã klëknąc OK, bë zacząc kalibracëjã.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-cy/messages/tdebase/joystick.po b/tde-i18n-cy/messages/tdebase/joystick.po
index bd00fd9ee6b..de4766baab0 100644
--- a/tde-i18n-cy/messages/tdebase/joystick.po
+++ b/tde-i18n-cy/messages/tdebase/joystick.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2004-07-03 11:25+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "KD wrth Kyfieithu"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -49,54 +49,40 @@ msgstr ""
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Mae graddnodi ar fin gwirio amrediad y gwerthoedd y ddarperir gan eich "
-"dyfais."
-"<br>"
-"<br>Symudwch <b>echelin %1</b> ar eich dyfais i'r lleoliad <b>lleiaf</b>. "
-"<br>"
-"<br>Gwasgwch unrhyw botwm ar y dyfais i barhau efo'r cam nesaf.</qt>"
+"dyfais.<br><br>Symudwch <b>echelin %1</b> ar eich dyfais i'r lleoliad "
+"<b>lleiaf</b>. <br><br>Gwasgwch unrhyw botwm ar y dyfais i barhau efo'r cam "
+"nesaf.</qt>"
 
 #: caldialog.cpp:107
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Mae graddnodi ar fin gwirio amrediad y gwerthoedd y ddarperir gan eich "
-"dyfais."
-"<br>"
-"<br>Symudwch <b>echelin %1</b> ar eich dyfais i'r lleoliad <b>canolig</b>. "
-"<br>"
-"<br>Gwasgwch unrhyw botwm ar y dyfais i barhau efo'r cam nesaf.</qt>"
+"dyfais.<br><br>Symudwch <b>echelin %1</b> ar eich dyfais i'r lleoliad "
+"<b>canolig</b>. <br><br>Gwasgwch unrhyw botwm ar y dyfais i barhau efo'r cam "
+"nesaf.</qt>"
 
 #: caldialog.cpp:124
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Mae graddnodi ar fin gwirio amrediad y gwerthoedd y ddarperir gan eich "
-"dyfais."
-"<br>"
-"<br>Symudwch <b>echelin %1</b> ar eich dyfais i'r lleoliad <b>uchaf</b>. "
-"<br>"
-"<br>Gwasgwch unrhyw botwm ar y dyfais i barhau efo'r cam nesaf.</qt>"
+"dyfais.<br><br>Symudwch <b>echelin %1</b> ar eich dyfais i'r lleoliad "
+"<b>uchaf</b>. <br><br>Gwasgwch unrhyw botwm ar y dyfais i barhau efo'r cam "
+"nesaf.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -129,11 +115,11 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Nid yw'r fersiwn gyrriant cnewyllyn sy'n rhedeg yn gyfredol (%1.%2.%3) yr un a "
-"gafodd y modiwl yma ei grynhoi amdano  (%4.%5.%6)."
+"Nid yw'r fersiwn gyrriant cnewyllyn sy'n rhedeg yn gyfredol (%1.%2.%3) yr un "
+"a gafodd y modiwl yma ei grynhoi amdano  (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -176,39 +162,29 @@ msgstr "Modiwl Canolfan Reoli TDE i brofi Ffyn Rheoli"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Ffon rheoli</h1>Mae'r modiwl yma yn gymorth i wirio a yw eich ffon rheoli "
-"yn gweithio yn gywir. "
-"<br>Os darperir gwerthoedd anghywir ar gyfer yr echeliniau, gallwch geisio "
-"datrys hyn efo'r graddnodi."
-"<br>Mae'r modiwl yma yn ceisio darganfod pob dyfais ffon rheoli gan wirio "
-"/dev/js[0-4] a dev/input/js[0-4]."
-"<br>Os oes gennych ffeil dyfais arall, rhowch ei henw yn y blwch cyfuno. "
-"<br>Mae'r rhestr Botymau yn dangos cyflwr y botymau ar eich ffon rheoli, ac "
-"mae'r rhestr Echeliniau yn dangos y gwerth cyfredol ar gyfer pob echelin."
-"<br>NODER: gall y gyrriant dyfais Linux cyfredol (Cnewyllyn 2.4, 2.6) "
-"ddarganfod y dilynnol yn unig:"
-"<ul> "
-"<li>ffon rheoli 2-echelin, 4-botwm</li> "
-"<li>ffon rheoli 3-echelin, 4-botwm</li> "
-"<li>ffon rheoli 4-echelin, 4-botwm</li> "
-"<li>ffyn rheoli Saitek Cyborg 'digidol'</li> </ul>(Am fanylion gallwch wirio "
-"eich Linux source/Documentation/input/joystick.txt)."
+"<h1>Ffon rheoli</h1>Mae'r modiwl yma yn gymorth i wirio a yw eich ffon "
+"rheoli yn gweithio yn gywir. <br>Os darperir gwerthoedd anghywir ar gyfer yr "
+"echeliniau, gallwch geisio datrys hyn efo'r graddnodi.<br>Mae'r modiwl yma "
+"yn ceisio darganfod pob dyfais ffon rheoli gan wirio /dev/js[0-4] a dev/"
+"input/js[0-4].<br>Os oes gennych ffeil dyfais arall, rhowch ei henw yn y "
+"blwch cyfuno. <br>Mae'r rhestr Botymau yn dangos cyflwr y botymau ar eich "
+"ffon rheoli, ac mae'r rhestr Echeliniau yn dangos y gwerth cyfredol ar gyfer "
+"pob echelin.<br>NODER: gall y gyrriant dyfais Linux cyfredol (Cnewyllyn 2.4, "
+"2.6) ddarganfod y dilynnol yn unig:<ul> <li>ffon rheoli 2-echelin, 4-botwm</"
+"li> <li>ffon rheoli 3-echelin, 4-botwm</li> <li>ffon rheoli 4-echelin, 4-"
+"botwm</li> <li>ffyn rheoli Saitek Cyborg 'digidol'</li> </ul>(Am fanylion "
+"gallwch wirio eich Linux source/Documentation/input/joystick.txt)."
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -249,10 +225,9 @@ msgstr "Graddnodi"
 #: joywidget.cpp:190
 #, fuzzy
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Ni ddarganfuwyd dyfais ffon rheoli yn ymysgogol ar y cyfrifiadur yma.\n"
 "Gwiriwyd /dev/js[0-4] a /dev/input/js[0-4]\n"
@@ -278,19 +253,13 @@ msgstr "Gwall Dyfais"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Mae graddnodi ar fin gwirio'r trachywiredd. "
-"<br>"
-"<br><b>Symudwch pob echelin i'w lleoliad canolig, ac wedyn peidiwch â chyffwrdd "
-"y ffon rheoli yn bellach.</b>"
-"<br>"
-"<br>Cliciwch Iawn i ddechrau'r graddnodi.</qt>"
+"<qt>Mae graddnodi ar fin gwirio'r trachywiredd. <br><br><b>Symudwch pob "
+"echelin i'w lleoliad canolig, ac wedyn peidiwch â chyffwrdd y ffon rheoli yn "
+"bellach.</b><br><br>Cliciwch Iawn i ddechrau'r graddnodi.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-da/messages/tdebase/joystick.po b/tde-i18n-da/messages/tdebase/joystick.po
index 9d20df33c70..31d878aaa52 100644
--- a/tde-i18n-da/messages/tdebase/joystick.po
+++ b/tde-i18n-da/messages/tdebase/joystick.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-09-21 07:45-0400\n"
 "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Erik Kjær Pedersen"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -50,53 +50,38 @@ msgstr "(sædvanligvis Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibreringen er ved at tjekke det værdiområde din enhed leverer."
-"<br>"
-"<br>Flyt venligst <b>akse %1 %2</b> på din enhed til <b>minimums</b>positionen."
-"<br>"
-"<br>Tryk på en vilkårlig knap på enheden eller klik på knappen 'Næste' for at "
-"fortsætte med næste skridt.</qt>"
+"<br><br>Flyt venligst <b>akse %1 %2</b> på din enhed til <b>minimums</"
+"b>positionen.<br><br>Tryk på en vilkårlig knap på enheden eller klik på "
+"knappen 'Næste' for at fortsætte med næste skridt.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibreringen er ved at tjekke det værdiområde din enhed leverer."
-"<br>"
-"<br>Flyt venligst <b>akse %1 %2</b> på din enhed til <b>center</b>positionen."
-"<br>"
-"<br>Tryk på en vilkårlig knap på enheden eller klik på knappen 'Næste' for at "
-"fortsætte med næste trin.</qt>"
+"<br><br>Flyt venligst <b>akse %1 %2</b> på din enhed til <b>center</"
+"b>positionen.<br><br>Tryk på en vilkårlig knap på enheden eller klik på "
+"knappen 'Næste' for at fortsætte med næste trin.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibreringen er ved at tjekke det værdiområde din enhed leverer."
-"<br>"
-"<br>Flyt venligst <b>akse %1 %2</b> på din enhed til <b>maksimums</b>"
-"positionen."
-"<br>"
-"<br>Tryk på en vilkårlig knap på enheden eller klik på knappen 'Næste' for at "
-"fortsætte med næste trin.</qt>"
+"<br><br>Flyt venligst <b>akse %1 %2</b> på din enhed til <b>maksimums</"
+"b>positionen.<br><br>Tryk på en vilkårlig knap på enheden eller klik på "
+"knappen 'Næste' for at fortsætte med næste trin.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -128,8 +113,8 @@ msgstr "Kunne ikke få kernedriver-version for joystick enheden %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "Den nuværende kørende kernedriver version (%1.%2.%3) er ikke den dette modul "
 "blev kompileret for (%4.%5.%6)."
@@ -175,39 +160,29 @@ msgstr "TDE's kontrolcenter modul til at teste Joystick"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Joystick</h1>Dette modul hjælper med at tjekke om dit joystick virker "
-"rigtigt."
-"<br>Hvis det giver forkerte værdier for akserne, kan du prøve at løse dette med "
-"kalibreringen."
-"<br>Dette modul prøver at finde alle tilgængelige joystick-enheder ved at "
-"tjekke /dev/js[0-4] og /dev/input/js[0-4]"
-"<br>Hvis du har en anden enhedsfil, så indtast den i kombinationsfeltet."
-"<br>Knapperne på listen viser knappernes tilstand på dit joystick, listen af "
-"akser viser de nuværende værdier for alle akser."
+"rigtigt.<br>Hvis det giver forkerte værdier for akserne, kan du prøve at "
+"løse dette med kalibreringen.<br>Dette modul prøver at finde alle "
+"tilgængelige joystick-enheder ved at tjekke /dev/js[0-4] og /dev/input/"
+"js[0-4]<br>Hvis du har en anden enhedsfil, så indtast den i "
+"kombinationsfeltet.<br>Knapperne på listen viser knappernes tilstand på dit "
+"joystick, listen af akser viser de nuværende værdier for alle akser."
 "<br>BEMÆRK: den nuværende Linux enhedsdriver (Kernel 2.4, 2.6) kan kun "
-"autodetektere "
-"<ul>"
-"<li>2-akse, 4-knap joystick</li>"
-"<li>3-akse, 4-knap joystick</li>"
-"<li>4-akse, 4-knap joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For detaljer kan du tjekke din "
-"Linux kilde/dokumentation/input/joystick.txt)"
+"autodetektere <ul><li>2-akse, 4-knap joystick</li><li>3-akse, 4-knap "
+"joystick</li><li>4-akse, 4-knap joystick</li><li>Saitek Cyborg 'digital' "
+"joysticks</li></ul>(For detaljer kan du tjekke din Linux kilde/dokumentation/"
+"input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -247,15 +222,13 @@ msgstr "Kalibrér"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Ingen Joystick enhed automatisk fundet på denne computer."
-"<br>Tjek blev udført i /dev/js[0-4] og /dev/input/js[0-4]"
-"<br>Hvis du ved der er en tilknyttet, så indtast venligst den rigtige "
-"enhedsfil."
+"Ingen Joystick enhed automatisk fundet på denne computer.<br>Tjek blev "
+"udført i /dev/js[0-4] og /dev/input/js[0-4]<br>Hvis du ved der er en "
+"tilknyttet, så indtast venligst den rigtige enhedsfil."
 
 #: joywidget.cpp:236
 msgid ""
@@ -277,19 +250,13 @@ msgstr "Enhedsfejl"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibreringen er ved at tjekke præcisionen."
-"<br>"
-"<br><b>Flyt venligst alle akser til deres centerposition og rør så ikke mere "
-"ved dit joystick.</b>"
-"<br>"
-"<br>Klik på o.k. for at starte kalibreringen.</qt>"
+"<qt>Kalibreringen er ved at tjekke præcisionen.<br><br><b>Flyt venligst alle "
+"akser til deres centerposition og rør så ikke mere ved dit joystick.</"
+"b><br><br>Klik på o.k. for at starte kalibreringen.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-de/messages/tdebase/joystick.po b/tde-i18n-de/messages/tdebase/joystick.po
index 400dc79d80e..eab1bea984c 100644
--- a/tde-i18n-de/messages/tdebase/joystick.po
+++ b/tde-i18n-de/messages/tdebase/joystick.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2007-01-13 19:39+0100\n"
 "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Thomas Diehl"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -54,55 +54,41 @@ msgstr "(normalerweise Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Bei der Kalibrierung wird der Wertebereich getestet, den das Gerät ausgibt."
-"<br>"
-"<br>Bitte verschieben Sie <b>Achse %1 %2</b> des Geräts auf die <b>minimale</b> "
-"Position."
-"<br>"
-"<br>Drücken Sie dann einen beliebigen Bedienknopf des Joysticks oder "
-"\"Weiter\", um zum nächsten Schritt zu gelangen.</qt>"
+"<qt>Bei der Kalibrierung wird der Wertebereich getestet, den das Gerät "
+"ausgibt.<br><br>Bitte verschieben Sie <b>Achse %1 %2</b> des Geräts auf die "
+"<b>minimale</b> Position.<br><br>Drücken Sie dann einen beliebigen "
+"Bedienknopf des Joysticks oder \"Weiter\", um zum nächsten Schritt zu "
+"gelangen.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Bei der Kalibrierung wird der Wertebereich getestet, den das Gerät ausgibt."
-"<br>"
-"<br>Bitte verschieben Sie <b>Achse %1 %2</b> des Geräts auf die <b>mittlere</b> "
-"Position."
-"<br>"
-"<br>Drücken Sie dann einen beliebigen Bedienknopf des Joysticks oder "
-"\"Weiter\", um zum nächsten Schritt zu gelangen.</qt>"
+"<qt>Bei der Kalibrierung wird der Wertebereich getestet, den das Gerät "
+"ausgibt.<br><br>Bitte verschieben Sie <b>Achse %1 %2</b> des Geräts auf die "
+"<b>mittlere</b> Position.<br><br>Drücken Sie dann einen beliebigen "
+"Bedienknopf des Joysticks oder \"Weiter\", um zum nächsten Schritt zu "
+"gelangen.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Bei der Kalibrierung wird der Wertebereich getestet, den das Gerät ausgibt."
-"<br>"
-"<br>Bitte verschieben Sie <b>Achse %1 %2</b> des Geräts auf die <b>maximale</b> "
-"Position."
-"<br>"
-"<br>Drücken Sie dann einen beliebigen Bedienknopf des Joysticks oder "
-"\"Weiter\", um zum nächsten Schritt zu gelangen.</qt>"
+"<qt>Bei der Kalibrierung wird der Wertebereich getestet, den das Gerät "
+"ausgibt.<br><br>Bitte verschieben Sie <b>Achse %1 %2</b> des Geräts auf die "
+"<b>maximale</b> Position.<br><br>Drücken Sie dann einen beliebigen "
+"Bedienknopf des Joysticks oder \"Weiter\", um zum nächsten Schritt zu "
+"gelangen.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -135,8 +121,8 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "Die aktuelle Treiberversion des verwendeten Kernels (%1.%2.%3) ist nicht "
 "dieselbe, für die das Modul kompiliert wurde (%4.%5.%6)."
@@ -144,7 +130,8 @@ msgstr ""
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
 msgstr ""
-"Die Anzahl der Bedienknöpfe für den Joystick %1 lässt sich nicht ermitteln: %2"
+"Die Anzahl der Bedienknöpfe für den Joystick %1 lässt sich nicht ermitteln: "
+"%2"
 
 #: joydevice.cpp:93
 msgid "Could not get number of axes for joystick device %1: %2"
@@ -158,13 +145,14 @@ msgstr ""
 #: joydevice.cpp:105
 msgid "Could not restore calibration values for joystick device %1: %2"
 msgstr ""
-"Die Einstellungswerte für den Joystick %1 lassen sich nicht wiederherstellen: "
-"%2"
+"Die Einstellungswerte für den Joystick %1 lassen sich nicht "
+"wiederherstellen: %2"
 
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"Die Einstellungswerte für den Joystick %1 lassen sich nicht initialisieren: %2"
+"Die Einstellungswerte für den Joystick %1 lassen sich nicht initialisieren: "
+"%2"
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
@@ -185,39 +173,29 @@ msgstr "TDE-Modul zum Testen von Joysticks"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Joystick</h1>Dieses Modul hilft Ihnen beim Testen von Joysticks."
-"<br>Sollten falsche Achsenwerte ausgegeben werden, können diese mit Hilfe der "
-"Kalibrierung eventuell korrigiert werden."
-"<br>Das Modul versucht verfügbare Joysticks durch Überprüfung der Gerätedateien "
-"/dev/js[0-4] und /dev/input/js[0-4] zu ermitteln."
-"<br>Sollte Ihr Gerät so nicht auffindbar sein, geben Sie den entsprechenden "
-"Treiber im Kombinationsfeld ein."
-"<br>Eine Liste zeigt den Status der Bedienknöpfe auf dem Joystick an. Eine "
-"andere die aktuellen Werte für sämtliche Achsen."
-"<br>Beachten Sie bitte: Der Linux-Gerätetreiber für Kernel 2.4 und 2.6 entdeckt "
-"lediglich folgende Typen:"
-"<ul>"
-"<li>2-achsige Joysticks mit 4 Knöpfen</li>"
-"<li>3-achsige Joysticks mit 4 Knöpfen</li>"
-"<li>4-achsige Joysticks mit 4 Knöpfen</li>"
-"<li>sowie Saitek Cyborg 'Digital' Joysticks</li></ul>"
-"(Details dazu finden Sie bei Linux unter "
+"<br>Sollten falsche Achsenwerte ausgegeben werden, können diese mit Hilfe "
+"der Kalibrierung eventuell korrigiert werden.<br>Das Modul versucht "
+"verfügbare Joysticks durch Überprüfung der Gerätedateien /dev/js[0-4] und /"
+"dev/input/js[0-4] zu ermitteln.<br>Sollte Ihr Gerät so nicht auffindbar "
+"sein, geben Sie den entsprechenden Treiber im Kombinationsfeld ein.<br>Eine "
+"Liste zeigt den Status der Bedienknöpfe auf dem Joystick an. Eine andere die "
+"aktuellen Werte für sämtliche Achsen.<br>Beachten Sie bitte: Der Linux-"
+"Gerätetreiber für Kernel 2.4 und 2.6 entdeckt lediglich folgende Typen:"
+"<ul><li>2-achsige Joysticks mit 4 Knöpfen</li><li>3-achsige Joysticks mit 4 "
+"Knöpfen</li><li>4-achsige Joysticks mit 4 Knöpfen</li><li>sowie Saitek "
+"Cyborg 'Digital' Joysticks</li></ul>(Details dazu finden Sie bei Linux unter "
 "source/Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
@@ -258,15 +236,14 @@ msgstr "Einstellen/Kalibrieren"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Die automatische Suche nach einem Joystick an diesem Rechner war erfolglos."
-"<br>Überprüft wurden /dev/js[0-4] und /dev/input/js[0-4]"
-"<br>Wenn Sie sicher sind, dass ein entsprechendes Gerät angeschlossen ist, "
-"geben Sie bitte die korrekte Gerätedatei an."
+"<br>Überprüft wurden /dev/js[0-4] und /dev/input/js[0-4]<br>Wenn Sie sicher "
+"sind, dass ein entsprechendes Gerät angeschlossen ist, geben Sie bitte die "
+"korrekte Gerätedatei an."
 
 #: joywidget.cpp:236
 msgid ""
@@ -288,19 +265,14 @@ msgstr "Gerätefehler"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 "<qt>Bei der Kalibrierung wird die Präzision des Geräts festgestellt."
-"<br>"
-"<br><b>Bitte stellen Sie sämtliche Achsen auf die mittlere Position und lassen "
-"Sie dann den Joystick unberührt.</b>"
-"<br>"
-"<br>Klicken Sie auf OK, um die Kalibrierung zu starten.</qt>"
+"<br><br><b>Bitte stellen Sie sämtliche Achsen auf die mittlere Position und "
+"lassen Sie dann den Joystick unberührt.</b><br><br>Klicken Sie auf OK, um "
+"die Kalibrierung zu starten.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-el/messages/tdebase/joystick.po b/tde-i18n-el/messages/tdebase/joystick.po
index 95ec7429753..ba050b771e1 100644
--- a/tde-i18n-el/messages/tdebase/joystick.po
+++ b/tde-i18n-el/messages/tdebase/joystick.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2007-03-17 12:27+0200\n"
 "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Σπύρος Γεωργαράς,Τούσης Μανώλης"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -52,55 +52,38 @@ msgstr "(συνήθως το Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Η ρύθμιση αξόνων πρόκειται να ελέγξει το εύρος τιμών που λειτουργεί η "
-"συσκευή σας. "
-"<br> "
-"<br>Παρακαλώ μετακινήστε τον <b> άξονα %1 %2</b> στη συσκευή σας στην <b>"
-"ελάχιστη</b>θέση. "
-"<br>"
-"<br>Πιέστε κάποιο κουμπί στη συσκευή για συνέχεια στο επόμενο βήμα.</qt>"
+"συσκευή σας. <br> <br>Παρακαλώ μετακινήστε τον <b> άξονα %1 %2</b> στη "
+"συσκευή σας στην <b>ελάχιστη</b>θέση. <br><br>Πιέστε κάποιο κουμπί στη "
+"συσκευή για συνέχεια στο επόμενο βήμα.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Η ρύθμιση αξόνων πρόκειται να ελέγξει το εύρος τιμών που λειτουργεί η "
-"συσκευή σας. "
-"<br> "
-"<br>Παρακαλώ μετακινήστε τον <b> άξονα %1 %2</b> στη συσκευή σας στην <b>"
-"κεντρική</b>θέση. "
-"<br>"
-"<br>Πιέστε κάποιο κουμπί στη συσκευή για συνέχεια στο επόμενο βήμα.</qt>"
+"συσκευή σας. <br> <br>Παρακαλώ μετακινήστε τον <b> άξονα %1 %2</b> στη "
+"συσκευή σας στην <b>κεντρική</b>θέση. <br><br>Πιέστε κάποιο κουμπί στη "
+"συσκευή για συνέχεια στο επόμενο βήμα.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Η ρύθμιση αξόνων πρόκειται να ελέγξει το εύρος τιμών που λειτουργεί η "
-"συσκευή σας. "
-"<br> "
-"<br>Παρακαλώ μετακινήστε τον <b> άξονα %1 %2</b> στη συσκευή σας στη <b>"
-"μέγιστη</b>θέση. "
-"<br>"
-"<br>Πιέστε κάποιο κουμπί στη συσκευή για συνέχεια στο επόμενο βήμα.</qt>"
+"συσκευή σας. <br> <br>Παρακαλώ μετακινήστε τον <b> άξονα %1 %2</b> στη "
+"συσκευή σας στη <b>μέγιστη</b>θέση. <br><br>Πιέστε κάποιο κουμπί στη συσκευή "
+"για συνέχεια στο επόμενο βήμα.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -129,12 +112,13 @@ msgstr "Η δοσμένη συσκευή %1 Δεν είναι χειριστήρ
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
 msgstr ""
-"Δεν μπορεί να βρεθεί η έκδοση του οδηγού στον πυρήνα για το χειριστήριο %1: %2"
+"Δεν μπορεί να βρεθεί η έκδοση του οδηγού στον πυρήνα για το χειριστήριο %1: "
+"%2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "Η τρέχουσα έκδοση πυρήνα (%1.%2.%3) δεν αντιστοιχεί στην έκδοση του οδηγού "
 "(%4.%5.%6)."
@@ -179,38 +163,29 @@ msgstr "Άρθρωμα Κέντρου Ελέγχου TDE για τον έλεγ�
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Χειριστήριο</h1>Το άρθρωμα αυτό βοηθά στον έλεγχο καλής λειτουργίας του "
-"χειριστηρίου σας."
-"<br>Αν αποδίδει λάθος τιμές στους άξονες, μπορείτε να δοκιμάσετε την επίλυσή "
-"του με τη Ρύθμιση αξόνων."
-"<br>Το άρθρωμα αυτό προσπαθεί να αναζητήσει όλα τα χειριστήρια ελέγχοντας τις "
-"/dev/js[0-4] και /dev/input/js[0-4]"
-"<br>Αν έχετε κάποιο άλλο όνομα συσκευής, εισάγετέ το στο πλαίσιο."
-"<br> Η λίστα κουμπιών δείχνει την κατάσταση του κουμπιών του χειριστηρίου, Η "
-"λίστα αξόνων δείχνει την τρέχουσα τιμή για όλους τους άξονες."
-"<br> ΣΗΜΕΙΩΣΗ: Ο τρέχων οδηγός πυρήνα (Kernel 2.4, 2.6) μπορεί να αναγνωρίσει"
-"<ul>"
-"<li>Χειριστήριο με 2-άξονες, 4-κουμπιά</li>"
-"<li>Χειριστήριο με 3-άξονες, 4-κουμπιά</li>"
-"<li>Χειριστήριο με 4-άξονες, 4-κουμπιά</li>"
-"<li>Ψηφιακά Χειριστήρια Saitek Cyborg </li></ul> (Περισσότερες πληροφορίες στο "
-"Linux source/Documentation/input/joystick.txt)"
+"χειριστηρίου σας.<br>Αν αποδίδει λάθος τιμές στους άξονες, μπορείτε να "
+"δοκιμάσετε την επίλυσή του με τη Ρύθμιση αξόνων.<br>Το άρθρωμα αυτό "
+"προσπαθεί να αναζητήσει όλα τα χειριστήρια ελέγχοντας τις /dev/js[0-4] και /"
+"dev/input/js[0-4]<br>Αν έχετε κάποιο άλλο όνομα συσκευής, εισάγετέ το στο "
+"πλαίσιο.<br> Η λίστα κουμπιών δείχνει την κατάσταση του κουμπιών του "
+"χειριστηρίου, Η λίστα αξόνων δείχνει την τρέχουσα τιμή για όλους τους άξονες."
+"<br> ΣΗΜΕΙΩΣΗ: Ο τρέχων οδηγός πυρήνα (Kernel 2.4, 2.6) μπορεί να "
+"αναγνωρίσει<ul><li>Χειριστήριο με 2-άξονες, 4-κουμπιά</li><li>Χειριστήριο με "
+"3-άξονες, 4-κουμπιά</li><li>Χειριστήριο με 4-άξονες, 4-κουμπιά</"
+"li><li>Ψηφιακά Χειριστήρια Saitek Cyborg </li></ul> (Περισσότερες "
+"πληροφορίες στο Linux source/Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -250,15 +225,13 @@ msgstr "Ρύθμιση"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Δε βρέθηκε κανένα χειριστήριο στον υπολογιστή σας."
-"<br>Ελέγχθηκαν τα /dev/js[0-4] και /dev/input/js[0-4]"
-"<br>Αν είστε σίγουροι ότι είναι κάποιο συνδεδεμένο, παρακαλώ δώστε το σωστό "
-"αρχείο συσκευής."
+"Δε βρέθηκε κανένα χειριστήριο στον υπολογιστή σας.<br>Ελέγχθηκαν τα /dev/"
+"js[0-4] και /dev/input/js[0-4]<br>Αν είστε σίγουροι ότι είναι κάποιο "
+"συνδεδεμένο, παρακαλώ δώστε το σωστό αρχείο συσκευής."
 
 #: joywidget.cpp:236
 msgid ""
@@ -280,19 +253,14 @@ msgstr "Σφάλμα συσκευής"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Η Ρύθμιση πρόκειται να ελέγξει την ακρίβεια της συσκευής. "
-"<br> "
-"<br><b>Παρακαλώ μετακινήστε όλους τους άξονες στο κέντρο και έπειτα αφήστε το "
-"χειριστήριο ελεύθερο. </b>"
-"<br>"
-"<br>Πιέστε Εντάξει για να ξεκινήσετε τη ρύθμιση.</qt>"
+"<qt>Η Ρύθμιση πρόκειται να ελέγξει την ακρίβεια της συσκευής. <br> "
+"<br><b>Παρακαλώ μετακινήστε όλους τους άξονες στο κέντρο και έπειτα αφήστε "
+"το χειριστήριο ελεύθερο. </b><br><br>Πιέστε Εντάξει για να ξεκινήσετε τη "
+"ρύθμιση.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-en_GB/messages/tdebase/joystick.po b/tde-i18n-en_GB/messages/tdebase/joystick.po
index 89398846433..07797de3ae0 100644
--- a/tde-i18n-en_GB/messages/tdebase/joystick.po
+++ b/tde-i18n-en_GB/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-11-04 13:59+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Andrew Coles"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -49,54 +49,38 @@ msgstr "(usually Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>centre</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>centre</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -128,11 +112,11 @@ msgstr "Could not get kernel driver version for joystick device %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -173,38 +157,28 @@ msgstr "TDE Control Centre Module to test Joysticks"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -244,15 +218,13 @@ msgstr "Calibrate"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 
 #: joywidget.cpp:236
 msgid ""
@@ -274,19 +246,13 @@ msgstr "Device Error"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their centre position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their centre position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-eo/messages/tdebase/joystick.po b/tde-i18n-eo/messages/tdebase/joystick.po
index ffd2a6c8247..deb720e8de2 100644
--- a/tde-i18n-eo/messages/tdebase/joystick.po
+++ b/tde-i18n-eo/messages/tdebase/joystick.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2007-03-03 22:52+0100\n"
 "Last-Translator: Stéphane Fillod <f8cfe@free.fr>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "X-Poedit-Language: Esperanto\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Matthias Peick, Axel Rousseau"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -53,52 +53,38 @@ msgstr "(ĉiam Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibreco estas necesa por esplori la valorojn, kiujn vi aparato sendas. "
-"<br>"
-"<br>Movu la <b>akson %1 %2</b> de via aparato al la <b>minimuma</b> pozicio. "
-"<br>"
-"<br>Premu iun butonon de la aparato aŭ klaku butonon 'Sekva' por pluigi kun la "
-"venonta paŝo.</qt>"
+"<br><br>Movu la <b>akson %1 %2</b> de via aparato al la <b>minimuma</b> "
+"pozicio. <br><br>Premu iun butonon de la aparato aŭ klaku butonon 'Sekva' "
+"por pluigi kun la venonta paŝo.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibreco estas necesa por esplori la valorojn, kiujn vi aparato sendas. "
-"<br>"
-"<br>Movu la <b>akson %1 %2</b> de via aparato al la <b>meza</b> pozicio. "
-"<br>"
-"<br>Premu iun butonon de la aparato aŭ klaku butonon 'Sekva' por pluigi kun la "
-"venonta paŝo.</qt>"
+"<br><br>Movu la <b>akson %1 %2</b> de via aparato al la <b>meza</b> pozicio. "
+"<br><br>Premu iun butonon de la aparato aŭ klaku butonon 'Sekva' por pluigi "
+"kun la venonta paŝo.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibreco estas necesa por esplori la valorojn, kiujn vi aparato sendas. "
-"<br>"
-"<br>Movu la <b>akson %1 %2</b> de via aparato al la <b>maksimuma</b> pozicio. "
-"<br>"
-"<br>Premu iun butonon de la aparato aŭ klaku la butonon 'Sekva' por pluigi kun "
-"la venonta paŝo.</qt>"
+"<br><br>Movu la <b>akson %1 %2</b> de via aparato al la <b>maksimuma</b> "
+"pozicio. <br><br>Premu iun butonon de la aparato aŭ klaku la butonon 'Sekva' "
+"por pluigi kun la venonta paŝo.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -130,8 +116,8 @@ msgstr "Ne estas ebla lanĉi kernpelilversion de stirstangaparato %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "La nun uzata kernpelilversio (%1.%2.%3) ne estas tiu, por kiu (%4.%5.%6)la "
 "modulo estas tradukita."
@@ -175,39 +161,29 @@ msgstr "Stirmodulo de TDE por testi stirstangojn"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Stirstango</h1> Tiu modulo helpas kontroli la korektan funkcion de via "
-"stirstango. "
-"<br>Se ĝi sendas nekorektajn valorojn de la aksoj, vi povas provi la kalibrecon "
-"pro solveco. "
-"<br>Tiu modulo provas trovi ciujn ekzistajn stirstangojn per esploro de "
-"/dev/js[0-4] kaj /dev/input/js[0-4]. "
-"<br>Se vi havas alian aparatan dosieron, entipu ĝin en la kombinliston. "
-"<br>La butonlisto montras la butonajn statojn de via stirstango, la akslisto "
-"montras la nunan valoro de ĉiuj aksoj. "
-"<br>Notu: la nuna linuksa aparatpelilo (kerno 2.4, 2.6) nur povas rimarki "
-"<ul> "
-"<li>du-aksa, kvar-butona stirstango</li> "
-"<li>tri-aksa, kvar-butona stirstango</li> "
-"<li>kvar-aksa, kvar-butona stirstango</li> "
-"<li>'digital'-stirstangoj de Saitek Cyborg</li> </ul> "
-"(Pri detaloj vi povas legi en la linuksa dosiero "
-"source/Documentation/input/joystick.txt)"
+"stirstango. <br>Se ĝi sendas nekorektajn valorojn de la aksoj, vi povas "
+"provi la kalibrecon pro solveco. <br>Tiu modulo provas trovi ciujn ekzistajn "
+"stirstangojn per esploro de /dev/js[0-4] kaj /dev/input/js[0-4]. <br>Se vi "
+"havas alian aparatan dosieron, entipu ĝin en la kombinliston. <br>La "
+"butonlisto montras la butonajn statojn de via stirstango, la akslisto "
+"montras la nunan valoro de ĉiuj aksoj. <br>Notu: la nuna linuksa "
+"aparatpelilo (kerno 2.4, 2.6) nur povas rimarki <ul> <li>du-aksa, kvar-"
+"butona stirstango</li> <li>tri-aksa, kvar-butona stirstango</li> <li>kvar-"
+"aksa, kvar-butona stirstango</li> <li>'digital'-stirstangoj de Saitek "
+"Cyborg</li> </ul> (Pri detaloj vi povas legi en la linuksa dosiero source/"
+"Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -247,14 +223,13 @@ msgstr "Kalibru"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Nenia stirstangaparato estas aŭtomate trovebla en tiu komputilo."
-"<br>Esploro estas farita en /dev/js[0-4] kaj /dev/input/js[0-4]."
-"<br>Se vi scias, ke unu ekzistas, tiam enigu la korektan aparatdosieron."
+"Nenia stirstangaparato estas aŭtomate trovebla en tiu komputilo.<br>Esploro "
+"estas farita en /dev/js[0-4] kaj /dev/input/js[0-4].<br>Se vi scias, ke unu "
+"ekzistas, tiam enigu la korektan aparatdosieron."
 
 #: joywidget.cpp:236
 msgid ""
@@ -276,19 +251,13 @@ msgstr "Aparat eraro"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Por esplori la precizecon vi necesas la kalibrecon."
-"<br>"
-"<br><b>Movu ĉiujn aksojn al siaj mezaj pozicioj kaj ne plu tuŝu la "
-"stirstangon.</b>"
-"<br>"
-"<br>Kliku \"Konfirmu\" por lanĉi la kalibrecon.</qt>"
+"<qt>Por esplori la precizecon vi necesas la kalibrecon.<br><br><b>Movu ĉiujn "
+"aksojn al siaj mezaj pozicioj kaj ne plu tuŝu la stirstangon.</"
+"b><br><br>Kliku \"Konfirmu\" por lanĉi la kalibrecon.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-es/messages/tdebase/joystick.po b/tde-i18n-es/messages/tdebase/joystick.po
index dd1e684ab0e..4052e3785c5 100644
--- a/tde-i18n-es/messages/tdebase/joystick.po
+++ b/tde-i18n-es/messages/tdebase/joystick.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2007-05-09 13:30+0200\n"
 "Last-Translator: Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -20,13 +20,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Jaime Robles,Pablo de Vicente,Miguel Revilla Rodríguez"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -55,58 +55,38 @@ msgstr "(habitualmente Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>La calibración consiste en determinar el rango de valores en que opera el "
-"dispositivo."
-"<br>"
-"<br>Por favor, mueva los <b>ejes %1 %2</b> del dispositivo a su posición <b>"
-"mínima</b>."
-"<br>"
-"<br>Pulse cualquier botón del dispositivo para continuar con el siguiente "
-"paso.</qt>"
+"<qt>La calibración consiste en determinar el rango de valores en que opera "
+"el dispositivo.<br><br>Por favor, mueva los <b>ejes %1 %2</b> del "
+"dispositivo a su posición <b>mínima</b>.<br><br>Pulse cualquier botón del "
+"dispositivo para continuar con el siguiente paso.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>La calibración consiste en determinar el rango de valores en que opera el "
-"dispositivo."
-"<br>"
-"<br>Por favor, mueva los <b>ejes %1 %2</b> del dispositivo a su posición <b>"
-"central</b>."
-"<br>"
-"<br>Pulse cualquier botón del dispositivo para continuar con el siguiente "
-"paso.</qt>"
+"<qt>La calibración consiste en determinar el rango de valores en que opera "
+"el dispositivo.<br><br>Por favor, mueva los <b>ejes %1 %2</b> del "
+"dispositivo a su posición <b>central</b>.<br><br>Pulse cualquier botón del "
+"dispositivo para continuar con el siguiente paso.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>La calibración consiste en determinar el intervalo de valores en que opera "
-"el dispositivo."
-"<br>"
-"<br>Por favor, mueva los <b>ejes %1 %2</b> del dispositivo a su posición <b>"
-"máxima</b>."
-"<br>"
-"<br>Pulse cualquier botón del dispositivo para continuar con el siguiente "
-"paso.</qt>"
+"<qt>La calibración consiste en determinar el intervalo de valores en que "
+"opera el dispositivo.<br><br>Por favor, mueva los <b>ejes %1 %2</b> del "
+"dispositivo a su posición <b>máxima</b>.<br><br>Pulse cualquier botón del "
+"dispositivo para continuar con el siguiente paso.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -138,11 +118,11 @@ msgstr "No se puede obtener la versión del controlador del joystick %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"La versión actual del controlador del kernel (%1.%2.%3) no corresponde con la "
-"que se utilizó para compilar el módulo (%4.%5.%6)."
+"La versión actual del controlador del kernel (%1.%2.%3) no corresponde con "
+"la que se utilizó para compilar el módulo (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -184,40 +164,29 @@ msgstr "Módulo del centro de control de TDE para probar joysticks"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Joystick</h1>Este módulo ayuda a comprobar si el joystick está funcionando "
-"correctamente."
-"<br>Si los valores de los ejes no son correctos, puede tratar de corregirlo "
-"mediante la calibración."
-"<br>Este módulo intentar encontrar todos los joysticks disponibles comprobando "
-"/dev/js[0-4] y /dev/input/js[0-4]"
-"<br>Si utiliza otro archivo de dispositivo, introdúzcalo en la casilla."
-"<br>La lista de botones muestra el estado de los botones del joystick, la lista "
-"de ejes muestra los valores actuales de los ejes."
+"<h1>Joystick</h1>Este módulo ayuda a comprobar si el joystick está "
+"funcionando correctamente.<br>Si los valores de los ejes no son correctos, "
+"puede tratar de corregirlo mediante la calibración.<br>Este módulo intentar "
+"encontrar todos los joysticks disponibles comprobando /dev/js[0-4] y /dev/"
+"input/js[0-4]<br>Si utiliza otro archivo de dispositivo, introdúzcalo en la "
+"casilla.<br>La lista de botones muestra el estado de los botones del "
+"joystick, la lista de ejes muestra los valores actuales de los ejes."
 "<br>NOTA: el dispositivo de Linux actual (Kernel 2.4, 2.6) únicamente puede "
-"detectar de forma automática joysticks de"
-"<ul> "
-"<li>2 ejes y 4 botones</li>"
-"<li>3 ejes y 4 botones</li>"
-"<li>4 ejes y 4 botones</li>"
-"<li>Saitek Cyborg digital</li></ul>(Si desea obtener más detalles, puede "
-"consultar el archivo del código fuente de Linux "
-"Documentation/input/joystick.txt)"
+"detectar de forma automática joysticks de<ul> <li>2 ejes y 4 botones</"
+"li><li>3 ejes y 4 botones</li><li>4 ejes y 4 botones</li><li>Saitek Cyborg "
+"digital</li></ul>(Si desea obtener más detalles, puede consultar el archivo "
+"del código fuente de Linux Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -257,15 +226,13 @@ msgstr "Calibrar"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"No se ha detectado ningún dispositivo de joystick en este equipo."
-"<br>Se ha buscado en /dev/js[0-4] y /dev/input/js[0-4]"
-"<br>Si hay un joystick conectado en otro dispositivo, por favor indique el "
-"archivo de dispositivo correcto."
+"No se ha detectado ningún dispositivo de joystick en este equipo.<br>Se ha "
+"buscado en /dev/js[0-4] y /dev/input/js[0-4]<br>Si hay un joystick conectado "
+"en otro dispositivo, por favor indique el archivo de dispositivo correcto."
 
 #: joywidget.cpp:236
 msgid ""
@@ -287,19 +254,13 @@ msgstr "Error del dispositivo"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>La calibración va a comprobar la precisión."
-"<br>"
-"<br><b>Por favor, mueva todos los ejes a su posición central y no vuelva a "
-"tocar el joystick.</b>"
-"<br>"
-"<br>Pulse en Aceptar para iniciar la calibración.</qt>"
+"<qt>La calibración va a comprobar la precisión.<br><br><b>Por favor, mueva "
+"todos los ejes a su posición central y no vuelva a tocar el joystick.</"
+"b><br><br>Pulse en Aceptar para iniciar la calibración.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-et/messages/tdebase/joystick.po b/tde-i18n-et/messages/tdebase/joystick.po
index 3f38bbe3840..1e5c63adb97 100644
--- a/tde-i18n-et/messages/tdebase/joystick.po
+++ b/tde-i18n-et/messages/tdebase/joystick.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-12-01 20:21+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Marek Laane"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -50,51 +50,37 @@ msgstr "(tavaliselt Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibreerimisel kontrollitakse seadme väärtuste vahemikku."
-"<br>"
-"<br>Palun liiguta seadme <b>telg %1 %2</b> <b>minimaalsesse</b> asendisse."
-"<br>"
-"<br>Jätkamiseks vajuta seadme mis tahes nuppu või dialoogi nuppu "
+"<qt>Kalibreerimisel kontrollitakse seadme väärtuste vahemikku.<br><br>Palun "
+"liiguta seadme <b>telg %1 %2</b> <b>minimaalsesse</b> asendisse."
+"<br><br>Jätkamiseks vajuta seadme mis tahes nuppu või dialoogi nuppu "
 "'Järgmine'.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"qt>Kalibreerimisel kontrollitakse seadme väärtuste vahemikku."
-"<br>"
-"<br>Palun liiguta seadme <b>telg %1 %2</b> <b>keskmisse</b> asendisse."
-"<br>"
-"<br>Jätkamiseks vajuta seadme mis tahes nuppu või dialoogi nuppu "
+"qt>Kalibreerimisel kontrollitakse seadme väärtuste vahemikku.<br><br>Palun "
+"liiguta seadme <b>telg %1 %2</b> <b>keskmisse</b> asendisse."
+"<br><br>Jätkamiseks vajuta seadme mis tahes nuppu või dialoogi nuppu "
 "'Järgmine'.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"qt>Kalibreerimisel kontrollitakse seadme väärtuste vahemikku."
-"<br>"
-"<br>Palun liiguta seadme <b>telg %1 %2</b> <b>maksimaalsesse</b> asendisse."
-"<br>"
-"<br>Jätkamiseks vajuta seadme mis tahes nuppu või dialoogi nuppu "
+"qt>Kalibreerimisel kontrollitakse seadme väärtuste vahemikku.<br><br>Palun "
+"liiguta seadme <b>telg %1 %2</b> <b>maksimaalsesse</b> asendisse."
+"<br><br>Jätkamiseks vajuta seadme mis tahes nuppu või dialoogi nuppu "
 "'Järgmine'.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -127,11 +113,11 @@ msgstr "Ei leitud kerneli draiveri versiooni juhtpuldiseadmele %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Praegu töötav kerneli draiveri versioon (%1.%2.%3) ei ole sama, millele antud "
-"moodul on kompileeritud (%4.%5.%6)."
+"Praegu töötav kerneli draiveri versioon (%1.%2.%3) ei ole sama, millele "
+"antud moodul on kompileeritud (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -173,39 +159,29 @@ msgstr "TDE juhtimiskeskuse moodul juhtpuldi testimiseks"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Juhtpult</h1>See moodul aitab kontrollida, kas juhtpult ikka korralikult "
-"töötab."
-"<br>Kui telgedele teatatakse vigased väärtused, võib seda püüda parandada "
-"kalibreerimisega."
-"<br>Moodul püüab tuvastada kõik saadaolevad juhtpuldiseadmed, kontrollides "
-"/dev/js[0-4] ja /dev/input/js[0-4]"
-"<br>Kui sul on mingi muu seadmefail, määra see liitkastis."
-"<br>Nuppude nimekiri näitab sinu juhtpuldi nuppude olekut, telgede nimekiri "
-"kõigi telgede parajasti kehtivat väärtust."
-"<br>MÄRKUS: praegune Linuxi seadmedraiver (kernel 2.4, 2.6) oskab automaatselt "
-"tuvastada ainult "
-"<ul>"
-"<li>2-teljelise 4 nupuga juhtpuldi</li>"
-"<li>3-teljelise 4 nupuga juhtpuldi</li>"
-"<li>4-teljelise 4 nupuga juhtpuldi</li>"
-"<li>Saitek Cyborgi 'digitaalse' juhtpuldi</li></ul>(Täpsemat infot annab Linuxi "
-"lähteteksti kataloogi fail /Documentation/input/joystick.txt)"
+"töötab.<br>Kui telgedele teatatakse vigased väärtused, võib seda püüda "
+"parandada kalibreerimisega.<br>Moodul püüab tuvastada kõik saadaolevad "
+"juhtpuldiseadmed, kontrollides /dev/js[0-4] ja /dev/input/js[0-4]<br>Kui sul "
+"on mingi muu seadmefail, määra see liitkastis.<br>Nuppude nimekiri näitab "
+"sinu juhtpuldi nuppude olekut, telgede nimekiri kõigi telgede parajasti "
+"kehtivat väärtust.<br>MÄRKUS: praegune Linuxi seadmedraiver (kernel 2.4, "
+"2.6) oskab automaatselt tuvastada ainult <ul><li>2-teljelise 4 nupuga "
+"juhtpuldi</li><li>3-teljelise 4 nupuga juhtpuldi</li><li>4-teljelise 4 "
+"nupuga juhtpuldi</li><li>Saitek Cyborgi 'digitaalse' juhtpuldi</li></"
+"ul>(Täpsemat infot annab Linuxi lähteteksti kataloogi fail /Documentation/"
+"input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -245,15 +221,13 @@ msgstr "Kalibreeri"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Arvutis ei leitud automaatselt ühtki juhtpuldiseadet."
-"<br>Kontrolliti asukohti /dev/js[0-4] ja /dev/input/js[0-4]"
-"<br>Kui sa tead, et juhtpult on kindlasti ühendatud, anna palun korrektne "
-"seadmefail."
+"Arvutis ei leitud automaatselt ühtki juhtpuldiseadet.<br>Kontrolliti "
+"asukohti /dev/js[0-4] ja /dev/input/js[0-4]<br>Kui sa tead, et juhtpult on "
+"kindlasti ühendatud, anna palun korrektne seadmefail."
 
 #: joywidget.cpp:236
 msgid ""
@@ -275,19 +249,13 @@ msgstr "Seadme viga"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibreerimisel kontrollitakse täpsust."
-"<br>"
-"<br><b>Palun liiguta kõik teljed keskmisse asendisse ja ära enam juhtpulti "
-"puuduta.</b>"
-"<br>"
-"<br>Klõpsa kalibreerimise alustamiseks nupule OK.</qt>"
+"<qt>Kalibreerimisel kontrollitakse täpsust.<br><br><b>Palun liiguta kõik "
+"teljed keskmisse asendisse ja ära enam juhtpulti puuduta.</b><br><br>Klõpsa "
+"kalibreerimise alustamiseks nupule OK.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-eu/messages/tdebase/joystick.po b/tde-i18n-eu/messages/tdebase/joystick.po
index 3d98f0644aa..5c7ec570426 100644
--- a/tde-i18n-eu/messages/tdebase/joystick.po
+++ b/tde-i18n-eu/messages/tdebase/joystick.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2006-01-12 09:26+0100\n"
 "Last-Translator: marcos <marcos@euskalgnu.org>\n"
 "Language-Team:  <eu@li.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Marcos Goienetxe, Juan Irigoien"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -53,51 +53,37 @@ msgstr "(normalean Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibrazioak gailuak darabiltzan balioen heina aztertuko du."
-"<br> "
+"<qt>Kalibrazioak gailuak darabiltzan balioen heina aztertuko du.<br> "
 "<br>Mugi ezazu gailuaren <b>%1 %2 ardatza</b> posizio <b>txikienera</b>. "
-"<br>"
-"<br> Sakatu gailuaren edozein botoi edo klik egin \"Hurrengoa\" hurrengo "
+"<br><br> Sakatu gailuaren edozein botoi edo klik egin \"Hurrengoa\" hurrengo "
 "urratsarekin jarraitzeko.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibrazioak gailuak darabiltzan balioen heina aztertuko du."
-"<br> "
+"<qt>Kalibrazioak gailuak darabiltzan balioen heina aztertuko du.<br> "
 "<br>Mugi ezazu gailuaren <b>%1 %2 ardatza</b> <b>erdiko</b> posiziora."
-"<br>"
-"<br> Sakatu gailuaren edozein botoi edo klik egin \"Hurrengoa\" hurrengo "
+"<br><br> Sakatu gailuaren edozein botoi edo klik egin \"Hurrengoa\" hurrengo "
 "urratsarekin jarraitzeko.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibrazioak gailuak darabiltzan balioen heina aztertuko du."
-"<br> "
+"<qt>Kalibrazioak gailuak darabiltzan balioen heina aztertuko du.<br> "
 "<br>Mugi ezazu gailuaren <b>%1 %2 ardatza</b> posizio <b>handienera</b>. "
-"<br>"
-"<br> Sakatu gailuaren edozein botoi edo klik egin \"Hurrengoa\" hurrengo "
+"<br><br> Sakatu gailuaren edozein botoi edo klik egin \"Hurrengoa\" hurrengo "
 "urratsarekin jarraitzeko.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -130,11 +116,11 @@ msgstr "Ezin izan da %1 joystick gailuaren kernel driver bertsioa eskuratu: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Uneko kernelaren driver bertsioa (%1.%2.%3) ez dator bat modulua konpilatzeko "
-"erabili zenarekin (%4.%5.%6.)."
+"Uneko kernelaren driver bertsioa (%1.%2.%3) ez dator bat modulua "
+"konpilatzeko erabili zenarekin (%4.%5.%6.)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -176,40 +162,29 @@ msgstr "TDEren kontrol guneko modulua joystick-ak frogatzeko"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Joystick</h1> Modulu honek zure joystick-a ondo dabilen aztertzen lagunduko "
-"dizu. "
-"<br> Ardatzen balioak egokiak ez badira, kalibrazioaren bitartez zuzen "
-"ditzakezu. "
-"<br>Modulu hau erabilgarri dauden joystick guztiak aurkitzen saiatzen da "
-"/dev/js[0-4] eta /dev/inputs/js[0-4] aztertuz "
-"<br>Beste gailu fitxategirik bazeneuka, sar ezazu kutxan "
-"<br>Botoien zerrendak zure joystick-aren botoien egoera erakusten du, ardatzen "
-"zerrendak ardatz guztien uneko balioa erakusten dute. "
-"<br>OHARRA: Uneko Linux gailu driverrak (2.4, 2.6 Kernela) auto detektatu "
-"ditzakeenak: "
-"<ul> "
-"<li>2 ardatz eta 4 botoidun joystick-a</li> "
-"<li>3 ardatz eta 4 botoidun joystick-a</li> "
-"<li>4 ardatz eta 4 botoidun joystick-a</li> "
-"<li>Saitek Cyborg joystick digitalak</li> </ul> (Zehaztasun gehiago ezagutzeko, "
-"begira ezazu Linux iturburu-kodeko /Documentation/input/joystick.txt "
-"fitxategia)"
+"<h1>Joystick</h1> Modulu honek zure joystick-a ondo dabilen aztertzen "
+"lagunduko dizu. <br> Ardatzen balioak egokiak ez badira, kalibrazioaren "
+"bitartez zuzen ditzakezu. <br>Modulu hau erabilgarri dauden joystick guztiak "
+"aurkitzen saiatzen da /dev/js[0-4] eta /dev/inputs/js[0-4] aztertuz "
+"<br>Beste gailu fitxategirik bazeneuka, sar ezazu kutxan <br>Botoien "
+"zerrendak zure joystick-aren botoien egoera erakusten du, ardatzen zerrendak "
+"ardatz guztien uneko balioa erakusten dute. <br>OHARRA: Uneko Linux gailu "
+"driverrak (2.4, 2.6 Kernela) auto detektatu ditzakeenak: <ul> <li>2 ardatz "
+"eta 4 botoidun joystick-a</li> <li>3 ardatz eta 4 botoidun joystick-a</li> "
+"<li>4 ardatz eta 4 botoidun joystick-a</li> <li>Saitek Cyborg joystick "
+"digitalak</li> </ul> (Zehaztasun gehiago ezagutzeko, begira ezazu Linux "
+"iturburu-kodeko /Documentation/input/joystick.txt fitxategia)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -249,14 +224,13 @@ msgstr "Kalibratu"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Ez da joystick dispositiborik automatikoki aurkitu ordenagailu honetan."
-"<br>Bilaketa lekuak /dev/js[0-4] eta /dev/input/js[0-4] izan dira"
-"<br>Baten bat konektaturik balego, sar ezazu dispositibo fitxategi egokia."
+"<br>Bilaketa lekuak /dev/js[0-4] eta /dev/input/js[0-4] izan dira<br>Baten "
+"bat konektaturik balego, sar ezazu dispositibo fitxategi egokia."
 
 #: joywidget.cpp:236
 msgid ""
@@ -278,19 +252,13 @@ msgstr "Gailu errorea"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibrazioak doitasuna kalibratuko du. "
-"<br> "
-"<br><b>Mugi itzazu ardatz guztiak euren erdiko kokapenera eta ez ezazu berriz "
-"ikutu joystick-a.</b> "
-"<br>"
-"<br> Klika ezazu OK kalibrazioa has dadin.</qt>"
+"<qt>Kalibrazioak doitasuna kalibratuko du. <br> <br><b>Mugi itzazu ardatz "
+"guztiak euren erdiko kokapenera eta ez ezazu berriz ikutu joystick-a.</b> "
+"<br><br> Klika ezazu OK kalibrazioa has dadin.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-fa/messages/tdebase/joystick.po b/tde-i18n-fa/messages/tdebase/joystick.po
index e308108fdd9..6c8a5c25d93 100644
--- a/tde-i18n-fa/messages/tdebase/joystick.po
+++ b/tde-i18n-fa/messages/tdebase/joystick.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2007-01-27 11:06+0330\n"
 "Last-Translator: Nazanin Kazemi <kazemi@itland.ir>\n"
 "Language-Team: Persian <kde-i18n-fa@kde.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "نازنین کاظمی"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -52,49 +52,38 @@ msgstr ")معمولاً Y("
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>درجه‌بندی، دربارۀ بررسی گسترۀ مقداری است که دستگاه شما تحویل می‌دهد."
-"<br>"
-"<br>لطفاً <b>محور %1 %2</b> را در دستگاه خود به موقعیت <b>کمینه</b> حرکت دهید."
-"<br>"
-"<br>برای ادامۀ مرحلۀ بعدی، هر دکمۀ روی دستگاه، یا دکمۀ »بعدی« را فشار دهید.</qt>"
+"<br><br>لطفاً <b>محور %1 %2</b> را در دستگاه خود به موقعیت <b>کمینه</b> حرکت "
+"دهید.<br><br>برای ادامۀ مرحلۀ بعدی، هر دکمۀ روی دستگاه، یا دکمۀ »بعدی« را "
+"فشار دهید.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>درجه‌بندی، دربارۀ بررسی گسترۀ مقداری است که دستگاه شما تحویل می‌دهد."
-"<br>"
-"<br>لطفاً <b>محور %1 %2</b> را در دستگاه خود به موقعیت <b>مرکز</b>حرکت دهید."
-"<br>"
-"<br>برای ادامۀ مرحلۀ بعدی، هر دکمۀ روی دستگاه، یا دکمۀ »بعدی« را فشار دهید.</qt>"
+"<br><br>لطفاً <b>محور %1 %2</b> را در دستگاه خود به موقعیت <b>مرکز</b>حرکت "
+"دهید.<br><br>برای ادامۀ مرحلۀ بعدی، هر دکمۀ روی دستگاه، یا دکمۀ »بعدی« را "
+"فشار دهید.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>درجه‌بندی، دربارۀ بررسی گسترۀ مقداری است که دستگاه شما تحویل می‌دهد."
-"<br>"
-"<br>لطفاً <b>محور %1 %2</b> را در دستگاه خود به موقعیت <b>بیشینه</b>حرکت دهید."
-"<br>"
-"<br>برای ادامۀ مرحلۀ بعدی، هر دکمۀ روی دستگاه، یا دکمۀ »بعدی« را فشار دهید.</qt>"
+"<br><br>لطفاً <b>محور %1 %2</b> را در دستگاه خود به موقعیت <b>بیشینه</b>حرکت "
+"دهید.<br><br>برای ادامۀ مرحلۀ بعدی، هر دکمۀ روی دستگاه، یا دکمۀ »بعدی« را "
+"فشار دهید.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -127,8 +116,8 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "نسخۀ گردانندۀ هستۀ در حال اجرای جاری )%1.%2.%3(، یکی از این پیمانه‌های "
 "ترجمه‌شده برای )%4.%5.%6( نیست."
@@ -173,38 +162,28 @@ msgstr "پیمانۀ مرکز کنترل TDE برای آزمایش اهرمها�
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>اهرم کنترل</h1>این پیمانه، در صورتی که اهرم کنترل شما درست کار کند، به "
-"بررسی کمک می‌کند."
-"<br>اگر مقادیر اشتباه را برای محورها تحویل دهد، می‌توانید این مشکل را با "
-"درجه‌بندی حل کنید."
-"<br>این پیمانه‌ها سعی می‌کنند همۀ دستگاههای اهرم کنترل را با بررسی  "
-"/dev/js[0-4] و /dev/input/js[0-4] پیدا کنند."
-"<br>اگر پروندۀ دستگاه دیگری دارید، آن را در جعبه ترکیب وارد کنید."
-"<br>فهرست دکمه‌ها، وضعیت دکمه‌های روی اهرم کنترل شما را نمایش می‌دهد؛ فهرست "
-"محورها، مقدار جاری برای همۀ محورها را نشان می‌دهد."
-"<br>توجه: گردانندۀ دستگاه لینوکس جاری (Kernel 2.4, 2.6) فقط می‌تواند "
-"<ul>"
-"<li>دو محور، ۴ دکمۀ اهرم کنترل </li>"
-"<li>سه محور، ۴ دکمۀ اهرم کنترل</li>"
-"<li>چهار محور، ۴ دکمۀ اهرم کنترل</li>"
-"<li>Saitek Cyborg »قیاسی« اهرمهای کنترل</li></ul> را آشکارسازی خودکار کند )برای "
-"جزئیات source/Documentation/input/joystick.txt لینوکس خود را بررسی کنید.("
+"بررسی کمک می‌کند.<br>اگر مقادیر اشتباه را برای محورها تحویل دهد، می‌توانید این "
+"مشکل را با درجه‌بندی حل کنید.<br>این پیمانه‌ها سعی می‌کنند همۀ دستگاههای اهرم "
+"کنترل را با بررسی  /dev/js[0-4] و /dev/input/js[0-4] پیدا کنند.<br>اگر "
+"پروندۀ دستگاه دیگری دارید، آن را در جعبه ترکیب وارد کنید.<br>فهرست دکمه‌ها، "
+"وضعیت دکمه‌های روی اهرم کنترل شما را نمایش می‌دهد؛ فهرست محورها، مقدار جاری "
+"برای همۀ محورها را نشان می‌دهد.<br>توجه: گردانندۀ دستگاه لینوکس جاری (Kernel "
+"2.4, 2.6) فقط می‌تواند <ul><li>دو محور، ۴ دکمۀ اهرم کنترل </li><li>سه محور، ۴ "
+"دکمۀ اهرم کنترل</li><li>چهار محور، ۴ دکمۀ اهرم کنترل</li><li>Saitek Cyborg "
+"»قیاسی« اهرمهای کنترل</li></ul> را آشکارسازی خودکار کند )برای جزئیات source/"
+"Documentation/input/joystick.txt لینوکس خود را بررسی کنید.("
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -244,14 +223,13 @@ msgstr "درجه‌بندی"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"دستگاه اهرم کنترل به طور خودکار در این رایانه پیدا نشد."
-"<br>بررسیها در /dev/js[0-4] و  /dev/input/js[0-4] انجام‌ شده است"
-"<br>اگر می‌دانید که پیوستی وجود دارد، لطفاً پروندۀ دستگاه صحیح را وارد کنید."
+"دستگاه اهرم کنترل به طور خودکار در این رایانه پیدا نشد.<br>بررسیها در /dev/"
+"js[0-4] و  /dev/input/js[0-4] انجام‌ شده است<br>اگر می‌دانید که پیوستی وجود "
+"دارد، لطفاً پروندۀ دستگاه صحیح را وارد کنید."
 
 #: joywidget.cpp:236
 msgid ""
@@ -273,19 +251,13 @@ msgstr "خطای دستگاه"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>درجه‌بندی، دربارۀ بررسی موقعیت می‌باشد"
-"<br>"
-"<br><b>لطفاً محورها را به موقعیت مرکزیشان حرکت داده، و دیگر به اهرم کنترل دست "
-"نزنید.</b>"
-"<br>"
-"<br>برای آغاز درجه‌بندی، تأیید را فشار دهید.</qt>"
+"<qt>درجه‌بندی، دربارۀ بررسی موقعیت می‌باشد<br><br><b>لطفاً محورها را به موقعیت "
+"مرکزیشان حرکت داده، و دیگر به اهرم کنترل دست نزنید.</b><br><br>برای آغاز "
+"درجه‌بندی، تأیید را فشار دهید.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-fi/messages/tdebase/joystick.po b/tde-i18n-fi/messages/tdebase/joystick.po
index 23e171ad417..fd8a91268ca 100644
--- a/tde-i18n-fi/messages/tdebase/joystick.po
+++ b/tde-i18n-fi/messages/tdebase/joystick.po
@@ -8,24 +8,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-09-02 09:22+0300\n"
 "Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n"
-"Language-Team: finnish <Finnish <kde-i18n-fi-discussion@lists.sourceforge.net>>"
-"\n"
+"Language-Team: finnish <Finnish <kde-i18n-fi-discussion@lists.sourceforge."
+"net>>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Teemu Rytilahti, Tapio Kautto"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -54,51 +54,37 @@ msgstr "(tavallisesti Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibrointi tarkistaa ohjaimen antaman arvoalueen. "
-"<br> "
-"<br>Liikuta laitetta <b>akseli %1 %2</b> laitteella <b>pienimpään</b> kohtaan. "
-"<br>"
-"<br>Paina jotakin ohjaimen painiketta tai napsauta 'Seuraava'-painiketta kun "
-"olet valmis seuraavaan vaiheeseen.</qt>"
+"<qt>Kalibrointi tarkistaa ohjaimen antaman arvoalueen. <br> <br>Liikuta "
+"laitetta <b>akseli %1 %2</b> laitteella <b>pienimpään</b> kohtaan. "
+"<br><br>Paina jotakin ohjaimen painiketta tai napsauta 'Seuraava'-painiketta "
+"kun olet valmis seuraavaan vaiheeseen.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibrointi tarkistaa ohjaimen antaman arvoalueen. "
-"<br> "
-"<br>Liikuta laitetta <b>akselin %1 %2</b> <b>keskikohtaan</b>. "
-"<br>"
-"<br>Paina jotakin ohjaimen näppäintä tai 'Seuraava'-painiketta kun olet valmis "
-"seuraavaan vaiheeseen.</qt>"
+"<qt>Kalibrointi tarkistaa ohjaimen antaman arvoalueen. <br> <br>Liikuta "
+"laitetta <b>akselin %1 %2</b> <b>keskikohtaan</b>. <br><br>Paina jotakin "
+"ohjaimen näppäintä tai 'Seuraava'-painiketta kun olet valmis seuraavaan "
+"vaiheeseen.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibrointi tarkistaa ohjaimen antaman arvoalueen. "
-"<br> "
-"<br>Liikuta laitetta <b>akselin %1 %2</b> <b>suurimpaan</b> kohtaan. "
-"<br>"
-"<br>Paina jotakin ohjaimen näppäintä tai 'Seuraava'-painiketta kun olet valmis "
+"<qt>Kalibrointi tarkistaa ohjaimen antaman arvoalueen. <br> <br>Liikuta "
+"laitetta <b>akselin %1 %2</b> <b>suurimpaan</b> kohtaan. <br><br>Paina "
+"jotakin ohjaimen näppäintä tai 'Seuraava'-painiketta kun olet valmis "
 "seuraavaan vaiheeseen.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -131,11 +117,11 @@ msgstr "Peliohjaimen %1 ajuriversiota ei voitu hakea: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Nykyinen ydin (%1.%2.%3) ei ole sama, jolle tämä moduuli on käännetty "
-"(%4.%5.%6)."
+"Nykyinen ydin (%1.%2.%3) ei ole sama, jolle tämä moduuli on käännetty (%4.%5."
+"%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -176,38 +162,29 @@ msgstr "Ohjauskeskuksen moduuli peliohjaimien kokeilemiseen"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Peliohjain</h1>Tässä moduulissa voit tarkistaa peliohjaimen toiminnan."
-"<br>Voit kalibroida peliohjaimesi tarvittaessa."
-"<br>Moduuli etsii käytettävissä olevia peliohjaimia tarkistamalla "
-"laitteet/dev/js[0-4] ja /dev/input/js[0-4]"
-"<br>Jos laitetiedostosi on jokin muu, voit kirjoittaa sen yhdistelmäruutuun."
-"<br>Painikkeiden luettelossa näkyy painikkeiden tila, ja Akselit -luettelossa "
-"näkyy peliohjaimen akseleiden nykyiset arvot."
-"<br>HUOM: nykyinen Linuxin ydinajuri (ydin 2.4, 2.6) voi tunnistaa "
-"automaattisesti vain seuraavat peliohjaimet:"
-"<ul>"
-"<li>2-akselinen, 4:n painikkeen joystick</li>"
-"<li>3-akselinen, 4:n painikkeen joystick</li>"
-"<li>4-akselinen, 4:n painikkeen joystick</li>"
-"<li>Saitek Cyborg digitaaliset peliohjaimet</li></ul>"
-"(Näet lisätietoja Linuxin ytimen lähdekoodien tiedostosta "
-"Documentation/input/joystick.txt)"
+"<br>Voit kalibroida peliohjaimesi tarvittaessa.<br>Moduuli etsii "
+"käytettävissä olevia peliohjaimia tarkistamalla laitteet/dev/js[0-4] ja /dev/"
+"input/js[0-4]<br>Jos laitetiedostosi on jokin muu, voit kirjoittaa sen "
+"yhdistelmäruutuun.<br>Painikkeiden luettelossa näkyy painikkeiden tila, ja "
+"Akselit -luettelossa näkyy peliohjaimen akseleiden nykyiset arvot.<br>HUOM: "
+"nykyinen Linuxin ydinajuri (ydin 2.4, 2.6) voi tunnistaa automaattisesti "
+"vain seuraavat peliohjaimet:<ul><li>2-akselinen, 4:n painikkeen joystick</"
+"li><li>3-akselinen, 4:n painikkeen joystick</li><li>4-akselinen, 4:n "
+"painikkeen joystick</li><li>Saitek Cyborg digitaaliset peliohjaimet</li></"
+"ul>(Näet lisätietoja Linuxin ytimen lähdekoodien tiedostosta Documentation/"
+"input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -247,14 +224,14 @@ msgstr "Kalibroi"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Tietokoneesta ei löytynyt peliohjainta.\n"
-"<br>Ohjainta etsittiin laitteista \"/dev/js[0-4]\" ja \"/dev/input/js[0-4]\". "
-"<br>Jos olet varma, että koneessa on peliohjain, syötä oikea laite(tiedosto)."
+"<br>Ohjainta etsittiin laitteista \"/dev/js[0-4]\" ja \"/dev/input/"
+"js[0-4]\". <br>Jos olet varma, että koneessa on peliohjain, syötä oikea "
+"laite(tiedosto)."
 
 #: joywidget.cpp:236
 msgid ""
@@ -276,18 +253,13 @@ msgstr "Laitevirhe"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibrointi tarkistaa kohdistusta. "
-"<br> "
-"<br><b>Siirrä ohjain kaikilla akseleilla keskelle, äläkä koske laitteeseen.</b> "
-"<br>"
-"<br>Napsauta OK, niin kalibrointi aloitetaan.</qt>"
+"<qt>Kalibrointi tarkistaa kohdistusta. <br> <br><b>Siirrä ohjain kaikilla "
+"akseleilla keskelle, äläkä koske laitteeseen.</b> <br><br>Napsauta OK, niin "
+"kalibrointi aloitetaan.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-fr/messages/tdebase/joystick.po b/tde-i18n-fr/messages/tdebase/joystick.po
index 3403a1e3b3d..989d26e5ab2 100644
--- a/tde-i18n-fr/messages/tdebase/joystick.po
+++ b/tde-i18n-fr/messages/tdebase/joystick.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2008-08-04 21:50+0200\n"
 "Last-Translator: Pierre Buard <pierre.buard@gmail.com>\n"
 "Language-Team: Français <kde-francophone@kde.org>\n"
@@ -22,13 +22,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Matthieu Robin"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -57,55 +57,41 @@ msgstr "(toujours Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Le calibrage va vérifier la plage de valeurs que votre matériel produit. "
-"<br>"
-"<br>Veuillez déplacer <b>l'axe %1 %2</b> de votre périphérique à la position <b>"
-"minimale</b>."
-"<br>"
-"<br>Actionnez n'importe quel bouton du périphérique ou appuyez sur le bouton "
-"« Suivant » pour la prochaine étape.</qt>"
+"<br><br>Veuillez déplacer <b>l'axe %1 %2</b> de votre périphérique à la "
+"position <b>minimale</b>.<br><br>Actionnez n'importe quel bouton du "
+"périphérique ou appuyez sur le bouton « Suivant » pour la prochaine étape.</"
+"qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Le calibrage va vérifier la plage de valeurs que votre matériel produit. "
-"<br>"
-"<br>Veuillez déplacer <b>l'axe %1 %2</b> de votre périphérique à la position <b>"
-"centrale</b>."
-"<br>"
-"<br>Actionnez n'importe quel bouton du périphérique ou appuyez sur le bouton "
-"« Suivant » pour la prochaine étape.</qt>"
+"<br><br>Veuillez déplacer <b>l'axe %1 %2</b> de votre périphérique à la "
+"position <b>centrale</b>.<br><br>Actionnez n'importe quel bouton du "
+"périphérique ou appuyez sur le bouton « Suivant » pour la prochaine étape.</"
+"qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Le calibrage va vérifier la plage de valeurs que votre matériel produit. "
-"<br>"
-"<br>Veuillez déplacer <b>l'axe %1 %2</b> de votre périphérique à la position <b>"
-"maximale</b>. "
-"<br>"
-"<br>Actionnez n'importe quel bouton du périphérique ou appuyez sur le bouton "
-"« Suivant » pour la prochaine étape.</qt>"
+"<br><br>Veuillez déplacer <b>l'axe %1 %2</b> de votre périphérique à la "
+"position <b>maximale</b>. <br><br>Actionnez n'importe quel bouton du "
+"périphérique ou appuyez sur le bouton « Suivant » pour la prochaine étape.</"
+"qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -139,11 +125,11 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"La version actuelle du pilote noyau (%1.%2.%3) n'est pas celle pour laquelle ce "
-"module a été compilé (%4.%5.%6)."
+"La version actuelle du pilote noyau (%1.%2.%3) n'est pas celle pour laquelle "
+"ce module a été compilé (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -161,14 +147,14 @@ msgstr ""
 #: joydevice.cpp:105
 msgid "Could not restore calibration values for joystick device %1: %2"
 msgstr ""
-"Impossible de restaurer les valeurs de calibrage pour le périphérique « %1 » : "
-"%2."
+"Impossible de restaurer les valeurs de calibrage pour le périphérique "
+"« %1 » : %2."
 
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"Impossible d'initialiser les valeurs de calibrage pour le périphérique « %1 » : "
-"%2."
+"Impossible d'initialiser les valeurs de calibrage pour le périphérique "
+"« %1 » : %2."
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
@@ -190,38 +176,30 @@ msgstr "Module du Centre de configuration de TDE de test des joysticks"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Joystick</h1> Ce module vous aide à vérifier si votre joystick fonctionne "
-"correctement. "
-"<br>S'il délivre de mauvaises valeurs pour les axes, vous pouvez essayer de "
-"régler ceci avec le calibrage. "
-"<br>Ce module essaye de trouver tous les périphériques joysticks disponibles en "
-"analysant /dev/js[0-4] et /dev/input/js[0-4] "
-"<br>Si vous avez un autre fichier de périphérique, saisissez-le dans la liste."
-"<br>La liste des boutons affiche l'état des boutons sur votre joystick, la "
-"liste des axes affiche la valeur courante pour tous les axes. "
-"<br>REMARQUE : le noyau Linux courant (2.4, 2.6) ne peut détecter que "
-"<ul>"
-"<li>les joysticks à 2 axes et 4 boutons</li>"
-"<li>les joysticks à 3 axes et 4 boutons</li>"
-"<li>les joysticks à 4 axes et 4 boutons</li>"
-"<li>les joysticks Saitek Cyborg Digital</li></ul> (pour les détails, vous "
-"pouvez lire votre Linux source/Documentation/input/joystick.txt)"
+"<h1>Joystick</h1> Ce module vous aide à vérifier si votre joystick "
+"fonctionne correctement. <br>S'il délivre de mauvaises valeurs pour les "
+"axes, vous pouvez essayer de régler ceci avec le calibrage. <br>Ce module "
+"essaye de trouver tous les périphériques joysticks disponibles en analysant /"
+"dev/js[0-4] et /dev/input/js[0-4] <br>Si vous avez un autre fichier de "
+"périphérique, saisissez-le dans la liste.<br>La liste des boutons affiche "
+"l'état des boutons sur votre joystick, la liste des axes affiche la valeur "
+"courante pour tous les axes. <br>REMARQUE : le noyau Linux courant (2.4, "
+"2.6) ne peut détecter que <ul><li>les joysticks à 2 axes et 4 boutons</"
+"li><li>les joysticks à 3 axes et 4 boutons</li><li>les joysticks à 4 axes et "
+"4 boutons</li><li>les joysticks Saitek Cyborg Digital</li></ul> (pour les "
+"détails, vous pouvez lire votre Linux source/Documentation/input/joystick."
+"txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -261,14 +239,13 @@ msgstr "Calibrer"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Aucun joystick n'a pu être détecté automatiquement sur cet ordinateur."
-"<br>La recherche a été faite dans « /dev/js[0-4] » et « /dev/input/js[0-4] »."
-"<br>Si vous êtes sûr(e) qu'un joystick est branché, veuillez fournir le nom du "
+"Aucun joystick n'a pu être détecté automatiquement sur cet ordinateur.<br>La "
+"recherche a été faite dans « /dev/js[0-4] » et « /dev/input/js[0-4] ».<br>Si "
+"vous êtes sûr(e) qu'un joystick est branché, veuillez fournir le nom du "
 "périphérique."
 
 #: joywidget.cpp:236
@@ -277,8 +254,8 @@ msgid ""
 "Please select a device from the list or\n"
 "enter a device file, like /dev/js0."
 msgstr ""
-"Le nom de périphérique indiqué n'est pas valable (il ne contient pas "
-"« /dev »).\n"
+"Le nom de périphérique indiqué n'est pas valable (il ne contient pas « /"
+"dev »).\n"
 "Veuillez sélectionner un périphérique dans la liste ou en saisir un, par "
 "exemple « /dev/js0 »."
 
@@ -292,19 +269,13 @@ msgstr "Erreur de périphérique"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>La précision va maintenant être mesurée."
-"<br>"
-"<br><b>Veuillez mettre tous les axes en position centrale et ne plus toucher au "
-"joystick.</b>"
-"<br>"
-"<br>Cliquez sur Ok pour démarrer le calibrage.</qt>"
+"<qt>La précision va maintenant être mesurée.<br><br><b>Veuillez mettre tous "
+"les axes en position centrale et ne plus toucher au joystick.</"
+"b><br><br>Cliquez sur Ok pour démarrer le calibrage.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-fy/messages/tdebase/joystick.po b/tde-i18n-fy/messages/tdebase/joystick.po
index ebf02ac81b4..46ca3c155b3 100644
--- a/tde-i18n-fy/messages/tdebase/joystick.po
+++ b/tde-i18n-fy/messages/tdebase/joystick.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-11-21 09:00+0100\n"
 "Last-Translator: Berend Ytsma <berendy@bigfoot.com>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Johannes Peeringa, Berend Ytsma"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -53,52 +53,38 @@ msgstr "(meastal Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibraasje giet it weardeberik fan jo joystick fêststelle."
-"<br>"
-"<br>Beweech <b>as %1 %2</b> op jo joystick nei de <b>minimale</b> posysje."
-"<br>"
-"<br>Druk dan samar op in knop fan de joystick of op de knop 'Fierder' om nei de "
-"neikommende stap te gean.</qt>"
+"<br><br>Beweech <b>as %1 %2</b> op jo joystick nei de <b>minimale</b> "
+"posysje.<br><br>Druk dan samar op in knop fan de joystick of op de knop "
+"'Fierder' om nei de neikommende stap te gean.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibraasje giet it weardeberik fan jo joystick fêststelle."
-"<br>"
-"<br>Beweech <b>as %1 %2</b> op jo joystick nei de <b>midden</b>posysje."
-"<br>"
-"<br>Druk dan samar op in knop fan de joystick of op de knop 'Fierder' om nei de "
-"neikommende stap te gean.</qt>"
+"<br><br>Beweech <b>as %1 %2</b> op jo joystick nei de <b>midden</b>posysje."
+"<br><br>Druk dan samar op in knop fan de joystick of op de knop 'Fierder' om "
+"nei de neikommende stap te gean.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibraasje giet it weardeberik fan jo joystick fêststelle."
-"<br>"
-"<br>Beweech <b>as %1 %2</b> op jo joystick nei de <b>maksimale</b> posysje."
-"<br>"
-"<br>Druk dan samar op in knop fan de joystick of op de knop 'Fierder' om nei de "
-"neikommende stap te gean.</qt>"
+"<br><br>Beweech <b>as %1 %2</b> op jo joystick nei de <b>maksimale</b> "
+"posysje.<br><br>Druk dan samar op in knop fan de joystick of op de knop "
+"'Fierder' om nei de neikommende stap te gean.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -130,11 +116,11 @@ msgstr "Kin kernelstjoerprogramma foar joystick %1 net fine: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"De no brûkte kernelsjoerprogrammaferzje (%1.%2.%3) is net gelyk oan de ferzje "
-"wêr't dizze module foar kompileard is (%4.%5.%6)."
+"De no brûkte kernelsjoerprogrammaferzje (%1.%2.%3) is net gelyk oan de "
+"ferzje wêr't dizze module foar kompileard is (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -175,39 +161,28 @@ msgstr "TDE Konfiguraasjesintrummodule om joysticks te testen"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Joystick</h1>Dizze module helpt te kontrolearjen oft jo joystick it goed "
-"docht."
-"<br>Wannear't it ferkearde wearden werom jout foar de ûnderskate assen, kinne "
-"jo dit middels kalibraasje oplosse."
-"<br>Dizze module besiket alle joysticks te finen troch de apparaten "
-"/dev/js[0-4] en /dev/input/js[0-4] te kontrolearjen."
-"<br>Wannear't in oar apparaat brûkt wurdt, kinne jo dat ynfolje yn it "
-"ynfolfjild."
-"<br>De list mei knoppen lit de  status sjen fan de knoppen fan de joystick. De "
-"list mei assen lit de no brûkte wearden sjen fan alle assen."
-"<br>Tink derom: de no brûkte Linux stjoerprogramma's (kernel 2.4, 2.6) werkenne "
-"allinnich de folgjende joysticks automatysk:"
-"<ul>"
-"<li>2 assen, 4 knoppen</li>"
-"<li>3 assen, 4 knoppen</li>"
-"<li>4 assen, 4 knoppen</li>"
-"<li>Saitek Cyborg digital</li></ul>Foar mear ynformaasje kunne jo de "
+"docht.<br>Wannear't it ferkearde wearden werom jout foar de ûnderskate "
+"assen, kinne jo dit middels kalibraasje oplosse.<br>Dizze module besiket "
+"alle joysticks te finen troch de apparaten /dev/js[0-4] en /dev/input/"
+"js[0-4] te kontrolearjen.<br>Wannear't in oar apparaat brûkt wurdt, kinne jo "
+"dat ynfolje yn it ynfolfjild.<br>De list mei knoppen lit de  status sjen fan "
+"de knoppen fan de joystick. De list mei assen lit de no brûkte wearden sjen "
+"fan alle assen.<br>Tink derom: de no brûkte Linux stjoerprogramma's (kernel "
+"2.4, 2.6) werkenne allinnich de folgjende joysticks automatysk:<ul><li>2 "
+"assen, 4 knoppen</li><li>3 assen, 4 knoppen</li><li>4 assen, 4 knoppen</"
+"li><li>Saitek Cyborg digital</li></ul>Foar mear ynformaasje kunne jo de "
 "dokumentaasje yn in submap fan jo Linux-boarnkoade rieplachtsje "
 "(Documentation/input/joystick.txt)"
 
@@ -249,15 +224,13 @@ msgstr "Kalibrearje"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Der is gjin joystick op jo kompjûter fûn."
-"<br>It ûndekken is bard op /dev/js[0-4] en /dev/input/js[0-4]"
-"<br>As jo wis binne dat de joystick oansluten sit kinne jo it juste apparaat "
-"ynfiere."
+"Der is gjin joystick op jo kompjûter fûn.<br>It ûndekken is bard op /dev/"
+"js[0-4] en /dev/input/js[0-4]<br>As jo wis binne dat de joystick oansluten "
+"sit kinne jo it juste apparaat ynfiere."
 
 #: joywidget.cpp:236
 msgid ""
@@ -279,19 +252,13 @@ msgstr "Apparaatflater"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibraasje sil de krektens kontrolearje."
-"<br>"
-"<br><b>Fersko alle assen nei de midden posysje en lit de joystick dêrnei "
-"hielendal los</b>"
-"<br>"
-"<br>Klik op OK om de kalibraasje te starten.</qt>"
+"<qt>Kalibraasje sil de krektens kontrolearje.<br><br><b>Fersko alle assen "
+"nei de midden posysje en lit de joystick dêrnei hielendal los</"
+"b><br><br>Klik op OK om de kalibraasje te starten.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-ga/messages/tdebase/joystick.po b/tde-i18n-ga/messages/tdebase/joystick.po
index 30875d3f809..8ee7a8b2e33 100644
--- a/tde-i18n-ga/messages/tdebase/joystick.po
+++ b/tde-i18n-ga/messages/tdebase/joystick.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdebase/joystick.po\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -10,13 +10,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Séamus Ó Ciardhuáin,Kevin Scannell"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -45,33 +45,25 @@ msgstr "(Y go hiondúil)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -104,8 +96,8 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 
 #: joydevice.cpp:87
@@ -147,21 +139,16 @@ msgstr ""
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 
 #: joywidget.cpp:43
@@ -202,10 +189,9 @@ msgstr "Calabraigh"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 
 #: joywidget.cpp:236
@@ -228,12 +214,9 @@ msgstr "Earráid Ghléis"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 
 #: joywidget.cpp:372
diff --git a/tde-i18n-gl/messages/tdebase/joystick.po b/tde-i18n-gl/messages/tdebase/joystick.po
index 5acea841d23..9c0ea58d58a 100644
--- a/tde-i18n-gl/messages/tdebase/joystick.po
+++ b/tde-i18n-gl/messages/tdebase/joystick.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2006-05-23 20:13+0200\n"
 "Last-Translator: Xabi G. Feal <xabigf@gmx.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Gonzalo H. Castilla"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,55 +51,38 @@ msgstr "(normalmente Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>A calibración baséasese en determinar o rango de valores no que opera o "
-"dispositivo."
-"<br>"
-"<br>Move o <b>eixo %1 %2</b> no dispositivo á súa posición <b>mínima</b>. "
-"<br>"
-"<br>Prema calquer botón do dispositivo ou prema no botón 'Seguinte' para "
-"continuar co seguinte paso.</qt>"
+"dispositivo.<br><br>Move o <b>eixo %1 %2</b> no dispositivo á súa posición "
+"<b>mínima</b>. <br><br>Prema calquer botón do dispositivo ou prema no botón "
+"'Seguinte' para continuar co seguinte paso.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>A calibración consiste en determinar o rango de valores no que traballa o "
-"dispositivo."
-"<br>"
-"<br>Mova o <b>eixo %1 %2</b> do seu dispositivo a súa posición <b>central</b>."
-"<br>"
-"<br>Prema calquera botón do dispositivo ou prema 'Vindeiro' para continuar co "
-"seguinte paso.</qt>"
+"<qt>A calibración consiste en determinar o rango de valores no que traballa "
+"o dispositivo.<br><br>Mova o <b>eixo %1 %2</b> do seu dispositivo a súa "
+"posición <b>central</b>.<br><br>Prema calquera botón do dispositivo ou prema "
+"'Vindeiro' para continuar co seguinte paso.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>A calibración consiste en determinar o rango de valores no que traballa o "
-"dispositivo."
-"<br>"
-"<br>Mova o <b>eixo %1 %2</b> do seu dispositivo á súa posición <b>máxima</b>."
-"<br>"
-"<br>Prema en calquera botón do dispositivo ou prema en 'Vindeiro' para "
-"continuar co seguinte paso.</qt>"
+"<qt>A calibración consiste en determinar o rango de valores no que traballa "
+"o dispositivo.<br><br>Mova o <b>eixo %1 %2</b> do seu dispositivo á súa "
+"posición <b>máxima</b>.<br><br>Prema en calquera botón do dispositivo ou "
+"prema en 'Vindeiro' para continuar co seguinte paso.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -131,8 +114,8 @@ msgstr "Non se pode obter a versión do controlador do «joystick» %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "A versión actual do controlador do kernel (%1.%2.%3) non é a que se empregou "
 "para compilar o módulo (%4.%5.%6)."
@@ -176,39 +159,28 @@ msgstr "Módulo do Centro de Control de TDE para probar «joysticks»"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Joystick</h1>Este módulo axuda a comprobar se o «joystick» está funcionando "
-"correctamente."
-"<br>Se os valores dos eixos no son correctos, pode intentar correxilo coa "
-"calibración. "
-"<br>Este módulo intentar atopar todos os «joysticks» dispoñibles comprobando "
-"/dev/js[0-4] e /dev/input/js[0-4]"
-"<br>Se emprega outros ficheiros de dispositivo, escribao na caixa."
-"<br>A lista de botóns amosa o estado dos botóns do «joystick», a lista de eixos "
-"amosa os valores actuais dos eixos."
-"<br>Nota: o controlador de Linux actual (Kernel 2.4 e 2.6) únicamente pode "
-"detectar automaticamente «joysticks» de "
-"<ul>"
-"<li>2 eixos e 4 botóns</li>"
-"<li>3 eixos e 4 botóns</li>"
-"<li>4 eixos e 4 botóns</li>"
-"<li>«joysticks» dixitais Saitek Cyborg </li></ul>(Para máis detalles, pode "
-"consultar Linux source/Documentation/input/joystick.txt)"
+"<h1>Joystick</h1>Este módulo axuda a comprobar se o «joystick» está "
+"funcionando correctamente.<br>Se os valores dos eixos no son correctos, pode "
+"intentar correxilo coa calibración. <br>Este módulo intentar atopar todos os "
+"«joysticks» dispoñibles comprobando /dev/js[0-4] e /dev/input/js[0-4]<br>Se "
+"emprega outros ficheiros de dispositivo, escribao na caixa.<br>A lista de "
+"botóns amosa o estado dos botóns do «joystick», a lista de eixos amosa os "
+"valores actuais dos eixos.<br>Nota: o controlador de Linux actual (Kernel "
+"2.4 e 2.6) únicamente pode detectar automaticamente «joysticks» de <ul><li>2 "
+"eixos e 4 botóns</li><li>3 eixos e 4 botóns</li><li>4 eixos e 4 botóns</"
+"li><li>«joysticks» dixitais Saitek Cyborg </li></ul>(Para máis detalles, "
+"pode consultar Linux source/Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -248,15 +220,13 @@ msgstr "Calibrar"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Non se atopu automaticamente ningún «joystick» neste ordenador."
-"<br>As comprobacións fixéronse en /dev/js[0-4] e /dev/input/js[0-4]"
-"<br>Se sabe que hai un conectado, por favor introduza o ficheiro de dispositivo "
-"axeitado."
+"Non se atopu automaticamente ningún «joystick» neste ordenador.<br>As "
+"comprobacións fixéronse en /dev/js[0-4] e /dev/input/js[0-4]<br>Se sabe que "
+"hai un conectado, por favor introduza o ficheiro de dispositivo axeitado."
 
 #: joywidget.cpp:236
 msgid ""
@@ -278,19 +248,13 @@ msgstr "Erro na unidade"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>A calibración vai comprobar a precisión."
-"<br>"
-"<br><b>Move todos os eixos a súa posición central e non volva a tocar o "
-"«joystick».</b>"
-"<br>"
-"<br>Prema en Aceptar para iniciar a calibración.</qt>"
+"<qt>A calibración vai comprobar a precisión.<br><br><b>Move todos os eixos a "
+"súa posición central e non volva a tocar o «joystick».</b><br><br>Prema en "
+"Aceptar para iniciar a calibración.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-he/messages/tdebase/joystick.po b/tde-i18n-he/messages/tdebase/joystick.po
index 9b32192ce33..077d5846687 100644
--- a/tde-i18n-he/messages/tdebase/joystick.po
+++ b/tde-i18n-he/messages/tdebase/joystick.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2006-08-01 21:05+0300\n"
 "Last-Translator: Diego Iastrubni <elcuco@kde.org>\n"
 "Language-Team: Hebrew <kde-il@yahoogroups.com>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "צוות התרגום של TDE ישראל Israel Berger"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,49 +51,35 @@ msgstr "(בד\"כ Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt> תהליך הכיול עומד לבדוק את טווח הערכיםשהמכשיר שלך שולח. "
-"<br> "
-"<br> הזז את <b>ציר %1 %2</b> במכשירך למיקום <b>המינימלי.</b> "
-"<br> "
-"<br> הקש על מקש כלשהו במכשירך והקש על \"הבא\" כדי להמשיך לשלב הבא.</qt>"
+"<qt> תהליך הכיול עומד לבדוק את טווח הערכיםשהמכשיר שלך שולח. <br> <br> הזז את "
+"<b>ציר %1 %2</b> במכשירך למיקום <b>המינימלי.</b> <br> <br> הקש על מקש כלשהו "
+"במכשירך והקש על \"הבא\" כדי להמשיך לשלב הבא.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt> תהליך הכיול עומד לבדוק את טווח הערכיםשהמכשיר שלך שולח. "
-"<br> "
-"<br> הזז את <b>ציר %1 %2</b> במכשירך  <b>למרכז.</b> "
-"<br> "
-"<br> הקש על מקש כלשהו במכשירך והקש על \"הבא\" כדי להמשיך לשלב הבא.</qt>"
+"<qt> תהליך הכיול עומד לבדוק את טווח הערכיםשהמכשיר שלך שולח. <br> <br> הזז את "
+"<b>ציר %1 %2</b> במכשירך  <b>למרכז.</b> <br> <br> הקש על מקש כלשהו במכשירך "
+"והקש על \"הבא\" כדי להמשיך לשלב הבא.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt> תהליך הכיול עומד לבדוק את טווח הערכיםשהמכשיר שלך שולח. "
-"<br> "
-"<br> הזז את <b>ציר %1 %2</b> במכשירך למיקום <b>המקסימלי.</b> "
-"<br> "
-"<br> הקש על מקש כלשהו במכשירך והקש על \"הבא\" כדי להמשיך לשלב הבא.</qt>"
+"<qt> תהליך הכיול עומד לבדוק את טווח הערכיםשהמכשיר שלך שולח. <br> <br> הזז את "
+"<b>ציר %1 %2</b> במכשירך למיקום <b>המקסימלי.</b> <br> <br> הקש על מקש כלשהו "
+"במכשירך והקש על \"הבא\" כדי להמשיך לשלב הבא.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -125,11 +111,11 @@ msgstr "לא יכול להגיש את ההתקן של הליבה עבוד התק
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"גירסת דרייבר הקרנל הנוכחית (%1.%2.%3) הוא לא זה שעבורו מודול זה הודר "
-"(%4.%5.%6)."
+"גירסת דרייבר הקרנל הנוכחית (%1.%2.%3) הוא לא זה שעבורו מודול זה הודר (%4.%5."
+"%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -170,36 +156,27 @@ msgstr "מודול מרכז הבקרה של TDE לבדיקת ג'ויסטיקים
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>ג'ויסטיק</h1> מודול זה עוזר לבדוק אם הג'ויסטיק שלך עובד כראוי. "
-"<br>אם הוא מחזיר ערכים לא נכונים עבור הצירים באפשרותך לפתור זאת באמצעות הכיול. "
-"<br>מודול זה מנסה למצא את כל הג'ויסטיקים הזמינים באמצעות בדיקת /dev/js[0-4] and "
-"/dev/input/js[0-4] "
-"<br> אם יש לך קובץ נוסף, הכנס אותו בתיבת הבחירה. "
+"<h1>ג'ויסטיק</h1> מודול זה עוזר לבדוק אם הג'ויסטיק שלך עובד כראוי. <br>אם "
+"הוא מחזיר ערכים לא נכונים עבור הצירים באפשרותך לפתור זאת באמצעות הכיול. "
+"<br>מודול זה מנסה למצא את כל הג'ויסטיקים הזמינים באמצעות בדיקת /dev/js[0-4] "
+"and /dev/input/js[0-4] <br> אם יש לך קובץ נוסף, הכנס אותו בתיבת הבחירה. "
 "<br>רשימת הכפתורים מראה את מצב הכפתורים בג'ויסטיק שלך. רשימת הצירים מראה את "
-"הערך הנוכחי של כל הצירים. "
-"<br>הערה: מנהל ההתקנים הנוכחי של לינוקס (קרנל 2.4 ו2.6) יכול לזהות אוטומטית רק "
-"<ul> "
-"<li>ג'ויסטיק בעל 4 כפתורים ו2 צירים</li> "
-"<li>ג'ויסטיק בעל 4 כפתורים ו3 צירים</li> "
-"<li>ג'ויסטיק בעל 4 כפתורים ו4 צירים</li> "
-"<li>Saitek Cyborg 'digital' joysticks</li></ul> (לפרטים נוספים בדוק "
-"בsource/Documentation/input/joystick.txt)"
+"הערך הנוכחי של כל הצירים. <br>הערה: מנהל ההתקנים הנוכחי של לינוקס (קרנל 2.4 "
+"ו2.6) יכול לזהות אוטומטית רק <ul> <li>ג'ויסטיק בעל 4 כפתורים ו2 צירים</li> "
+"<li>ג'ויסטיק בעל 4 כפתורים ו3 צירים</li> <li>ג'ויסטיק בעל 4 כפתורים ו4 "
+"צירים</li> <li>Saitek Cyborg 'digital' joysticks</li></ul> (לפרטים נוספים "
+"בדוק בsource/Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -239,10 +216,9 @@ msgstr "כייל"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "לא נמצא אף ג'ויסטיק באופן אוטומטי במחשב זה.\n"
 "בדיקות נעשו ב/dev/js[0-4] וב/dev/input/js[0-4]\n"
@@ -268,18 +244,12 @@ msgstr "שגיאת התקן"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>תהליך הכיול עומד לבדוק את הדיוק. "
-"<br> "
-"<br><b>הזז את כל הצירים למרכז ואל תיגע בג'ויסטיק יותר.</b> "
-"<br> "
-"<br>לחץ אישור כדי להתחיל בכיול.</qt>"
+"<qt>תהליך הכיול עומד לבדוק את הדיוק. <br> <br><b>הזז את כל הצירים למרכז ואל "
+"תיגע בג'ויסטיק יותר.</b> <br> <br>לחץ אישור כדי להתחיל בכיול.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-hi/messages/tdebase/joystick.po b/tde-i18n-hi/messages/tdebase/joystick.po
index 6137527e998..255c850999d 100644
--- a/tde-i18n-hi/messages/tdebase/joystick.po
+++ b/tde-i18n-hi/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2004-12-30 18:48+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@gmail.com>\n"
 "Language-Team: indlinux-hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "रविशंकर श्रीवास्तव "
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -48,33 +48,25 @@ msgstr ""
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -103,16 +95,15 @@ msgstr "दिया गया उपकरण %1 जॉयस्टिक न�
 
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
-msgstr ""
-"जॉयस्टिक उपकरण %1: के लिए कर्नेल ड्राइवर संस्करण प्राप्त नहीं कर सका %2"
+msgstr "जॉयस्टिक उपकरण %1: के लिए कर्नेल ड्राइवर संस्करण प्राप्त नहीं कर सका %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"मौजूदा चल रहा कर्नेल ड्राइवर संस्करण है (%1.%2.%3) जो वह नहीं है जो कि  "
-"(%4.%5.%6) के लिए कम्पाइल्ड है."
+"मौजूदा चल रहा कर्नेल ड्राइवर संस्करण है (%1.%2.%3) जो वह नहीं है जो कि  (%4.%5.%6) के "
+"लिए कम्पाइल्ड है."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -128,8 +119,7 @@ msgstr "जॉयस्टिक उपकरण %1 के लिए कैल�
 
 #: joydevice.cpp:105
 msgid "Could not restore calibration values for joystick device %1: %2"
-msgstr ""
-"जॉयस्टिक उपकरण %1 के लिए कैलिब्रेशम मान पुनर्स्थापित नहीं किया जा सका: %2"
+msgstr "जॉयस्टिक उपकरण %1 के लिए कैलिब्रेशम मान पुनर्स्थापित नहीं किया जा सका: %2"
 
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
@@ -154,21 +144,16 @@ msgstr "जॉयस्टिक को जाँचने का एक के�
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 
 #: joywidget.cpp:43
@@ -209,10 +194,9 @@ msgstr "कैलिब्रेट"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 
 #: joywidget.cpp:236
@@ -235,12 +219,9 @@ msgstr "उपकरण त्रुटि"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 
 #: joywidget.cpp:372
diff --git a/tde-i18n-hr/messages/tdebase/joystick.po b/tde-i18n-hr/messages/tdebase/joystick.po
index 099d6820743..6847e182b6c 100644
--- a/tde-i18n-hr/messages/tdebase/joystick.po
+++ b/tde-i18n-hr/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick.po\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2006-04-22 05:17+0100\n"
 "Last-Translator: Renato Pavicic <renato<-at->translator-shop.org>\n"
 "Language-Team: Renato Pavicic <www.translator-shop.org>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Renato Pavičić"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -48,52 +48,38 @@ msgstr "(obično Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracija će provjeriti opsege vrijednosti koje vaš uređaj pruža."
-"<br>"
-"<br>Pomaknite <b>os %1 %2</b> na vašem uređaju do položaja <b>minimum</b>."
-"<br>"
-"<br>Pritisnite bilo koju tipku na uređaju i kliknite gumb 'Sljedeće' da biste "
-"nastavili.</qt>"
+"<br><br>Pomaknite <b>os %1 %2</b> na vašem uređaju do položaja <b>minimum</"
+"b>.<br><br>Pritisnite bilo koju tipku na uređaju i kliknite gumb 'Sljedeće' "
+"da biste nastavili.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracija će provjeriti opsege vrijednosti koje vaš uređaj pruža."
-"<br>"
-"<br>Pomaknite <b>os %1 %2</b> na vašem uređaju do položaja <b>sredina</b>."
-"<br>"
-"<br>Pritisnite bilo koju tipku na uređaju i kliknite gumb 'Sljedeće' da biste "
-"nastavili.</qt>"
+"<br><br>Pomaknite <b>os %1 %2</b> na vašem uređaju do položaja <b>sredina</"
+"b>.<br><br>Pritisnite bilo koju tipku na uređaju i kliknite gumb 'Sljedeće' "
+"da biste nastavili.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracija će provjeriti opsege vrijednosti koje vaš uređaj pruža."
-"<br>"
-"<br>Pomaknite <b>os %1 %2</b> na vašem uređaju do položaja <b>maksimum</b>."
-"<br>"
-"<br>Pritisnite bilo koju tipku na uređaju i kliknite gumb 'Sljedeće' da biste "
-"nastavili.</qt>"
+"<br><br>Pomaknite <b>os %1 %2</b> na vašem uređaju do položaja <b>maksimum</"
+"b>.<br><br>Pritisnite bilo koju tipku na uređaju i kliknite gumb 'Sljedeće' "
+"da biste nastavili.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -122,16 +108,16 @@ msgstr "Dani uređaj %1 nije igraća palica."
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
 msgstr ""
-"Kernel verziju upravljačkog programa za igraću palicu %1 nije moguće dohvatiti: "
-"%2"
+"Kernel verziju upravljačkog programa za igraću palicu %1 nije moguće "
+"dohvatiti: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Trenutno pokrenuta kernel verzija upravljačkog programa (%1.%2.%3) nije ona za "
-"koju je ovaj modul sastavljen (%4.%5.%6)."
+"Trenutno pokrenuta kernel verzija upravljačkog programa (%1.%2.%3) nije ona "
+"za koju je ovaj modul sastavljen (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -173,39 +159,28 @@ msgstr "TDE upravljački modul za ispitivanje igraće palice"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Igraća palica</h1>Ovaj modul olakšava provjeru ispravnog funkcioniranja "
-"igraće palice."
-"<br>U slučaju dobivanja pogrešnih vrijednosti možete pokušati s kalibracijom."
-"<br>Ovaj modul pokušava pronaći sve raspoložive igraće palice provjeravanjem "
-"ulaza /dev/js[0-4] i /dev/input/js[0-4]"
-"<br>Ako imate još neki uređaj, unesite ga u kombinirani okvir."
-"<br>Popis tipki prikazuje stanje tipki igraće palice, a popis osi prikazuje "
-"trenutnu vrijednost svih osi."
+"igraće palice.<br>U slučaju dobivanja pogrešnih vrijednosti možete pokušati "
+"s kalibracijom.<br>Ovaj modul pokušava pronaći sve raspoložive igraće palice "
+"provjeravanjem ulaza /dev/js[0-4] i /dev/input/js[0-4]<br>Ako imate još neki "
+"uređaj, unesite ga u kombinirani okvir.<br>Popis tipki prikazuje stanje "
+"tipki igraće palice, a popis osi prikazuje trenutnu vrijednost svih osi."
 "<br>NAPOMENA: Trenutan Linux upravljački program (Kernel 2.4, 2.6) može "
-"automatski prepoznati samo slijedeće vrste igraćih palica:"
-"<ul>"
-"<li>2-osi, 4-tipke</li>"
-"<li>3-osi, 4-tipke</li>"
-"<li>4-osi, 4-tipke</li>"
-"<li>Saitek Cyborg 'digitalna' igraća palica</li></ul>"
-"(Detalje možete proučiti u Linux dokumentaciji: "
-"source/Documentation/input/joystick.txt)"
+"automatski prepoznati samo slijedeće vrste igraćih palica:<ul><li>2-osi, 4-"
+"tipke</li><li>3-osi, 4-tipke</li><li>4-osi, 4-tipke</li><li>Saitek Cyborg "
+"'digitalna' igraća palica</li></ul>(Detalje možete proučiti u Linux "
+"dokumentaciji: source/Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -245,15 +220,13 @@ msgstr "Kalibriraj"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Automatskim pretraživanjem nije pronađena nijedna igraća palica."
-"<br>Provjera je izvršena pri ulazima /dev/js[0-4] i /dev/input/js[0-4]"
-"<br>Ako znate da je uređaj ipak priključen, unesite odgovarajuću datoteku "
-"uređaja."
+"Automatskim pretraživanjem nije pronađena nijedna igraća palica.<br>Provjera "
+"je izvršena pri ulazima /dev/js[0-4] i /dev/input/js[0-4]<br>Ako znate da je "
+"uređaj ipak priključen, unesite odgovarajuću datoteku uređaja."
 
 #: joywidget.cpp:236
 msgid ""
@@ -275,18 +248,13 @@ msgstr "Pogreška uređaja"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibracija će provjeriti preciznost."
-"<br>"
-"<br><b>Pomaknite sve osi u njihovu sredinu i ne dodirujte igraću palicu</b>"
-"<br>"
-"<br>Da biste započeli kalibriranje kliknite 'U redu'.</qt>"
+"<qt>Kalibracija će provjeriti preciznost.<br><br><b>Pomaknite sve osi u "
+"njihovu sredinu i ne dodirujte igraću palicu</b><br><br>Da biste započeli "
+"kalibriranje kliknite 'U redu'.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-hu/messages/tdebase/joystick.po b/tde-i18n-hu/messages/tdebase/joystick.po
index c98ce0196a5..6b4a9313dee 100644
--- a/tde-i18n-hu/messages/tdebase/joystick.po
+++ b/tde-i18n-hu/messages/tdebase/joystick.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TDE 3.5\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-12-10 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@mol.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -12,13 +12,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Szántó Tamás"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -47,55 +47,40 @@ msgstr "(általában Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>A program megpróbálja meghatározni az eszköz értéktartományát."
-"<br>"
-"<br>Kérem mozgassa a botkormányt az <b>%1 %2 tengely</b> mentén a <b>"
-"minimális</b> pozícióba."
-"<br>"
-"<br>A továbblépéshez ebben a helyzetben nyomja meg bármelyik gombot az eszközön "
-"vagy kattintson a 'Tovább' gombra.</qt>"
+"<br><br>Kérem mozgassa a botkormányt az <b>%1 %2 tengely</b> mentén a "
+"<b>minimális</b> pozícióba.<br><br>A továbblépéshez ebben a helyzetben "
+"nyomja meg bármelyik gombot az eszközön vagy kattintson a 'Tovább' gombra.</"
+"qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>A program megpróbálja meghatározni az eszköz értéktartományát."
-"<br>"
-"<br>Kérem mozgassa a botkormányt az <b>%1 %2 tengely</b> mentén a <b>középső</b> "
-"pozícióba."
-"<br>"
-"<br>A továbblépéshez ebben a helyzetben nyomja meg bármelyik gombot az eszközön "
-"vagy kattintson a 'Tovább' gombra.</qt>"
+"<br><br>Kérem mozgassa a botkormányt az <b>%1 %2 tengely</b> mentén a "
+"<b>középső</b> pozícióba.<br><br>A továbblépéshez ebben a helyzetben nyomja "
+"meg bármelyik gombot az eszközön vagy kattintson a 'Tovább' gombra.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>A program megpróbálja meghatározni az eszköz értéktartományát."
-"<br>"
-"<br>Kérem mozgassa a botkormányt az <b>%1 %2 tengely</b> mentén a <b>"
-"maximális</b> pozícióba."
-"<br>"
-"<br>A továbblépéshez ebben a helyzetben nyomja meg bármelyik gombot az eszközön "
-"vagy kattintson a 'Tovább' gombra.</qt>"
+"<br><br>Kérem mozgassa a botkormányt az <b>%1 %2 tengely</b> mentén a "
+"<b>maximális</b> pozícióba.<br><br>A továbblépéshez ebben a helyzetben "
+"nyomja meg bármelyik gombot az eszközön vagy kattintson a 'Tovább' gombra.</"
+"qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -124,16 +109,16 @@ msgstr "A megadott eszköz (%1) nem botkormány."
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
 msgstr ""
-"Nem sikerült meghatározni a meghajtó verziószámát a(z) %1 botkormány-eszköznél: "
-"%2"
+"Nem sikerült meghatározni a meghajtó verziószámát a(z) %1 botkormány-"
+"eszköznél: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Az aktuális meghajtó verziószáma (%1.%2.%3) nem egyezik meg azzal, amelyikhez a "
-"modult fordították (%4.%5.%6)."
+"Az aktuális meghajtó verziószáma (%1.%2.%3) nem egyezik meg azzal, "
+"amelyikhez a modult fordították (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -148,26 +133,26 @@ msgstr ""
 #: joydevice.cpp:99
 msgid "Could not get calibration values for joystick device %1: %2"
 msgstr ""
-"Nem sikerült lekérdezni a kalibrációs értékeket a(z) %1 botkormány-eszköznél: "
-"%2"
+"Nem sikerült lekérdezni a kalibrációs értékeket a(z) %1 botkormány-"
+"eszköznél: %2"
 
 #: joydevice.cpp:105
 msgid "Could not restore calibration values for joystick device %1: %2"
 msgstr ""
-"Nem sikerült visszaállítani a kalibrációs értékeket a(z) %1 "
-"botkormány-eszköznél: %2"
+"Nem sikerült visszaállítani a kalibrációs értékeket a(z) %1 botkormány-"
+"eszköznél: %2"
 
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"Nem sikerült inicializálni a kalibrációs értékeket a(z) %1 "
-"botkormány-eszköznél: %2"
+"Nem sikerült inicializálni a kalibrációs értékeket a(z) %1 botkormány-"
+"eszköznél: %2"
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
 msgstr ""
-"Nem sikerült érvényesíteni a kalibrációs értékeket a(z) %1 "
-"botkormány-eszköznél: %2"
+"Nem sikerült érvényesíteni a kalibrációs értékeket a(z) %1 botkormány-"
+"eszköznél: %2"
 
 #: joydevice.cpp:121
 msgid "internal error - code %1 unknown"
@@ -184,39 +169,29 @@ msgstr "TDE beállítómodul botkormányok kalibrálásához"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Botkormány</h1>Ebben a modulban botkormányok finombeállítását lehet "
-"elvégezni."
-"<br>Ha a botkormány nem pontosan működik, a kalibrálás elvégzésével "
-"megszüntethetők a kezelési problémák."
-"<br>A modul megpróbálja detektálni a csatlakoztatott botkormányokat a "
-"/dev/js[0-4] és /dev/input/js[0-4] eszközök leellenőrzésével."
-"<br>Ha más eszközkezelőt használ, írja be annak nevét a kombinált listába."
-"<br>A Gombok feliratú listában látható a gombok állapota, a Tengelyek listában "
-"a pozíció pillanatnyi értéke az egyes tengelyek mentén."
-"<br>Megjegyzés: a jelenlegi Linux-os meghajtó (2.4-es és 2.6-os verziók) csak "
-"ezeket tudják kezelni:"
-"<ul>"
-"<li>2 tengelyű, 4 gombos</li>"
-"<li>3 tengelyű, 4 gombos</li>"
-"<li>4 tengelyű, 4 gombos</li>"
-"<li>Saitek Cyborg (digitális)</li></ul>(További részletek a Linux "
-"source/Documentation/input/joystick.txt dokumentációs fájljában találhatók)"
+"elvégezni.<br>Ha a botkormány nem pontosan működik, a kalibrálás "
+"elvégzésével megszüntethetők a kezelési problémák.<br>A modul megpróbálja "
+"detektálni a csatlakoztatott botkormányokat a /dev/js[0-4] és /dev/input/"
+"js[0-4] eszközök leellenőrzésével.<br>Ha más eszközkezelőt használ, írja be "
+"annak nevét a kombinált listába.<br>A Gombok feliratú listában látható a "
+"gombok állapota, a Tengelyek listában a pozíció pillanatnyi értéke az egyes "
+"tengelyek mentén.<br>Megjegyzés: a jelenlegi Linux-os meghajtó (2.4-es és "
+"2.6-os verziók) csak ezeket tudják kezelni:<ul><li>2 tengelyű, 4 gombos</"
+"li><li>3 tengelyű, 4 gombos</li><li>4 tengelyű, 4 gombos</li><li>Saitek "
+"Cyborg (digitális)</li></ul>(További részletek a Linux source/Documentation/"
+"input/joystick.txt dokumentációs fájljában találhatók)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -256,14 +231,13 @@ msgstr "Kalibrálás"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Egy támogatott botkormányt sem sikerült felismerni."
-"<br>Az ellenőrzés a /dev/js[0-4] és /dev/input/js[0-4] eszközökre terjed ki."
-"<br>Ha más eszközfájlt szeretne használni, írja be annak nevét."
+"Egy támogatott botkormányt sem sikerült felismerni.<br>Az ellenőrzés a /dev/"
+"js[0-4] és /dev/input/js[0-4] eszközökre terjed ki.<br>Ha más eszközfájlt "
+"szeretne használni, írja be annak nevét."
 
 #: joywidget.cpp:236
 msgid ""
@@ -285,19 +259,14 @@ msgstr "Eszközhiba"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 "<qt>A kalibrálás során a program ellenőrzi az eszköz precizitását."
-"<br>"
-"<br><b>Mozgassa az összes tengely mentén középső pozícióba a kormányt és "
-"engedje el.</b>"
-"<br>"
-"<br>Kattintson az OK gombra a kalibrálás megkezdéséhez.</qt>"
+"<br><br><b>Mozgassa az összes tengely mentén középső pozícióba a kormányt és "
+"engedje el.</b><br><br>Kattintson az OK gombra a kalibrálás megkezdéséhez.</"
+"qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-is/messages/tdebase/joystick.po b/tde-i18n-is/messages/tdebase/joystick.po
index 88afd54ebca..994d240cc4c 100644
--- a/tde-i18n-is/messages/tdebase/joystick.po
+++ b/tde-i18n-is/messages/tdebase/joystick.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-11-22 10:57+0100\n"
 "Last-Translator: Arnar Leosson <leosson@frisurf.no>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Richard Allen, Þröstur Svanbergsson"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -52,52 +52,38 @@ msgstr "(vanalega Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Stillingin er að fara að kanna hvernig tækið þitt vinnur."
-"<br>"
-"<br>Vinsamlega færðu <b>ás %1 %2</b> á tækinu í <b>lágmarks</b> stöðuna."
-"<br>"
-"<br>Þrýstu á einhvern hnappinn á tækinu eða smelltu á 'Næsta' til að halda "
-"áfram í næsta þrep.</qt>"
+"<br><br>Vinsamlega færðu <b>ás %1 %2</b> á tækinu í <b>lágmarks</b> stöðuna."
+"<br><br>Þrýstu á einhvern hnappinn á tækinu eða smelltu á 'Næsta' til að "
+"halda áfram í næsta þrep.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Stillingin er að fara að kanna hvernig tækið þitt vinnur."
-"<br>"
-"<br>Vinsamlega færðu <b>ás %1 %2</b> á tækinu í <b>miðju</b> stöðuna."
-"<br>"
-"<br>Þrýstu á einhvern hnappinn á tækinu eða smelltu á 'Næsta' til að halda "
-"áfram í næsta þrep.</qt>"
+"<br><br>Vinsamlega færðu <b>ás %1 %2</b> á tækinu í <b>miðju</b> stöðuna."
+"<br><br>Þrýstu á einhvern hnappinn á tækinu eða smelltu á 'Næsta' til að "
+"halda áfram í næsta þrep.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Stillingin er að fara að kanna hvernig tækið þitt vinnur."
-"<br>"
-"<br>Vinsamlega færðu <b>ás %1 %2</b> á tækinu í <b>hámarks</b> stöðuna."
-"<br>"
-"<br>Þrýstu á einhvern hnappinn á tækinu eða smelltu á 'Næsta' til að halda "
-"áfram í næsta þrep.</qt>"
+"<br><br>Vinsamlega færðu <b>ás %1 %2</b> á tækinu í <b>hámarks</b> stöðuna."
+"<br><br>Þrýstu á einhvern hnappinn á tækinu eða smelltu á 'Næsta' til að "
+"halda áfram í næsta þrep.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -129,11 +115,11 @@ msgstr "Gat ekki fundið útgáfu kjarnarekils fyrir stýripinnatækið %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Útgáfa kjarnans sem er keyrandi (%1.%2.%3) er ekki sú sama og kjarnarekillinn "
-"var vistþýddur fyrir (%4.%5.%6)."
+"Útgáfa kjarnans sem er keyrandi (%1.%2.%3) er ekki sú sama og "
+"kjarnarekillinn var vistþýddur fyrir (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -174,39 +160,29 @@ msgstr "TDE stjórnborðseining til að prófa stýripinna"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Stýripinni</h1>Þessi eining aðstoðar þig við að athuga hvort stýripinninn "
-"þinn virki rétt."
-"<br> Ef hún gefur upp röng gildi fyrir ásana getur þú reynt að leysa það með "
-"því að stilla stýripinnann."
-"<br>Þessi eining reynir að finna alla tengda stýripinna með því að "
-"athuga/dev/js[0-4] og /dev/input/js[0-4]"
-"<br>Ef tækjaskrá þín er annars staðar skaltu slá hana inn í innsláttarreitinn."
-"<br>Takkalistinn birtir stöðu takkanna á stýripinnanum þínum. Ásalistinn birtir "
-"núverandi gildi fyrir alla ása."
-"<br>ATHUGIÐ: Núverandi Linux rekillinn (kjarnar 2.4, 2.6) getur aðeins fundið "
-"sjálfkrafa"
-"<ul>"
-"<li>2-ása, 4-takka stýripinna</li>"
-"<li>3-ása, 4-takka stýripinna</li>"
-"<li>4-ása, 4-takka stýripinna</li>"
-"<li>Saitek Cyborg 'stafræna' stýripinna</li></ul>(Athugaðu grunnkóða "
-"Linux/Documentation/input/joystick.txt fyrir frekari upplýsingar)"
+"<h1>Stýripinni</h1>Þessi eining aðstoðar þig við að athuga hvort "
+"stýripinninn þinn virki rétt.<br> Ef hún gefur upp röng gildi fyrir ásana "
+"getur þú reynt að leysa það með því að stilla stýripinnann.<br>Þessi eining "
+"reynir að finna alla tengda stýripinna með því að athuga/dev/js[0-4] og /dev/"
+"input/js[0-4]<br>Ef tækjaskrá þín er annars staðar skaltu slá hana inn í "
+"innsláttarreitinn.<br>Takkalistinn birtir stöðu takkanna á stýripinnanum "
+"þínum. Ásalistinn birtir núverandi gildi fyrir alla ása.<br>ATHUGIÐ: "
+"Núverandi Linux rekillinn (kjarnar 2.4, 2.6) getur aðeins fundið "
+"sjálfkrafa<ul><li>2-ása, 4-takka stýripinna</li><li>3-ása, 4-takka "
+"stýripinna</li><li>4-ása, 4-takka stýripinna</li><li>Saitek Cyborg "
+"'stafræna' stýripinna</li></ul>(Athugaðu grunnkóða Linux/Documentation/input/"
+"joystick.txt fyrir frekari upplýsingar)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -246,14 +222,13 @@ msgstr "Stilla"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Engin stýripinni fannst sjálfkrafa á þessari tölvu. "
-"<br>Leitað var í /dev/js[0-4] og /dev/input/js[0-4] "
-"<br>Vinsamlega sláðu inn rétta tækjaskrá ef þú veist að stýripinni er tengdur."
+"Engin stýripinni fannst sjálfkrafa á þessari tölvu. <br>Leitað var í /dev/"
+"js[0-4] og /dev/input/js[0-4] <br>Vinsamlega sláðu inn rétta tækjaskrá ef þú "
+"veist að stýripinni er tengdur."
 
 #: joywidget.cpp:236
 msgid ""
@@ -275,19 +250,13 @@ msgstr "Tækjavilla"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Stilling mun nú athuga nákvæmnina. "
-"<br>"
-"<br><b>Vinsamlega færðu alla ása í miðjustöðu og snertu svo ekki "
-"stýripinnann.</b>"
-"<br>"
-"<br>Smelltu á 'Í lagi' til að hefja stillinguna.</qt>"
+"<qt>Stilling mun nú athuga nákvæmnina. <br><br><b>Vinsamlega færðu alla ása "
+"í miðjustöðu og snertu svo ekki stýripinnann.</b><br><br>Smelltu á 'Í lagi' "
+"til að hefja stillinguna.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-it/messages/tdebase/joystick.po b/tde-i18n-it/messages/tdebase/joystick.po
index 636fb696876..cfce7f26bc4 100644
--- a/tde-i18n-it/messages/tdebase/joystick.po
+++ b/tde-i18n-it/messages/tdebase/joystick.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-09-09 11:22+0200\n"
 "Last-Translator: Pino Toscano <toscano.pino@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Pino Toscano"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,55 +51,41 @@ msgstr "(di solito Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>La calibrazione sta per controllare l'intervallo di valori che il "
-"dispositivo restituisce."
-"<br>"
-"<br>Muovi l'<b>asse %1 %2</b> sul dispositivo alla posizione <b>più bassa</b>."
-"<br>"
-"<br>Premi un pulsante qualsiasi sul dispositivo o il pulsante \"Successivo\" "
-"per continuare con il passo successivo.</qt>"
+"dispositivo restituisce.<br><br>Muovi l'<b>asse %1 %2</b> sul dispositivo "
+"alla posizione <b>più bassa</b>.<br><br>Premi un pulsante qualsiasi sul "
+"dispositivo o il pulsante \"Successivo\" per continuare con il passo "
+"successivo.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>La calibrazione sta per controllare l'intervallo di valori che il "
-"dispositivo restituisce."
-"<br>"
-"<br>Muovi l'<b>asse %1 %2</b> sul dispositivo alla posizione <b>centrale</b>."
-"<br>"
-"<br>Premi un pulsante qualsiasi sul dispositivo o il pulsante \"Successivo\" "
-"per continuare con il passo successivo.</qt>"
+"dispositivo restituisce.<br><br>Muovi l'<b>asse %1 %2</b> sul dispositivo "
+"alla posizione <b>centrale</b>.<br><br>Premi un pulsante qualsiasi sul "
+"dispositivo o il pulsante \"Successivo\" per continuare con il passo "
+"successivo.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>La calibrazione sta per controllare l'intervallo di valori che il "
-"dispositivo restituisce."
-"<br>"
-"<br>Muovi l'<b>asse %1 %2</b> sul dispositivo alla posizione <b>più alta</b>."
-"<br>"
-"<br>Premi un pulsante qualsiasi sul dispositivo o il pulsante \"Successivo\" "
-"per continuare con il passo successivo.</qt>"
+"dispositivo restituisce.<br><br>Muovi l'<b>asse %1 %2</b> sul dispositivo "
+"alla posizione <b>più alta</b>.<br><br>Premi un pulsante qualsiasi sul "
+"dispositivo o il pulsante \"Successivo\" per continuare con il passo "
+"successivo.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -132,11 +118,11 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"L'attuale versione del driver del kernel attivo (%1.%2.%3) non è quella per cui "
-"è stato compilato questo modulo (%4.%5.%6)."
+"L'attuale versione del driver del kernel attivo (%1.%2.%3) non è quella per "
+"cui è stato compilato questo modulo (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -177,39 +163,30 @@ msgstr "Modulo del centro di controllo di TDE per provare i joystick"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Joystick</h1>Questo modulo ti aiuta a controllare se il tuo joystick "
-"funziona correttamente."
-"<br>Se restituisce valori errati per gli assi, puoi provare a risolvere questo "
-"problema con la calibrazione."
-"<br>Questo modulo cerca di rilevare tutti i joystick controllando in "
-"/dev/js[0-4] e in /dev/input/js[0-4]"
-"<br>Se hai un altro file di dispositivo, inseriscilo nella lista a comparsa."
-"<br>La lista \"Pulsanti\" mostra lo stato dei pulsanti del joystick, la lista "
-"\"Assi\" mostra l'attuale valore di tutti gli assi."
+"funziona correttamente.<br>Se restituisce valori errati per gli assi, puoi "
+"provare a risolvere questo problema con la calibrazione.<br>Questo modulo "
+"cerca di rilevare tutti i joystick controllando in /dev/js[0-4] e in /dev/"
+"input/js[0-4]<br>Se hai un altro file di dispositivo, inseriscilo nella "
+"lista a comparsa.<br>La lista \"Pulsanti\" mostra lo stato dei pulsanti del "
+"joystick, la lista \"Assi\" mostra l'attuale valore di tutti gli assi."
 "<br>NOTA: l'attuale driver del dispositivo di Linux (Kernel 2.4, 2.6) può "
-"rilevare automaticamente solo"
-"<ul>"
-"<li>joystick a 2 assi e 4 pulsanti</li>"
-"<li>joystick a 3 assi e 4 pulsanti</li>"
-"<li>joystick a 4 assi e 4 pulsanti</li>"
-"<li>joystick \"digitali\" Saitek Cyborg</li></ul>(Per i dettagli leggi il file "
-"nei sorgenti di Linux \"Documentation/input/joystick.txt\")"
+"rilevare automaticamente solo<ul><li>joystick a 2 assi e 4 pulsanti</"
+"li><li>joystick a 3 assi e 4 pulsanti</li><li>joystick a 4 assi e 4 "
+"pulsanti</li><li>joystick \"digitali\" Saitek Cyborg</li></ul>(Per i "
+"dettagli leggi il file nei sorgenti di Linux \"Documentation/input/joystick."
+"txt\")"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -249,13 +226,12 @@ msgstr "Calibra"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Non è stato trovato automaticamente alcun joystick su questo computer. "
-"<br>I controlli sono stati effettuati in /dev/js[0-4] e in /dev/input/js[0-4] "
+"Non è stato trovato automaticamente alcun joystick su questo computer. <br>I "
+"controlli sono stati effettuati in /dev/js[0-4] e in /dev/input/js[0-4] "
 "<br>Se sai che c'è un joystick collegato, indica il dispositivo corretto."
 
 #: joywidget.cpp:236
@@ -278,19 +254,13 @@ msgstr "Errore del dispositivo"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>La calibrazione sta per controllare la precisione."
-"<br>"
-"<br><b>Muovi tutti gli assi alla loro posizione centrale e non toccare più il "
-"joystick.</b>"
-"<br>"
-"<br>Premi OK per iniziare la calibrazione.</qt>"
+"<qt>La calibrazione sta per controllare la precisione.<br><br><b>Muovi tutti "
+"gli assi alla loro posizione centrale e non toccare più il joystick.</"
+"b><br><br>Premi OK per iniziare la calibrazione.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-ja/messages/tdebase/joystick.po b/tde-i18n-ja/messages/tdebase/joystick.po
index 58fd8ba49b6..8b392a724b1 100644
--- a/tde-i18n-ja/messages/tdebase/joystick.po
+++ b/tde-i18n-ja/messages/tdebase/joystick.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2006-11-01 21:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Kurose Shushi,Shinichi Tsunoda"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,49 +51,38 @@ msgstr "(通常 Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>キャリブレーションは、今からデバイスが送信する値の範囲をチェックします。"
-"<br>"
-"<br>デバイスの軸 <b>%1 %2</b> を「最小」の位置に動かしてください。"
-"<br>"
-"<br>デバイス上のボタンをどれか押すか、「次」ボタンを押せば、次のステップに進みます。</qt>"
+"<br><br>デバイスの軸 <b>%1 %2</b> を「最小」の位置に動かしてください。"
+"<br><br>デバイス上のボタンをどれか押すか、「次」ボタンを押せば、次のステップ"
+"に進みます。</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>キャリブレーションは、今からデバイスが送信する値の範囲をチェックします。"
-"<br>"
-"<br>デバイスの軸 <b>%1 %2</b> を「中央」の位置に動かしてください。"
-"<br>"
-"<br>デバイス上のボタンをどれかを押すか、「次」ボタンを押せば、次のステップに進みます。</qt>"
+"<br><br>デバイスの軸 <b>%1 %2</b> を「中央」の位置に動かしてください。"
+"<br><br>デバイス上のボタンをどれかを押すか、「次」ボタンを押せば、次のステッ"
+"プに進みます。</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>キャリブレーションは、今からデバイスが送信する値の範囲をチェックします。"
-"<br>"
-"<br>デバイスの軸 <b>%1 %2</b> を「最大」の位置に動かしてください。"
-"<br>"
-"<br>デバイス上のボタンをどれか押すか、「次」ボタンを押せば、次のステップに進みます。</qt>"
+"<br><br>デバイスの軸 <b>%1 %2</b> を「最大」の位置に動かしてください。"
+"<br><br>デバイス上のボタンをどれか押すか、「次」ボタンを押せば、次のステップ"
+"に進みます。</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -121,15 +110,17 @@ msgstr "指定されたデバイス %1 はジョイスティックではあり�
 
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
-msgstr "ジョイスティックデバイス %1 のカーネルドライバのバージョンを取得できませんでした: %2"
+msgstr ""
+"ジョイスティックデバイス %1 のカーネルドライバのバージョンを取得できませんで"
+"した: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"現在実行中のカーネルドライバのバージョン (%1.%2.%3) は、このモジュールのバージョン (%4.%5.%6) "
-"向けにコンパイルされたものではありません。"
+"現在実行中のカーネルドライバのバージョン (%1.%2.%3) は、このモジュールのバー"
+"ジョン (%4.%5.%6) 向けにコンパイルされたものではありません。"
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -141,19 +132,24 @@ msgstr "ジョイスティックデバイス %1 の軸の数を取得できま�
 
 #: joydevice.cpp:99
 msgid "Could not get calibration values for joystick device %1: %2"
-msgstr "ジョイスティックデバイス %1 のキャリブレーション値を取得できませんでした: %2"
+msgstr ""
+"ジョイスティックデバイス %1 のキャリブレーション値を取得できませんでした: %2"
 
 #: joydevice.cpp:105
 msgid "Could not restore calibration values for joystick device %1: %2"
-msgstr "ジョイスティックデバイス %1 のキャリブレーション値を復元できませんでした: %2"
+msgstr ""
+"ジョイスティックデバイス %1 のキャリブレーション値を復元できませんでした: %2"
 
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
-msgstr "ジョイスティックデバイス %1 のキャリブレーション値を初期化できませんでした: %2"
+msgstr ""
+"ジョイスティックデバイス %1 のキャリブレーション値を初期化できませんでした: "
+"%2"
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
-msgstr "ジョイスティックデバイス %1 のキャリブレーション値を適用できませんでした: %2"
+msgstr ""
+"ジョイスティックデバイス %1 のキャリブレーション値を適用できませんでした: %2"
 
 #: joydevice.cpp:121
 msgid "internal error - code %1 unknown"
@@ -170,33 +166,28 @@ msgstr "ジョイスティックをテストするための TDE コントロー�
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>ジョイスティック</h1>このモジュールはジョイスティックが正常に働いているかチェックします。"
-"<br>もし軸の値がおかしいようであれば、ここでキャリブレーションを行うことによって解決することができます。"
-"<br>このモジュールは /dev/js[0-4] と /dev/input/js[0-4] をチェックして、利用可能なすべてのジョイスティックを探します。"
-"<br>もし、他のデバイスファイルがあるのであれば、コンボボックスに入力してください。"
-"<br>ボタンのリストはジョイスティック上のボタンの状態を示しています。軸のリストは現在の軸の値を示しています。"
-"<br>注意: 現在の Linux デバイスドライバ (Kernel 2.4, 2.6) は以下のみ自動検出することができます。"
-"<ul>"
-"<li>2 軸, 4 ボタンのジョイスティック</li>"
-"<li>3 軸, 4 ボタンのジョイスティック</li>"
-"<li>4 軸, 4 ボタンのジョイスティック</li>"
-"<li>Saitek 社 Cyborg 'digital' ジョイスティック</li></ul>(詳細については、お使いの Linux の "
+"<h1>ジョイスティック</h1>このモジュールはジョイスティックが正常に働いているか"
+"チェックします。<br>もし軸の値がおかしいようであれば、ここでキャリブレーショ"
+"ンを行うことによって解決することができます。<br>このモジュールは /dev/"
+"js[0-4] と /dev/input/js[0-4] をチェックして、利用可能なすべてのジョイス"
+"ティックを探します。<br>もし、他のデバイスファイルがあるのであれば、コンボ"
+"ボックスに入力してください。<br>ボタンのリストはジョイスティック上のボタンの"
+"状態を示しています。軸のリストは現在の軸の値を示しています。<br>注意: 現在の "
+"Linux デバイスドライバ (Kernel 2.4, 2.6) は以下のみ自動検出することができま"
+"す。<ul><li>2 軸, 4 ボタンのジョイスティック</li><li>3 軸, 4 ボタンのジョイス"
+"ティック</li><li>4 軸, 4 ボタンのジョイスティック</li><li>Saitek 社 Cyborg "
+"'digital' ジョイスティック</li></ul>(詳細については、お使いの Linux の "
 "source/Documentation/input/joystick.txt をご覧ください)"
 
 #: joywidget.cpp:43
@@ -237,14 +228,13 @@ msgstr "キャリブレート"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "このコンピュータ上で、ジョイスティックデバイスを自動検出できませんでした。"
-"<br>/dev/js[0-4] と /dev/input/js[0-4] をチェックしました。"
-"<br>取り付けているものがあれば、正確なデバイスファイル名を入力してください。"
+"<br>/dev/js[0-4] と /dev/input/js[0-4] をチェックしました。<br>取り付けている"
+"ものがあれば、正確なデバイスファイル名を入力してください。"
 
 #: joywidget.cpp:236
 msgid ""
@@ -266,20 +256,16 @@ msgstr "デバイスエラー"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>キャリブレーションは、今から精度をチェックします。"
-"<br>"
-"<br>すべての軸を中央の位置に移動させ、それ以上ジョイスティックに触らないでください。"
-"<br>"
-"<br>「OK」を押すとキャリブレーションを開始します。</qt>"
+"<qt>キャリブレーションは、今から精度をチェックします。<br><br>すべての軸を中"
+"央の位置に移動させ、それ以上ジョイスティックに触らないでください。"
+"<br><br>「OK」を押すとキャリブレーションを開始します。</qt>"
 
 #: joywidget.cpp:372
 #, c-format
 msgid "Restored all calibration values for joystick device %1."
-msgstr "ジョイスティックデバイス %1 のすべてのキャリブレーション値を復元しました。"
+msgstr ""
+"ジョイスティックデバイス %1 のすべてのキャリブレーション値を復元しました。"
diff --git a/tde-i18n-kk/messages/tdebase/joystick.po b/tde-i18n-kk/messages/tdebase/joystick.po
index 4d725afc432..2b30b421f71 100644
--- a/tde-i18n-kk/messages/tdebase/joystick.po
+++ b/tde-i18n-kk/messages/tdebase/joystick.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-11-27 13:45+0000\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh\n"
@@ -16,13 +16,13 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Мәмбет Ізбасаров, Сайран Киккарин"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,55 +51,38 @@ msgstr "(әдетте Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Құрылғының сермеу аумағы калибрленуге дайын."
-"<br>"
-"<br>Құрылғының тұтқасын <b>%1 %2</b> білігі бойынша <b>төменгі</b> "
-"шегіне тіреңіз."
-"<br>"
-"<br>Келесі қадамға өту үшін құрылғының кез келген батырмасын немесе 'Келесі' "
-"дегенді басыңыз.</qt>"
+"<qt>Құрылғының сермеу аумағы калибрленуге дайын.<br><br>Құрылғының тұтқасын "
+"<b>%1 %2</b> білігі бойынша <b>төменгі</b> шегіне тіреңіз.<br><br>Келесі "
+"қадамға өту үшін құрылғының кез келген батырмасын немесе 'Келесі' дегенді "
+"басыңыз.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Құрылғының сермеу аумағы калибрленуге дайын."
-"<br>"
-"<br>Құрылғының тұтқасын <b>%1 %2</b> білігі бойынша <b>ортаңғы</b> "
-"шебіне қойыңыз."
-"<br>"
-"<br>Келесі қадамға өту үшін құрылғының кез келген батырмасын немесе 'Келесі' "
-"дегенді басыңыз.</qt>"
+"<qt>Құрылғының сермеу аумағы калибрленуге дайын.<br><br>Құрылғының тұтқасын "
+"<b>%1 %2</b> білігі бойынша <b>ортаңғы</b> шебіне қойыңыз.<br><br>Келесі "
+"қадамға өту үшін құрылғының кез келген батырмасын немесе 'Келесі' дегенді "
+"басыңыз.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Құрылғының сермеу аумағы калибрленуге дайын."
-"<br>"
-"<br>Құрылғының тұтқасын <b>%1 %2</b> білігі бойынша <b>жоғарғы</b> "
-"шегіне тіреңіз."
-"<br>"
-"<br>Келесі қадамға өту үшін құрылғының кез келген батырмасын немесе 'Келесі' "
-"дегенді басыңыз.</qt>"
+"<qt>Құрылғының сермеу аумағы калибрленуге дайын.<br><br>Құрылғының тұтқасын "
+"<b>%1 %2</b> білігі бойынша <b>жоғарғы</b> шегіне тіреңіз.<br><br>Келесі "
+"қадамға өту үшін құрылғының кез келген батырмасын немесе 'Келесі' дегенді "
+"басыңыз.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -131,11 +114,11 @@ msgstr "%1: %2 джойстик құрылғының өзектегі драйв
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Орындалып жатқан (%1.%2.%3) өзегінің драйвер нұскасы өзге (%4.%5.%6) өзегі үшін "
-"құрылған."
+"Орындалып жатқан (%1.%2.%3) өзегінің драйвер нұскасы өзге (%4.%5.%6) өзегі "
+"үшін құрылған."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -176,38 +159,29 @@ msgstr "TDE басқару орталығының джойстигін сына�
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Джойстик</h1>Бұл модуль джойстикті тексеруге мүмкіндік береді."
-"<br> Егер тұткасынын шебін дұрыс көрсетпесе, оны калибрлеп жөндеуге болады."
-"<br>Бұл модуль қосылып тұрған джойстик құрылғыларын /dev/js[0-4] және "
-"/dev/input/js[0-4] көздерінен іздейті."
-"<br>Егер джойстігіңіздіңқұрылғы көзі басқа болса оны ашылмалы тізіміне "
-"келтіріңіз."
-"<br>Батырмалар тізімінде джойстиктің батырмаларының күйі көрсетілген, ал "
-"Біліктер тізімінде - біліктердін күйі."
+"<h1>Джойстик</h1>Бұл модуль джойстикті тексеруге мүмкіндік береді.<br> Егер "
+"тұткасынын шебін дұрыс көрсетпесе, оны калибрлеп жөндеуге болады.<br>Бұл "
+"модуль қосылып тұрған джойстик құрылғыларын /dev/js[0-4] және /dev/input/"
+"js[0-4] көздерінен іздейті.<br>Егер джойстігіңіздіңқұрылғы көзі басқа болса "
+"оны ашылмалы тізіміне келтіріңіз.<br>Батырмалар тізімінде джойстиктің "
+"батырмаларының күйі көрсетілген, ал Біліктер тізімінде - біліктердін күйі."
 "<br>Ескерту: Қазіргі Linux джойстигінің драйвері (2.4 және 2.6 өзектердегі) "
-"келесі құрылғыларды дұрыс автоматы түрде анықтайды:"
-"<ul>"
-"<li>2 білік, 4 батырма джойстигін</li> "
-"<li>3 білік, 4 батырма джойстигін</li> "
-"<li>4 білік, 4 батырма джойстигін</li>"
-"<li>Saitek Cyborg цифрлық джойстиктері</li></ul> (Егжей-тегжейін Linux "
-"source/Documentation/input/joystick.txt құжатынан қараңыз)"
+"келесі құрылғыларды дұрыс автоматы түрде анықтайды:<ul><li>2 білік, 4 "
+"батырма джойстигін</li> <li>3 білік, 4 батырма джойстигін</li> <li>4 білік, "
+"4 батырма джойстигін</li><li>Saitek Cyborg цифрлық джойстиктері</li></ul> "
+"(Егжей-тегжейін Linux source/Documentation/input/joystick.txt құжатынан "
+"қараңыз)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -247,14 +221,13 @@ msgstr "Калибрлеу"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Джойстик құрылғысы автоматты түрде табылмады."
-"<br>/dev/js[0-4] мен /dev/input/js[0-4] құрылғы көздері тексерілді."
-"<br>Егер джойстигіңіздің құрылғы көзін білсеңіз төменде келтіріңіз."
+"Джойстик құрылғысы автоматты түрде табылмады.<br>/dev/js[0-4] мен /dev/input/"
+"js[0-4] құрылғы көздері тексерілді.<br>Егер джойстигіңіздің құрылғы көзін "
+"білсеңіз төменде келтіріңіз."
 
 #: joywidget.cpp:236
 msgid ""
@@ -276,19 +249,13 @@ msgstr "Құрылғы қатесі"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Құрылғының дәлдігі калибрленуге дайын."
-"<br>"
-"<br><b>Джойстикті барлық біліктер бойынша ортаңғы шебіне келтіріп,содан кейін "
-"оған тиіспеңіз.</b>"
-"<br>"
-"<br>Калибрлеуді бастау үшін OK батырмасын басыңыз.</qt>"
+"<qt>Құрылғының дәлдігі калибрленуге дайын.<br><br><b>Джойстикті барлық "
+"біліктер бойынша ортаңғы шебіне келтіріп,содан кейін оған тиіспеңіз.</"
+"b><br><br>Калибрлеуді бастау үшін OK батырмасын басыңыз.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-km/messages/tdebase/joystick.po b/tde-i18n-km/messages/tdebase/joystick.po
index a103f3d8283..a360c05b045 100644
--- a/tde-i18n-km/messages/tdebase/joystick.po
+++ b/tde-i18n-km/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2008-07-15 14:49+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <en@li.org>\n"
@@ -14,19 +14,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "ខឹម សុខែម, លី សួស្ដី, អេង វណ្ណៈ, អោក ពិសិដ្ឋ"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr ""
-"khoemsokhem@khmeros.info,soursdey@khmeros.info, "
-"evannak@khmeros.info,piseth_dv@khmeros.info"
+"khoemsokhem@khmeros.info,soursdey@khmeros.info, evannak@khmeros.info,"
+"piseth_dv@khmeros.info"
 
 #: caldialog.cpp:38 joywidget.cpp:341
 msgid "Calibration"
@@ -51,58 +51,35 @@ msgstr "(ជាទូទៅ Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>ការ​ក្រិត​តាមខ្នាត​ទំនងជា​ពិនិត្យ​មើលជួរ​តម្លៃដែល​ឧបករណ៍​របស់​អ្នក​ផ្ដល់​ឲ្យ"
-" ។"
-"<br>"
-"<br> សូម​ផ្លាស់ទី <b>អ័ក្ស %1 %2</b> លើ​ឧបករណ៍​របស់​អ្នក​ទៅ​ទីតាំង <b>"
-"អប្បបរមា</b> ។"
-"<br>"
-"<br> ចុច​ប៊ូតុង​ណា​មួយ​លើ​ឧបករណ៍ ឬ ចុច​លើ​ប៊ូតុង  ់បន្ទាប់ ់ "
-"ដើម្បី​បន្ត​ជំហាន​បន្ទាប់ ។</qt>"
+"<qt>ការ​ក្រិត​តាមខ្នាត​ទំនងជា​ពិនិត្យ​មើលជួរ​តម្លៃដែល​ឧបករណ៍​របស់​អ្នក​ផ្ដល់​ឲ្យ ។<br><br> សូម​ផ្លាស់ទី "
+"<b>អ័ក្ស %1 %2</b> លើ​ឧបករណ៍​របស់​អ្នក​ទៅ​ទីតាំង <b>អប្បបរមា</b> ។<br><br> ចុច​ប៊ូតុង​ណា​មួយ​លើ​"
+"ឧបករណ៍ ឬ ចុច​លើ​ប៊ូតុង  ់បន្ទាប់ ់ ដើម្បី​បន្ត​ជំហាន​បន្ទាប់ ។</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>ការ​ក្រិត​តាម​ខ្នាត​ទំនង​ជាពិនិត្យ​មើល​ជួរ​តម្លៃ​ដែល​ឧបករណ៍​របស់​អ្នក​ផ្ដល់់"
-"​ឲ្យ ។"
-"<br>"
-"<br> សូម​ផ្លាស់ទី <b>អ័ក្ស %1 %2</b> លើ​ឧបករណ៍​របស់​អ្នក​ទៅ​ទីតាំង <b>កណ្ដាល</b>"
-" ។"
-"<br>"
-"<br> ចុច​ប៊ូតុង​ណា​មួយ​លើ​ឧបករណ៍ ឬ ចុច​លើ​ប៊ូតុង  ់បន្ទាប់ ់ "
-"ដើម្បី​បន្ត​ជំហាន​បន្ទាប់ ។</qt>"
+"<qt>ការ​ក្រិត​តាម​ខ្នាត​ទំនង​ជាពិនិត្យ​មើល​ជួរ​តម្លៃ​ដែល​ឧបករណ៍​របស់​អ្នក​ផ្ដល់់​ឲ្យ ។<br><br> សូម​ផ្លាស់ទី "
+"<b>អ័ក្ស %1 %2</b> លើ​ឧបករណ៍​របស់​អ្នក​ទៅ​ទីតាំង <b>កណ្ដាល</b> ។<br><br> ចុច​ប៊ូតុង​ណា​មួយ​លើ​ឧបករណ៍ "
+"ឬ ចុច​លើ​ប៊ូតុង  ់បន្ទាប់ ់ ដើម្បី​បន្ត​ជំហាន​បន្ទាប់ ។</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>ការ​ក្រិត​តាម​ខ្នាត​ទំនង​ជាពិនិត្យ​មើល​ជួរ​តម្លៃ​ដែល​ឧបករណ៍​របស់​អ្នក​ផ្ដល់់"
-"​ឲ្យ ។"
-"<br>"
-"<br> សូម​ផ្លាស់ទី <b>អ័ក្ស %1 %2</b> លើ​ឧបករណ៍​របស់​អ្នក​ទៅ​ទីតាំង <b>"
-"អតិបរមា</b> ។"
-"<br>"
-"<br> ចុច​ប៊ូតុង​ណា​មួយ​លើ​ឧបករណ៍ ឬ ចុច​លើ​ប៊ូតុង  ់បន្ទាប់ ់ "
-"ដើម្បី​បន្ត​ជំហាន​បន្ទាប់ ។</qt>"
+"<qt>ការ​ក្រិត​តាម​ខ្នាត​ទំនង​ជាពិនិត្យ​មើល​ជួរ​តម្លៃ​ដែល​ឧបករណ៍​របស់​អ្នក​ផ្ដល់់​ឲ្យ ។<br><br> សូម​ផ្លាស់ទី "
+"<b>អ័ក្ស %1 %2</b> លើ​ឧបករណ៍​របស់​អ្នក​ទៅ​ទីតាំង <b>អតិបរមា</b> ។<br><br> ចុច​ប៊ូតុង​ណា​មួយ​លើ​"
+"ឧបករណ៍ ឬ ចុច​លើ​ប៊ូតុង  ់បន្ទាប់ ់ ដើម្បី​បន្ត​ជំហាន​បន្ទាប់ ។</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -134,11 +111,11 @@ msgstr "មិន​អាច​យក​កំណែ​កម្មវិធី
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"កំណែ​កម្មវិធី​បញ្ជាខឺណែល​ដែល​កំពុង​រត់​បច្ចុប្បន្ន (%1.%2.%3) "
-"មិន​មែន​ជា​កំណែ​ដែល​ចងក្រង​សម្រាប់​ម៉ូឌុល​នេះ​ឡើយ (%4.%5.%6) ។"
+"កំណែ​កម្មវិធី​បញ្ជាខឺណែល​ដែល​កំពុង​រត់​បច្ចុប្បន្ន (%1.%2.%3) មិន​មែន​ជា​កំណែ​ដែល​ចងក្រង​សម្រាប់​ម៉ូឌុល​នេះ​ឡើយ "
+"(%4.%5.%6) ។"
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -179,39 +156,26 @@ msgstr "ម៉ូឌុល​មជ្ឈមណ្ឌល​បញ្ជា​រ
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>យ៉យស្ទីក</h1>ម៉ូឌុល​នេះ​ជួយ​ពិនិត្យ​មើល​ថាតើ​យ៉យស្ទីក​របស់​អ្នក​ធ្វើការត្រឹម"
-"ត្រូវឬទេ ។"
-"<br>ប្រសិនបើ​វា​ផ្តល់​តម្លៃ​ខុសសម្រាប់​អ័ក្ស "
-"អ្នក​អាច​សាកល្បង​ដោះស្រាយបញ្ហា​នោះ​ដោយ​ប្រើការក្រិត​តាមខ្នាត ។"
-"<br>ម៉ូឌុល​នេះ​ព្យាយាម​ស្វែងរក​ឧបករណ៍​យ៉យស្ទីក​ដែល​មាន​ទាំងអស់ ដោយ​ពិនិត្យមើល "
-"/dev/js[0-4] និង /dev/input/js[0-4]"
-"<br>ប្រសិនបើ​អ្នក​មាន​ឯកសារ​ឧបករណ៍​ផ្សេងទៀត បញ្ចូល​វា​ក្នុង​ប្រអប់បន្សំ ។"
-"<br>បញ្ជី​ប៊ូតុង​បង្ហាញ​សភាព​របស់​ប៊ូតុង​នៅ​លើយ៉យ​ស្ទីក​របស់អ្នក ។ "
-"បញ្ជី​អ័ក្ស​បង្ហាញ​តម្លៃ​បច្ចុប្បន្ន​សម្រាប់​អ័ក្សទាំងអស់ ។"
-"<br> ចំណាំ ៖ កម្មវិធី​បញ្ជា​ឧបករណ៍ Linux បច្ចុប្បន្ន (ខឺណែល ២.៤, ២៦) "
-"អាច​រកឃើញ​តែ"
-"<ul>"
-"<li>យ៉យស្ទីក ២-អ័ក្ស, ៤-ប៊ូតុង</li>"
-"<li>យ៉យ​ស្ទីក ៣-អ័ក្សរ, ៤-ប៊ូតុង</li>"
-"<li>យ៉យស្ទីក ៤-អ័ក្សរ, ៤-ប៊ូតុង </li>"
-"<li>យ៉យស្ទីក​ឌីជីថល Saitek Cyborg</li></ul> (ចំពោះ​សេចក្តី​លម្អិត "
-"អ្នក​អាច​ពិនិត្យ​មើល Linux source/Documentation/input/joystick.txt របស់​អ្នក)"
+"<h1>យ៉យស្ទីក</h1>ម៉ូឌុល​នេះ​ជួយ​ពិនិត្យ​មើល​ថាតើ​យ៉យស្ទីក​របស់​អ្នក​ធ្វើការត្រឹមត្រូវឬទេ ។<br>ប្រសិនបើ​វា​ផ្តល់​"
+"តម្លៃ​ខុសសម្រាប់​អ័ក្ស អ្នក​អាច​សាកល្បង​ដោះស្រាយបញ្ហា​នោះ​ដោយ​ប្រើការក្រិត​តាមខ្នាត ។<br>ម៉ូឌុល​នេះ​"
+"ព្យាយាម​ស្វែងរក​ឧបករណ៍​យ៉យស្ទីក​ដែល​មាន​ទាំងអស់ ដោយ​ពិនិត្យមើល /dev/js[0-4] និង /dev/input/"
+"js[0-4]<br>ប្រសិនបើ​អ្នក​មាន​ឯកសារ​ឧបករណ៍​ផ្សេងទៀត បញ្ចូល​វា​ក្នុង​ប្រអប់បន្សំ ។<br>បញ្ជី​ប៊ូតុង​បង្ហាញ​"
+"សភាព​របស់​ប៊ូតុង​នៅ​លើយ៉យ​ស្ទីក​របស់អ្នក ។ បញ្ជី​អ័ក្ស​បង្ហាញ​តម្លៃ​បច្ចុប្បន្ន​សម្រាប់​អ័ក្សទាំងអស់ ។<br> ចំណាំ ៖ "
+"កម្មវិធី​បញ្ជា​ឧបករណ៍ Linux បច្ចុប្បន្ន (ខឺណែល ២.៤, ២៦) អាច​រកឃើញ​តែ<ul><li>យ៉យស្ទីក ២-អ័ក្ស, ៤-"
+"ប៊ូតុង</li><li>យ៉យ​ស្ទីក ៣-អ័ក្សរ, ៤-ប៊ូតុង</li><li>យ៉យស្ទីក ៤-អ័ក្សរ, ៤-ប៊ូតុង </li><li>យ៉យស្ទីក​"
+"ឌីជីថល Saitek Cyborg</li></ul> (ចំពោះ​សេចក្តី​លម្អិត អ្នក​អាច​ពិនិត្យ​មើល Linux source/"
+"Documentation/input/joystick.txt របស់​អ្នក)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -251,16 +215,13 @@ msgstr "ក្រិត​តាម​ខ្នាត"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"គ្មាន​ឧបករណ៍​យ៉យស្ទីក​ណាមួយ "
-"​ត្រូវ​បាន​រកឃើញ​ដោយ​ស្វ័យ​ប្រវត្តិ​នៅ​លើ​កុំព្យូទ័រ​នេះ ។\n"
+"គ្មាន​ឧបករណ៍​យ៉យស្ទីក​ណាមួយ ​ត្រូវ​បាន​រកឃើញ​ដោយ​ស្វ័យ​ប្រវត្តិ​នៅ​លើ​កុំព្យូទ័រ​នេះ ។\n"
 "ការពិនិត្យមើល​បាន​ធ្វើ​ក្នុង /dev/js[0-4] និង /dev/input/js[0-4]\n"
-"ប្រសិនបើ​អ្នកដឹង​ថា​មាន​ឧបករណ៍​យ៉យស្ទីក​មួយ​បាន​តភ្ជាប់ "
-"សូមបញ្ចូល​ឯកសារ​ឧបករណ៍​ត្រឹមត្រូវ ។"
+"ប្រសិនបើ​អ្នកដឹង​ថា​មាន​ឧបករណ៍​យ៉យស្ទីក​មួយ​បាន​តភ្ជាប់ សូមបញ្ចូល​ឯកសារ​ឧបករណ៍​ត្រឹមត្រូវ ។"
 
 #: joywidget.cpp:236
 msgid ""
@@ -282,19 +243,12 @@ msgstr "កំហុស​ឧបករណ៍"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>ការក្រិត​តាម​ខ្នាត​ទំនង​ជា​ពិនិត្យ​មើល​ភាពត្រឹមត្រូវ ។"
-"<br>"
-"<br><b>សូម​ផ្លាស់ទីអ័ក្សរ​ទាំងអស់​ទៅ​កាន់ទីតាំង​កណ្តាល​របស់​ពួកគេ "
-"ហើយកុំ​ប៉ះ​យ៉យ​ស្ទីក​តទៅ​ទៀត ។​</b>"
-"<br>"
-"<br>ចុច យល់ព្រម ដើម្បី​ចាប់​ផ្តើម​ការក្រិត ។</qt>"
+"<qt>ការក្រិត​តាម​ខ្នាត​ទំនង​ជា​ពិនិត្យ​មើល​ភាពត្រឹមត្រូវ ។<br><br><b>សូម​ផ្លាស់ទីអ័ក្សរ​ទាំងអស់​ទៅ​កាន់ទីតាំង​"
+"កណ្តាល​របស់​ពួកគេ ហើយកុំ​ប៉ះ​យ៉យ​ស្ទីក​តទៅ​ទៀត ។​</b><br><br>ចុច យល់ព្រម ដើម្បី​ចាប់​ផ្តើម​ការក្រិត ។</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-ko/messages/tdebase/joystick.po b/tde-i18n-ko/messages/tdebase/joystick.po
index cd483de6fad..12caa47d5fd 100644
--- a/tde-i18n-ko/messages/tdebase/joystick.po
+++ b/tde-i18n-ko/messages/tdebase/joystick.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2008-01-29 23:22+0900\n"
 "Last-Translator: Park Shinjo <peremen@gmail.com>\n"
 "Language-Team: Korean <cho.sungjae@gmail.com>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Park Shinjo"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -52,49 +52,35 @@ msgstr "(주로 Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>장치에서 전달하는 값을 검사하려고 합니다."
-"<br>"
-"<br>장치에 있는 <b>축 %1 %2</b>을(를) <b>최소값</b의 위치로 움직이십시오."
-"<br>"
-"<br>장치에 있는 어떤 단추나 '다음' 단추를 누르면 다음 단계로 넘어갑니다.</qt>"
+"<qt>장치에서 전달하는 값을 검사하려고 합니다.<br><br>장치에 있는 <b>축 %1 "
+"%2</b>을(를) <b>최소값</b의 위치로 움직이십시오.<br><br>장치에 있는 어떤 단추"
+"나 '다음' 단추를 누르면 다음 단계로 넘어갑니다.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>장치에서 전달하는 값을 검사하려고 합니다."
-"<br>"
-"<br>장치에 있는 <b>축 %1 %2</b>을(를) <b>가운데</b> 위치로 움직이십시오."
-"<br>"
-"<br>장치에 있는 어떤 단추나 '다음' 단추를 누르면 다음 단계로 넘어갑니다.</qt>"
+"<qt>장치에서 전달하는 값을 검사하려고 합니다.<br><br>장치에 있는 <b>축 %1 "
+"%2</b>을(를) <b>가운데</b> 위치로 움직이십시오.<br><br>장치에 있는 어떤 단추"
+"나 '다음' 단추를 누르면 다음 단계로 넘어갑니다.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>장치에서 전달하는 값을 검사하려고 합니다."
-"<br>"
-"<br>장치에 있는 <b>축 %1 %2</b>을(를) <b>최대값</b> 위치로 움직이십시오."
-"<br>"
-"<br>장치에 있는 어떤 단추나 '다음' 단추를 누르면 다음 단계로 넘어갑니다.</qt>"
+"<qt>장치에서 전달하는 값을 검사하려고 합니다.<br><br>장치에 있는 <b>축 %1 "
+"%2</b>을(를) <b>최대값</b> 위치로 움직이십시오.<br><br>장치에 있는 어떤 단추"
+"나 '다음' 단추를 누르면 다음 단계로 넘어갑니다.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -126,9 +112,11 @@ msgstr "조이스틱 장치 %1의 커널 드라이버를 가져올 수 없음: %
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
-msgstr "현재 실행 중인 커널 드라이버 버전 (%1.%2.%3)은 이 모듈이 컴파일된 버전 (%4.%5.%6)과 일치하지 않습니다."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
+msgstr ""
+"현재 실행 중인 커널 드라이버 버전 (%1.%2.%3)은 이 모듈이 컴파일된 버전 (%4."
+"%5.%6)과 일치하지 않습니다."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -169,33 +157,25 @@ msgstr "조이스틱을 테스트하기 위한 TDE 제어 센터 모듈"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>조이스틱</h1>이 모듈은 조이스틱이 올바르게 작동하는가 검사합니다."
-"<br>만약 축 값이 잘못되었으면 조정해 보십시오."
-"<br>이 모듈은 /dev/js[0-4]와 /dev/input/js[0-4]를 검색해서 현재 사용 가능한 모든 장치를 찾습니다."
-"<br>만약 다른 장치 파일을 사용하면 콤보 상자에 입력하십시오."
-"<br>단추 목록은 조이스틱 단추의 상태를 표시하고, 축 목록은 모든 축의 값을 표시합니다."
-"<br>메모: 현재 리눅스 장치 드라이버(커널 2.4, 2.6)에서는 "
-"<ul>"
-"<li>2축 4단추 조이스틱</li>"
-"<li>3축 4단추 조이스틱</li>"
-"<li>4축 4단추 조이스틱</li>"
-"<li>Saitek Cyborg 디지털 조이스틱</li></ul>만 자동으로 검사할 수 있습니다. 자세한 정보는 리눅스 소스 트리의 "
+"<h1>조이스틱</h1>이 모듈은 조이스틱이 올바르게 작동하는가 검사합니다.<br>만"
+"약 축 값이 잘못되었으면 조정해 보십시오.<br>이 모듈은 /dev/js[0-4]와 /dev/"
+"input/js[0-4]를 검색해서 현재 사용 가능한 모든 장치를 찾습니다.<br>만약 다른 "
+"장치 파일을 사용하면 콤보 상자에 입력하십시오.<br>단추 목록은 조이스틱 단추"
+"의 상태를 표시하고, 축 목록은 모든 축의 값을 표시합니다.<br>메모: 현재 리눅"
+"스 장치 드라이버(커널 2.4, 2.6)에서는 <ul><li>2축 4단추 조이스틱</li><li>3축 "
+"4단추 조이스틱</li><li>4축 4단추 조이스틱</li><li>Saitek Cyborg 디지털 조이스"
+"틱</li></ul>만 자동으로 검사할 수 있습니다. 자세한 정보는 리눅스 소스 트리의 "
 "Documentation/input/joystick.txt를 참고하십시오."
 
 #: joywidget.cpp:43
@@ -236,14 +216,13 @@ msgstr "조정"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"이 컴퓨터에서 조이스틱 장치가 검사되지 않았습니다."
-"<br>/dev/js[0-4]와 /dev/input/js[0-4]를 검사해 보았습니다."
-"<br>만약 정확한 경로를 알고 있다면, 장치 파일의 경로를 입력하십시오."
+"이 컴퓨터에서 조이스틱 장치가 검사되지 않았습니다.<br>/dev/js[0-4]와 /dev/"
+"input/js[0-4]를 검사해 보았습니다.<br>만약 정확한 경로를 알고 있다면, 장치 파"
+"일의 경로를 입력하십시오."
 
 #: joywidget.cpp:236
 msgid ""
@@ -264,18 +243,13 @@ msgstr "장치 오류"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>정밀도를 검사하려고 합니다."
-"<br>"
-"<br><b>모든 축을 중앙 위치로 이동하시고 조이스틱을 만지지 마십시오.</b>"
-"<br>"
-"<br>확인 단추를 누르면 조정을 시작합니다.</qt>"
+"<qt>정밀도를 검사하려고 합니다.<br><br><b>모든 축을 중앙 위치로 이동하시고 조"
+"이스틱을 만지지 마십시오.</b><br><br>확인 단추를 누르면 조정을 시작합니다.</"
+"qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-lt/messages/tdebase/joystick.po b/tde-i18n-lt/messages/tdebase/joystick.po
index 83d521eedbc..b6d551763c0 100644
--- a/tde-i18n-lt/messages/tdebase/joystick.po
+++ b/tde-i18n-lt/messages/tdebase/joystick.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-11-15 07:31+0200\n"
 "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -12,16 +12,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,35 +51,27 @@ msgstr ""
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr "<qt> yra<br><br><b></b> įj.<b></b><br><br> įj. tolesnis</qt>"
 
 #: caldialog.cpp:107
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr "<qt> yra<br><br><b></b> įj.<b></b><br><br> įj. tolesnis</qt>"
 
 #: caldialog.cpp:124
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr "<qt> yra<br><br><b></b> įj.<b></b><br><br> įj. tolesnis</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -119,8 +111,8 @@ msgstr "gauti versija kol 2"
 #: joydevice.cpp:80
 #, fuzzy
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr "versija yra Å¡is kol."
 
 #: joydevice.cpp:87
@@ -171,21 +163,16 @@ msgstr "TDE Valdymas Centre Modulis"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 
 #: joywidget.cpp:43
@@ -234,10 +221,9 @@ msgstr ""
 #: joywidget.cpp:190
 #, fuzzy
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr "Ne įj. Å¡is col. ir tu yra prisegtas."
 
 #: joywidget.cpp:236
@@ -260,12 +246,9 @@ msgstr "Įrenginys Klaida"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 
 #: joywidget.cpp:372
diff --git a/tde-i18n-mk/messages/tdebase/joystick.po b/tde-i18n-mk/messages/tdebase/joystick.po
index bc7301f88b1..77ae585f9f5 100644
--- a/tde-i18n-mk/messages/tdebase/joystick.po
+++ b/tde-i18n-mk/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-12-16 12:58+0100\n"
 "Last-Translator: Bozidar Proevski <bobibobi@freemail.com.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Божидар Проевски"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -49,58 +49,41 @@ msgstr "(обично Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Калибрацијата се подготвува да го провери опсегот на вредности кои ги дава "
-"вашиот уред."
-"<br>"
-"<br>Ве молиме поместете ја <b>оската %1 %2</b> на вашиот уред во <b>"
-"минималната</b> позиција."
-"<br>"
-"<br>Притиснете кое било копче на уредот или кликнете на копчето „Следно“ за да "
-"продолжите со наредниот чекор.</qt>"
+"<qt>Калибрацијата се подготвува да го провери опсегот на вредности кои ги "
+"дава вашиот уред.<br><br>Ве молиме поместете ја <b>оската %1 %2</b> на "
+"вашиот уред во <b>минималната</b> позиција.<br><br>Притиснете кое било копче "
+"на уредот или кликнете на копчето „Следно“ за да продолжите со наредниот "
+"чекор.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Калибрацијата се подготвува да го провери опсегот на вредности кои ги дава "
-"вашиот уред."
-"<br>"
-"<br>Ве молиме поместете ја <b>оската %1 %2</b> на вашиот уред во <b>средната</b> "
-"позиција."
-"<br>"
-"<br>Притиснете кое било копче на уредот или кликнете на копчето „Следно“ за да "
-"продолжите со наредниот чекор.</qt>"
+"<qt>Калибрацијата се подготвува да го провери опсегот на вредности кои ги "
+"дава вашиот уред.<br><br>Ве молиме поместете ја <b>оската %1 %2</b> на "
+"вашиот уред во <b>средната</b> позиција.<br><br>Притиснете кое било копче на "
+"уредот или кликнете на копчето „Следно“ за да продолжите со наредниот чекор."
+"</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Калибрацијата се подготвува да го провери опсегот на вредности кои ги дава "
-"вашиот уред."
-"<br>"
-"<br>Ве молиме поместете ја <b>оската %1 %2</b> на вашиот уред во <b>"
-"максималната</b> позиција."
-"<br>"
-"<br>Притиснете кое било копче на уредот или кликнете на копчето „Следно“ за да "
-"продолжите со наредниот чекор.</qt>"
+"<qt>Калибрацијата се подготвува да го провери опсегот на вредности кои ги "
+"дава вашиот уред.<br><br>Ве молиме поместете ја <b>оската %1 %2</b> на "
+"вашиот уред во <b>максималната</b> позиција.<br><br>Притиснете кое било "
+"копче на уредот или кликнете на копчето „Следно“ за да продолжите со "
+"наредниот чекор.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -133,11 +116,11 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Моментално активниот управувач за кернел верзија (%1.%2.%3) не е истиот за кој "
-"што е преведен овој модул (%4.%5.%6)."
+"Моментално активниот управувач за кернел верзија (%1.%2.%3) не е истиот за "
+"кој што е преведен овој модул (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -179,39 +162,29 @@ msgstr "TDE Модул од Контролниот центар за тести�
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Џојстик</h1>Овој модул ви помага да проверите дали вашиот џојстик работи "
-"исправно."
-"<br>Ако дава погрешни вредности за оските, може да се обидете да го решите ова "
-"со калибрација."
-"<br>Овој модул пробува да ги најде сите достапни уреди за џојстици со "
-"проверување на /dev/js[0-4] и /dev/input/js[0-4]"
-"<br> Ако имате уште некој уред, внесете го во комбо полето."
-"<br>Листата  Копчиња ја покажува состојбата на копчињата на вашиот џојстик а "
-"листата Оски ги покажува моменталните вредности за сите оски."
-"<br>ЗАБЕЛЕШКА: моменталниот управувач на уреди во Линукс (кернел 2.4, 2.6) може "
-"да препознае само "
-"<ul>"
-"<li>џојстик со 2 оски, 4 копчиња</li>"
-"<li>џојстик со 3 оски, 4 копчиња</li>"
-"<li>џојстик со 4 оски, 4 копчиња</li>"
-"<li>Saitek Cyborg 'дигитални' џојстици</li></ul>(За детали проверете во вашиот "
-"Линукс source/Documentation/input/joystick.txt)"
+"исправно.<br>Ако дава погрешни вредности за оските, може да се обидете да го "
+"решите ова со калибрација.<br>Овој модул пробува да ги најде сите достапни "
+"уреди за џојстици со проверување на /dev/js[0-4] и /dev/input/js[0-4]<br> "
+"Ако имате уште некој уред, внесете го во комбо полето.<br>Листата  Копчиња "
+"ја покажува состојбата на копчињата на вашиот џојстик а листата Оски ги "
+"покажува моменталните вредности за сите оски.<br>ЗАБЕЛЕШКА: моменталниот "
+"управувач на уреди во Линукс (кернел 2.4, 2.6) може да препознае само "
+"<ul><li>џојстик со 2 оски, 4 копчиња</li><li>џојстик со 3 оски, 4 копчиња</"
+"li><li>џојстик со 4 оски, 4 копчиња</li><li>Saitek Cyborg 'дигитални' "
+"џојстици</li></ul>(За детали проверете во вашиот Линукс source/Documentation/"
+"input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -251,14 +224,13 @@ msgstr "Калибрирај"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Нема автоматски пронајден џојстик на овој компјутер."
-"<br>Беа направени проверки во /dev/js[0-4] и /dev/input/js[0-4]."
-"<br>Ако знаете дека има прикачен џојстик, внесете го коректниот уред."
+"Нема автоматски пронајден џојстик на овој компјутер.<br>Беа направени "
+"проверки во /dev/js[0-4] и /dev/input/js[0-4].<br>Ако знаете дека има "
+"прикачен џојстик, внесете го коректниот уред."
 
 #: joywidget.cpp:236
 msgid ""
@@ -280,19 +252,14 @@ msgstr "Грешка во уредот"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Калибрацијата се подготвува да ја провери прецизноста."
-"<br>"
-"<br><b>Ве молиме поместете ги сите оски во нивната средна позиција и повеќе не "
-"го допирајте џојстикот.</b>"
-"<br>"
-"<br>Кликнете на Во ред за да ја започнете калибрацијата.</qt>"
+"<qt>Калибрацијата се подготвува да ја провери прецизноста.<br><br><b>Ве "
+"молиме поместете ги сите оски во нивната средна позиција и повеќе не го "
+"допирајте џојстикот.</b><br><br>Кликнете на Во ред за да ја започнете "
+"калибрацијата.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-ms/messages/tdebase/joystick.po b/tde-i18n-ms/messages/tdebase/joystick.po
index b899e697b6c..87812ad9199 100644
--- a/tde-i18n-ms/messages/tdebase/joystick.po
+++ b/tde-i18n-ms/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-09-05 10:00+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Muhammad Najmi bin Ahmad Zabidi, Sharuzzaman Ahmat Raslan"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -49,54 +49,38 @@ msgstr "(kebiasaannya Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Tentukuran akan memeriksa julat nilai yang peranti anda boleh berikan."
-"<br>"
-"<br>Sila gerakkan <b>paksi %1 %2</b> pada peranti anda ke posisi <b>minimum</b>"
-"."
-"<br>"
-"<br>Tekan sebarang butang pada peranti atau klik pada butang 'Maju' untuk "
-"meneruskan dengan langkah seterusnya.</qt>"
+"<br><br>Sila gerakkan <b>paksi %1 %2</b> pada peranti anda ke posisi "
+"<b>minimum</b>.<br><br>Tekan sebarang butang pada peranti atau klik pada "
+"butang 'Maju' untuk meneruskan dengan langkah seterusnya.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Tentukuran akan memeriksa julat nilai yang peranti anda boleh berikan."
-"<br>"
-"<br>Sila gerakkan <b>paksi %1 %2</b> pada peranti anda ke posisi <b>tengah</b>."
-"<br>"
-"<br>Tekan sebarang butang pada peranti atau klik pada butang 'Maju' untuk "
-"meneruskan dengan langkah seterusnya.</qt>"
+"<br><br>Sila gerakkan <b>paksi %1 %2</b> pada peranti anda ke posisi "
+"<b>tengah</b>.<br><br>Tekan sebarang butang pada peranti atau klik pada "
+"butang 'Maju' untuk meneruskan dengan langkah seterusnya.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Tentukuran akan memeriksa julat nilai yang peranti anda boleh berikan."
-"<br>"
-"<br>Sila gerakkan <b>paksi %1 %2</b> pada peranti anda ke posisi <b>maksimum</b>"
-"."
-"<br>"
-"<br>Tekan sebarang butang pada peranti atau klik pada butang 'Maju' untuk "
-"meneruskan dengan langkah seterusnya.</qt>"
+"<br><br>Sila gerakkan <b>paksi %1 %2</b> pada peranti anda ke posisi "
+"<b>maksimum</b>.<br><br>Tekan sebarang butang pada peranti atau klik pada "
+"butang 'Maju' untuk meneruskan dengan langkah seterusnya.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -125,12 +109,13 @@ msgstr "Peranti %1 diberi bukan pedal permainan."
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
 msgstr ""
-"Tidak boleh mendapat versi pemandu kernel untuk peranti pedal permainan %1: %2"
+"Tidak boleh mendapat versi pemandu kernel untuk peranti pedal permainan %1: "
+"%2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "Versi pemandu kernel semasa yang dilaksanakan (%1.%2.%3) adalah bukan untuk "
 "modul ini yang dihimpun untuknya (%4.%5.%6)."
@@ -179,39 +164,30 @@ msgstr "Pusat Kawalan Modul TDE  untuk menguji Pedal Permainan"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Pedal permainan</h1>Modul ini membantu untuk memeriksa sama ada pedal "
-"permainan anda berfungsi dengan betul."
-"<br>Jika ia memberikan nilai yang salah untuk paksinya, anda boleh mencuba "
-"untuk menyelesaikannya dengan tentukuran."
-"<br>Modul ini cuba mencari semua peranti pedal permainan yang ada dengan "
-"memeriksa /dev/js[0-4] dan /dev/input/js[0-4]"
-"<br>Jika anda mempunyai fail peranti lain, masukkannya dalam kekotak kombo."
-"<br>Senarai Butang memaparkan keadaan butang pada pedal permainan anda, senarai "
-"Paksi memaparkan nilai semasa untuk semua paksi."
-"<br>NOTA: pemandu peranti Linux semasa (Kernel 2.4, 2.6) hanya boleh autokesan"
-"<ul>"
-"<li>pedal permainan 2-paksi, 4 butang</li>"
-"<li>pedal permainan 3-paksi, 4 butang</li>"
-"<li>pedal permainan 4-paksi, 4-butang</li>"
-"<li></li>pedal permainan Saitek Cyborg 'digital'</ul>"
-"(Untuk perincian anda boleh memeriksa sumber "
-"Linux/Documentation/input/joystick.txt)"
+"permainan anda berfungsi dengan betul.<br>Jika ia memberikan nilai yang "
+"salah untuk paksinya, anda boleh mencuba untuk menyelesaikannya dengan "
+"tentukuran.<br>Modul ini cuba mencari semua peranti pedal permainan yang ada "
+"dengan memeriksa /dev/js[0-4] dan /dev/input/js[0-4]<br>Jika anda mempunyai "
+"fail peranti lain, masukkannya dalam kekotak kombo.<br>Senarai Butang "
+"memaparkan keadaan butang pada pedal permainan anda, senarai Paksi "
+"memaparkan nilai semasa untuk semua paksi.<br>NOTA: pemandu peranti Linux "
+"semasa (Kernel 2.4, 2.6) hanya boleh autokesan<ul><li>pedal permainan 2-"
+"paksi, 4 butang</li><li>pedal permainan 3-paksi, 4 butang</li><li>pedal "
+"permainan 4-paksi, 4-butang</li><li></li>pedal permainan Saitek Cyborg "
+"'digital'</ul>(Untuk perincian anda boleh memeriksa sumber Linux/"
+"Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -251,15 +227,14 @@ msgstr "Tentukur"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Tiada peranti pedal permainan dijumpai secara automatik pada komputer ini."
-"<br>Pemeriksaan telah dibuat pada /dev/js[0-4] dan /dev/input/js[0-4]"
-"<br>Jika anda tahu terdapat peranti telah dipasang, sila masukkan fail peranti "
-"yang betul."
+"<br>Pemeriksaan telah dibuat pada /dev/js[0-4] dan /dev/input/"
+"js[0-4]<br>Jika anda tahu terdapat peranti telah dipasang, sila masukkan "
+"fail peranti yang betul."
 
 #: joywidget.cpp:236
 msgid ""
@@ -281,19 +256,13 @@ msgstr "Ralat Peranti"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Tentukuran akan menguji ketepatan."
-"<br>"
-"<br><b>Sila gerakkan semua paksi ke posisi tengah dan jangan sentuh pedal "
-"permainan lagi.</b>"
-"<br>"
-"<br>Klik OK untuk memulakan tentukuran</qt>"
+"<qt>Tentukuran akan menguji ketepatan.<br><br><b>Sila gerakkan semua paksi "
+"ke posisi tengah dan jangan sentuh pedal permainan lagi.</b><br><br>Klik OK "
+"untuk memulakan tentukuran</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-nb/messages/tdebase/joystick.po b/tde-i18n-nb/messages/tdebase/joystick.po
index a51ad15088c..9e859d91bf1 100644
--- a/tde-i18n-nb/messages/tdebase/joystick.po
+++ b/tde-i18n-nb/messages/tdebase/joystick.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-11-07 20:37+0100\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Bjørn Steensrud"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -53,52 +53,38 @@ msgstr "(vanligvis Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Justeringsprosessen skal til å undersøke omfanget av signal fra enheten."
-"<br>"
-"<br>Flytt <b>akse %1 %2</b> på enheten til <b>minste</b> posisjon."
-"<br>"
-"<br> Trykk en knapp på enheten eller velg «Neste» for å fortsette med neste "
-"steg.</qt>"
+"<br><br>Flytt <b>akse %1 %2</b> på enheten til <b>minste</b> posisjon."
+"<br><br> Trykk en knapp på enheten eller velg «Neste» for å fortsette med "
+"neste steg.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Justeringsprosessen skal til å undersøke omfanget av signaler fra enheten."
-"<br>"
-"<br>Flytt <b>akse %1 %2</b> på enheten til <b>midtre</b> posisjon."
-"<br>"
-"<br>Trykk en knapp på enheten eller velg «Neste» for å fortsette med neste "
-"steg.</qt>"
+"<qt>Justeringsprosessen skal til å undersøke omfanget av signaler fra "
+"enheten.<br><br>Flytt <b>akse %1 %2</b> på enheten til <b>midtre</b> "
+"posisjon.<br><br>Trykk en knapp på enheten eller velg «Neste» for å "
+"fortsette med neste steg.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Justeringsprosessen skal til å undersøke omfanget av signaler fra enheten."
-"<br>"
-"<br>Flytt <b>akse %1 %2</b> på enheten til <b>høyeste</b> posisjon."
-"<br>"
-"<br> Trykk en knapp på enheten eller velg «Neste» for å fortsette med neste "
-"steg.</qt>"
+"<qt>Justeringsprosessen skal til å undersøke omfanget av signaler fra "
+"enheten.<br><br>Flytt <b>akse %1 %2</b> på enheten til <b>høyeste</b> "
+"posisjon.<br><br> Trykk en knapp på enheten eller velg «Neste» for å "
+"fortsette med neste steg.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -130,11 +116,11 @@ msgstr "Klarte ikke hente kjernedriverversjon for styrespakenheten %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Den kjernedriveren som går nå (versjon %1.%2.%3) er ikke den som denne modulen "
-"ble kompilert for (%4.%5.%6)."
+"Den kjernedriveren som går nå (versjon %1.%2.%3) er ikke den som denne "
+"modulen ble kompilert for (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -156,8 +142,8 @@ msgstr ""
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"Klarte ikke finne oppstartsverdiene for innstillinga av styrespak-enheten %1: "
-"%2"
+"Klarte ikke finne oppstartsverdiene for innstillinga av styrespak-enheten "
+"%1: %2"
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
@@ -178,38 +164,29 @@ msgstr "TDE Kontrollpanelmodul for å teste styrespaker"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Styrespak</h1> Denne modulen hjelper til med å se etter at styrespaken "
-"virker riktig."
-"<br>Hvis spaken gir feil verdier for aksene kan du forsøke å rette dette med "
-"oppstartsinnstillingene."
-"<br>Modulen forsøker å finne alle tilgjengelige styrespakenheter ved å "
-"undersøke /dev/js[0-4] og /dev/input/js[0-4]"
-"<br>Hvis du har en annen enhetsfil kan du oppgi den i kombinasjonsboksen."
-"<br>Lista «Knapper» viser tilstanden for alle knapper på styrespaken, og lista "
-"«akser» viser gjeldende verdi for alle akser. "
-"<br> MERK: Enhetsdriveren for Linux (kjerne 2.4, 2.6) kan automatisk bare finne "
-"<ul>"
-"<li> styrespak med 2 akser, 4 knapper</li>"
-"<li> styrespak med 3 akser, 4 knapper</li>"
-"<li> styrespak med 4 akser, 4 knapper</li>"
-"<li>Saitek Cyborg digitale styrespaker</li></ul> (Mer detaljer finner du i "
-"kildekoden for Linux: Documentation/input/joystick.txt)"
+"virker riktig.<br>Hvis spaken gir feil verdier for aksene kan du forsøke å "
+"rette dette med oppstartsinnstillingene.<br>Modulen forsøker å finne alle "
+"tilgjengelige styrespakenheter ved å undersøke /dev/js[0-4] og /dev/input/"
+"js[0-4]<br>Hvis du har en annen enhetsfil kan du oppgi den i "
+"kombinasjonsboksen.<br>Lista «Knapper» viser tilstanden for alle knapper på "
+"styrespaken, og lista «akser» viser gjeldende verdi for alle akser. <br> "
+"MERK: Enhetsdriveren for Linux (kjerne 2.4, 2.6) kan automatisk bare finne "
+"<ul><li> styrespak med 2 akser, 4 knapper</li><li> styrespak med 3 akser, 4 "
+"knapper</li><li> styrespak med 4 akser, 4 knapper</li><li>Saitek Cyborg "
+"digitale styrespaker</li></ul> (Mer detaljer finner du i kildekoden for "
+"Linux: Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -249,14 +226,13 @@ msgstr "Oppstartsinnstilling"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Ingen styrespak-enhet ble oppdaget automatisk på denne maskina."
-"<br>Det ble lett i /dev/js[0-4] og /dev/input/js[0-4]."
-"<br>Dersom du vet at en spak er tilkoblet, kan du prøve å oppgi rett enhetsfil."
+"Ingen styrespak-enhet ble oppdaget automatisk på denne maskina.<br>Det ble "
+"lett i /dev/js[0-4] og /dev/input/js[0-4].<br>Dersom du vet at en spak er "
+"tilkoblet, kan du prøve å oppgi rett enhetsfil."
 
 #: joywidget.cpp:236
 msgid ""
@@ -278,18 +254,13 @@ msgstr "Enhetsfeil"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Oppstartsinnstillinga skal til å undersøke presisjonen."
-"<br>"
-"<br><b>Sett alle akser i senterstilling og rør deretter ikke på styrespaken.</b>"
-"<br>"
-"<br>Trykk OK for å starte oppstartsinnstillinga </qt>"
+"<qt>Oppstartsinnstillinga skal til å undersøke presisjonen.<br><br><b>Sett "
+"alle akser i senterstilling og rør deretter ikke på styrespaken.</"
+"b><br><br>Trykk OK for å starte oppstartsinnstillinga </qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-nds/messages/tdebase/joystick.po b/tde-i18n-nds/messages/tdebase/joystick.po
index 39ed90e3b42..ccc7a6551f6 100644
--- a/tde-i18n-nds/messages/tdebase/joystick.po
+++ b/tde-i18n-nds/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2006-11-04 00:59+0100\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Sönke Dibbern"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -49,57 +49,40 @@ msgstr "(normalerwies Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>För't Afstimmen warrt nu keken, binnen welk Grenzen de Weerten liggt, de "
-"Dien Reedschap utgifft."
-"<br>"
-"<br>Bitte beweeg dat Ingaavelement vun Dien Reedschap langs de <b>Ass %1 %2</b> "
-"na de <b>Minimaalpositschoon</b>."
-"<br>"
-"<br>Drück op jichtenseen Knoop vun de Reedschap oder klick op den "
+"Dien Reedschap utgifft.<br><br>Bitte beweeg dat Ingaavelement vun Dien "
+"Reedschap langs de <b>Ass %1 %2</b> na de <b>Minimaalpositschoon</b>."
+"<br><br>Drück op jichtenseen Knoop vun de Reedschap oder klick op den "
 "\"Nakamen\"-Knoop, wenn Du na den nakamen Schritt gahn wullt.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>För't Afstimmen warrt nu keken, binnen welk Grenzen de Weerten liggt, de "
-"Dien Reedschap utgifft."
-"<br>"
-"<br>Bitte beweeg dat Ingaavelement vun Dien Reedschap langs de <b>Ass %1 %2</b> "
-"na de <b>Mittpositschoon</b>."
-"<br>"
-"<br>Drück op jichtenseen Knoop vun de Reedschap oder klick op den "
+"Dien Reedschap utgifft.<br><br>Bitte beweeg dat Ingaavelement vun Dien "
+"Reedschap langs de <b>Ass %1 %2</b> na de <b>Mittpositschoon</b>."
+"<br><br>Drück op jichtenseen Knoop vun de Reedschap oder klick op den "
 "\"Nakamen\"-Knoop, wenn Du na den nakamen Schritt gahn wullt.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>För't Afstimmen warrt nu keken, binnen welk Grenzen de Weerten liggt, de "
-"Dien Reedschap utgifft."
-"<br>"
-"<br>Bitte beweeg dat Ingaavelement vun Dien Reedschap langs de <b>Ass %1 %2</b> "
-"na de <b>Maximaalpositschoon</b>."
-"<br>"
-"<br>Drück op jichtenseen Knoop vun de Reedschap oder klick op den "
+"Dien Reedschap utgifft.<br><br>Bitte beweeg dat Ingaavelement vun Dien "
+"Reedschap langs de <b>Ass %1 %2</b> na de <b>Maximaalpositschoon</b>."
+"<br><br>Drück op jichtenseen Knoop vun de Reedschap oder klick op den "
 "\"Nakamen\"-Knoop, wenn Du na den nakamen Schritt gahn wullt.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -134,11 +117,11 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"De jüst lopen Kernel-Drieververschoon (%1.%2.%3) is nich de sülve as de, för de "
-"dit Moduul kompileert wöör (%4.%5.%6)."
+"De jüst lopen Kernel-Drieververschoon (%1.%2.%3) is nich de sülve as de, för "
+"de dit Moduul kompileert wöör (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -164,8 +147,8 @@ msgstr ""
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"De Afstimmweerten för de Joystick-Reedschap \"%1\" laat sik nich torechtmaken: "
-"%2"
+"De Afstimmweerten för de Joystick-Reedschap \"%1\" laat sik nich "
+"torechtmaken: %2"
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
@@ -187,40 +170,30 @@ msgstr "TDE-Kuntrullzentrummoduul för dat Utproberen vun Joysticks"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Joystick</h1>Dit Moduul hölpt bi dat Utproberen, wat Dien Joystick richtig "
-"warkt."
-"<br>Wenn he verkehrte Weerten för de Assen utgifft, kannst versöken, dat mit en "
-"Afstimmen to lösen."
-"<br>Dit Moduul versöcht, all verföögbore Joystick-Reedschappen to finnen, dor "
-"pröövt dat /dev/js[0-4] un /dev/input/js[0-4] för."
-"<br>Wenn Du en anner Reedschapdatei bruukst, kannst Du dat in dat "
-"Utwahl-Textfeld ingeven."
-"<br>De Knööplist wiest den Tostand vun de Knööp op Dien Reedschap, de Assenlist "
-"wiest de aktuellen Weerten för all Assen."
-"<br>Beacht bitte: De aktuelle Linux-Driever (Kernel 2.4, 2.6) kann bloots disse "
-"Reedschappen automaatsch wedderkennen: "
-"<ul>"
-"<li>Joystick mit 2 Assen un 4 Knööp</li>"
-"<li>Joystick mit 3 Assen un 4 Knööp</li>"
-"<li>Joystick mit 4 Assen un 4 Knööp</li>"
-"<li>Joystick \"Saitek Cyborg digital\"</li></ul>(Wenn Du mehr weten wullt, kiek "
-"binnen den Linux-Bornkode ünner Documentation/input/joystick.txt.)"
+"<h1>Joystick</h1>Dit Moduul hölpt bi dat Utproberen, wat Dien Joystick "
+"richtig warkt.<br>Wenn he verkehrte Weerten för de Assen utgifft, kannst "
+"versöken, dat mit en Afstimmen to lösen.<br>Dit Moduul versöcht, all "
+"verföögbore Joystick-Reedschappen to finnen, dor pröövt dat /dev/js[0-4] un /"
+"dev/input/js[0-4] för.<br>Wenn Du en anner Reedschapdatei bruukst, kannst Du "
+"dat in dat Utwahl-Textfeld ingeven.<br>De Knööplist wiest den Tostand vun de "
+"Knööp op Dien Reedschap, de Assenlist wiest de aktuellen Weerten för all "
+"Assen.<br>Beacht bitte: De aktuelle Linux-Driever (Kernel 2.4, 2.6) kann "
+"bloots disse Reedschappen automaatsch wedderkennen: <ul><li>Joystick mit 2 "
+"Assen un 4 Knööp</li><li>Joystick mit 3 Assen un 4 Knööp</li><li>Joystick "
+"mit 4 Assen un 4 Knööp</li><li>Joystick \"Saitek Cyborg digital\"</li></"
+"ul>(Wenn Du mehr weten wullt, kiek binnen den Linux-Bornkode ünner "
+"Documentation/input/joystick.txt.)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -260,15 +233,14 @@ msgstr "Afstimmen"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Op dissen Reekner lett sik keen Joystick-Reedschap finnen."
-"<br>De Reedschapdateien /dev/js[0-4] un /dev/input/js[0-4] sünd pröövt worrn."
-"<br>Wenn Du weetst, dat een tokoppelt is, giff bitte de richtige Reedschapdatei "
-"in."
+"Op dissen Reekner lett sik keen Joystick-Reedschap finnen.<br>De "
+"Reedschapdateien /dev/js[0-4] un /dev/input/js[0-4] sünd pröövt worrn."
+"<br>Wenn Du weetst, dat een tokoppelt is, giff bitte de richtige "
+"Reedschapdatei in."
 
 #: joywidget.cpp:236
 msgid ""
@@ -290,19 +262,13 @@ msgstr "Reedschap-Fehler"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>För't Afstimmen warrt nu de Nauigkeit pröövt."
-"<br>"
-"<br><b>Bitte beweeg all Ingaavelementen na se ehr Mittpositschoon un röhr se "
-"denn nich mehr an.</b>"
-"<br>"
-"<br>Klick OK, wenn Du dat Afstimmen starten wullt.</qt>"
+"<qt>För't Afstimmen warrt nu de Nauigkeit pröövt.<br><br><b>Bitte beweeg all "
+"Ingaavelementen na se ehr Mittpositschoon un röhr se denn nich mehr an.</"
+"b><br><br>Klick OK, wenn Du dat Afstimmen starten wullt.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-nl/messages/tdebase/joystick.po b/tde-i18n-nl/messages/tdebase/joystick.po
index b40f8f12925..a1a8c3b55d6 100644
--- a/tde-i18n-nl/messages/tdebase/joystick.po
+++ b/tde-i18n-nl/messages/tdebase/joystick.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-09-19 23:08+0200\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Tom Albers"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -54,52 +54,38 @@ msgstr "(meestal Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibratie gaat het waardenbereik van uw joystick bepalen."
-"<br>"
-"<br>Beweeg <b>as %1 %2</b> op uw joystick naar de <b>minimale</b> positie."
-"<br>"
-"<br>Druk vervolgens op een willekeurige knop op de joystick of op de knop "
-"'Volgende' om naar de volgende stap te gaan.</qt>"
+"<qt>Kalibratie gaat het waardenbereik van uw joystick bepalen.<br><br>Beweeg "
+"<b>as %1 %2</b> op uw joystick naar de <b>minimale</b> positie.<br><br>Druk "
+"vervolgens op een willekeurige knop op de joystick of op de knop 'Volgende' "
+"om naar de volgende stap te gaan.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibratie gaat het waardenbereik van uw joystick bepalen."
-"<br>"
-"<br>Beweeg <b>as %1 %2</b> op uw joystick naar de <b>midden</b>positie."
-"<br>"
-"<br>Druk vervolgens op een willekeurige knop op de joystick, of op de knop "
-"'Volgende' om naar de volgende stap te gaan.</qt>"
+"<qt>Kalibratie gaat het waardenbereik van uw joystick bepalen.<br><br>Beweeg "
+"<b>as %1 %2</b> op uw joystick naar de <b>midden</b>positie.<br><br>Druk "
+"vervolgens op een willekeurige knop op de joystick, of op de knop 'Volgende' "
+"om naar de volgende stap te gaan.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibratie gaat het waardenbereik van uw joystick bepalen."
-"<br>"
-"<br>Beweeg <b>as %1 %2</b> op uw joystick naar de <b>maximale</b> positie."
-"<br>"
-"<br>Druk vervolgens op een willekeurige knop op de joystick of op de knop "
-"'Volgende' om naar de volgende stap door te gaan.</qt>"
+"<qt>Kalibratie gaat het waardenbereik van uw joystick bepalen.<br><br>Beweeg "
+"<b>as %1 %2</b> op uw joystick naar de <b>maximale</b> positie.<br><br>Druk "
+"vervolgens op een willekeurige knop op de joystick of op de knop 'Volgende' "
+"om naar de volgende stap door te gaan.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -131,11 +117,11 @@ msgstr "Kan geen kernelstuurprogramma voor joystick %1 vinden: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"De huidige kernelstuurprogrammaversie (%1.%2.%3) is niet identiek aan de versie "
-"waarvoor de module gecompileerd is (%4.%5.%6)."
+"De huidige kernelstuurprogrammaversie (%1.%2.%3) is niet identiek aan de "
+"versie waarvoor de module gecompileerd is (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -176,40 +162,29 @@ msgstr "TDE Configuratiecentrummodule om joysticks te testen"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Joystick</h1>Deze module helpt om te controleren of uw joystick correct "
-"functioneert."
-"<br>Indien het verkeerde waarden teruggeeft voor de verschillende assen, kunt u "
-"dit oplossen via calibratie."
-"<br>Deze module probeert alle joysticks te vinden door de apparaten "
-"/dev/js[0-4] en /dev/input/js[0-4] te controleren."
-"<br>Indien een ander apparaat gebruikt wordt, dan kunt u dat invullen in het "
-"invulveld."
-"<br>De lijst met knoppen toont de status van de knoppen van de joystick. De "
-"lijst met assen toont de huidige waarden van alle assen."
-"<br>Let op: de huidige Linux stuurprogramma's (kernel 2.4, 2.6) kunnen alleen "
-"de volgende joysticks automatisch herkennen:"
-"<ul>"
-"<li>2 assen, 4 knoppen</li>"
-"<li>3 assen, 4 knoppen</li>"
-"<li>4 assen, 4 knoppen</li>"
-"<li>Saitek Cyborg digital</li></ul>Voor meer informatie kunt u de documentatie "
-"raadplegen in een submap van uw Linux-broncode "
+"functioneert.<br>Indien het verkeerde waarden teruggeeft voor de "
+"verschillende assen, kunt u dit oplossen via calibratie.<br>Deze module "
+"probeert alle joysticks te vinden door de apparaten /dev/js[0-4] en /dev/"
+"input/js[0-4] te controleren.<br>Indien een ander apparaat gebruikt wordt, "
+"dan kunt u dat invullen in het invulveld.<br>De lijst met knoppen toont de "
+"status van de knoppen van de joystick. De lijst met assen toont de huidige "
+"waarden van alle assen.<br>Let op: de huidige Linux stuurprogramma's (kernel "
+"2.4, 2.6) kunnen alleen de volgende joysticks automatisch herkennen:"
+"<ul><li>2 assen, 4 knoppen</li><li>3 assen, 4 knoppen</li><li>4 assen, 4 "
+"knoppen</li><li>Saitek Cyborg digital</li></ul>Voor meer informatie kunt u "
+"de documentatie raadplegen in een submap van uw Linux-broncode "
 "(Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
@@ -250,15 +225,13 @@ msgstr "Kalibreren"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Er is geen joystick op uw computer gevonden."
-"<br>De detectie is uitgevoerd op /dev/js[0-4] en /dev/input/js[0-4]"
-"<br>Indien u zeker weet dat de joystick is aangesloten kunt u het juiste "
-"apparaat invoeren."
+"Er is geen joystick op uw computer gevonden.<br>De detectie is uitgevoerd "
+"op /dev/js[0-4] en /dev/input/js[0-4]<br>Indien u zeker weet dat de joystick "
+"is aangesloten kunt u het juiste apparaat invoeren."
 
 #: joywidget.cpp:236
 msgid ""
@@ -280,19 +253,13 @@ msgstr "Apparaatfout"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibratie gaat de precisie controleren."
-"<br>"
-"<br><b>Plaats alle assen in de middelste positie en laat de joystick vervolgens "
-"helemaal los</b>"
-"<br>"
-"<br>Klik op OK om de calibratie te starten.</qt>"
+"<qt>Kalibratie gaat de precisie controleren.<br><br><b>Plaats alle assen in "
+"de middelste positie en laat de joystick vervolgens helemaal los</"
+"b><br><br>Klik op OK om de calibratie te starten.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-nn/messages/tdebase/joystick.po b/tde-i18n-nn/messages/tdebase/joystick.po
index 54c765671e2..5b9604f1c06 100644
--- a/tde-i18n-nn/messages/tdebase/joystick.po
+++ b/tde-i18n-nn/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2006-06-22 17:11+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "X-Generator: Emacs 22.0.50.1, po-mode 2.01.ghk.1\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Gaute Hvoslef Kvalnes"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -50,52 +50,38 @@ msgstr "(vanlegvis Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibreringsprosessen skal til å undersøkja omfanget av signal frå eininga."
-"<br>"
-"<br>Flytt <b>akse %1 %2</b> på eininga til <b>minste</b> posisjon."
-"<br>"
-"<br> Trykk ein knapp på eininga eller vel «Neste» for å halda fram med neste "
-"steg.</qt>"
+"<qt>Kalibreringsprosessen skal til å undersøkja omfanget av signal frå "
+"eininga.<br><br>Flytt <b>akse %1 %2</b> på eininga til <b>minste</b> "
+"posisjon.<br><br> Trykk ein knapp på eininga eller vel «Neste» for å halda "
+"fram med neste steg.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibreringsprosessen skal til å undersøkja omfanget av signal frå eininga."
-"<br>"
-"<br>Flytt <b>akse %1 %2</b> på eininga til <b>midtre</b> posisjon."
-"<br>"
-"<br> Trykk ein knapp på eininga eller vel «Neste» for å halda fram med neste "
-"steg.</qt>"
+"<qt>Kalibreringsprosessen skal til å undersøkja omfanget av signal frå "
+"eininga.<br><br>Flytt <b>akse %1 %2</b> på eininga til <b>midtre</b> "
+"posisjon.<br><br> Trykk ein knapp på eininga eller vel «Neste» for å halda "
+"fram med neste steg.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibreringsprosessen skal til å undersøkja omfanget av signal frå eininga."
-"<br>"
-"<br>Flytt <b>akse %1 %2</b> på eininga til <b>høgste</b> posisjon."
-"<br>"
-"<br> Trykk ein knapp på eininga eller vel «Neste» for å halda fram med neste "
-"steg.</qt>"
+"<qt>Kalibreringsprosessen skal til å undersøkja omfanget av signal frå "
+"eininga.<br><br>Flytt <b>akse %1 %2</b> på eininga til <b>høgste</b> "
+"posisjon.<br><br> Trykk ein knapp på eininga eller vel «Neste» for å halda "
+"fram med neste steg.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -127,8 +113,8 @@ msgstr "Klarte ikkje henta kjernedrivarversjon for styrespakeining %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "Den kjernedrivaren som går no (versjon %1.%2.%3) er ikkje den same som denne "
 "modulen er kompilert for (%4.%5.%6)."
@@ -174,40 +160,29 @@ msgstr "TDE Kontrollsentermodul for å testa styrespakar"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Styrespak</h1> Denne modulen hjelper til med å sjå etter at styrespaken "
-"verkar på rett måte."
-"<br> Dersom spaken gjev feil verdiar for aksane, kan du prøva å retta dette med "
-"kalibreringa."
-"<br> Modulen prøver å finna alle tilgjengelege styrespakeiningar ved å "
-"undersøkja /dev/js[0-4] og /dev/input/js[0-4]"
-"<br>Dersom du brukar ei anna einingsfil, kan du oppgje henne i "
-"kombinasjonsboksen."
-"<br> Lista «Knappar» viser tilstanden for alle knappane på styrespaken, og "
-"lista «Aksar» viser gjeldande verdi for alle aksar. "
-"<br> MERK: Einingsdrivaren for Linux (kjerne 2.4, 2.6) kan automatisk berre "
-"finna "
-"<ul>"
-"<li>styrespak med 2 aksar, 4 knappar</li>"
-"<li>styrespak med 3 aksar, 4 knappar</li>"
-"<li>styrespak med 4 aksar, 4 knappar</li>"
-"<li>Saitek Cyborg digitale styrespakar</li></ul> (Du finn fleire detaljar i "
-"kjeldekoden for Linux: Documentation/input/joystick.txt)"
+"verkar på rett måte.<br> Dersom spaken gjev feil verdiar for aksane, kan du "
+"prøva å retta dette med kalibreringa.<br> Modulen prøver å finna alle "
+"tilgjengelege styrespakeiningar ved å undersøkja /dev/js[0-4] og /dev/input/"
+"js[0-4]<br>Dersom du brukar ei anna einingsfil, kan du oppgje henne i "
+"kombinasjonsboksen.<br> Lista «Knappar» viser tilstanden for alle knappane "
+"på styrespaken, og lista «Aksar» viser gjeldande verdi for alle aksar. <br> "
+"MERK: Einingsdrivaren for Linux (kjerne 2.4, 2.6) kan automatisk berre finna "
+"<ul><li>styrespak med 2 aksar, 4 knappar</li><li>styrespak med 3 aksar, 4 "
+"knappar</li><li>styrespak med 4 aksar, 4 knappar</li><li>Saitek Cyborg "
+"digitale styrespakar</li></ul> (Du finn fleire detaljar i kjeldekoden for "
+"Linux: Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -247,15 +222,13 @@ msgstr "Kalibrer"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Inga styrespak-eining vart oppdaga automatisk på denne maskina."
-"<br>Det vart leita i /dev/js[0-4] og /dev/input/js[0-4]."
-"<br>Dersom du veit at ein spak er tilkopla, kan du prøva å oppgje rett "
-"einingsfil."
+"Inga styrespak-eining vart oppdaga automatisk på denne maskina.<br>Det vart "
+"leita i /dev/js[0-4] og /dev/input/js[0-4].<br>Dersom du veit at ein spak er "
+"tilkopla, kan du prøva å oppgje rett einingsfil."
 
 #: joywidget.cpp:236
 msgid ""
@@ -277,18 +250,13 @@ msgstr "Einingsfeil"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibreringa skal til å undersøkja presisjonen."
-"<br>"
-"<br><b>Set alle aksane i midtstilling og rør deretter ikkje på styrespaken.</b>"
-"<br>"
-"<br>Trykk OK for å starta kalibreringa.</qt>"
+"<qt>Kalibreringa skal til å undersøkja presisjonen.<br><br><b>Set alle "
+"aksane i midtstilling og rør deretter ikkje på styrespaken.</b><br><br>Trykk "
+"OK for å starta kalibreringa.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-pa/messages/tdebase/joystick.po b/tde-i18n-pa/messages/tdebase/joystick.po
index 2cf66ae3d7b..f5a3c014e9d 100644
--- a/tde-i18n-pa/messages/tdebase/joystick.po
+++ b/tde-i18n-pa/messages/tdebase/joystick.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2007-01-17 22:10+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -52,33 +52,25 @@ msgstr "(ਅਕਸਰ Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -111,8 +103,8 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 
 #: joydevice.cpp:87
@@ -154,21 +146,16 @@ msgstr "TDE ਕੰਟਰੋਲ ਕੇਂਦਰ ਮੈਡੀਊਲ, ਜੋ ਕਿ
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 
 #: joywidget.cpp:43
@@ -209,10 +196,9 @@ msgstr "ਇਕਸਾਰ"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 
 #: joywidget.cpp:236
@@ -232,12 +218,9 @@ msgstr "ਜੰਤਰ ਗਲਤੀ"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 
 #: joywidget.cpp:372
diff --git a/tde-i18n-pl/messages/tdebase/joystick.po b/tde-i18n-pl/messages/tdebase/joystick.po
index 8034a7b35d5..77b5968ab08 100644
--- a/tde-i18n-pl/messages/tdebase/joystick.po
+++ b/tde-i18n-pl/messages/tdebase/joystick.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-09-18 11:08+0200\n"
 "Last-Translator: Krzysztof Lichota <lichota@mimuw.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Krzysztof Lichota"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -48,58 +48,41 @@ msgstr "(zwykle Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracja umożliwia sprawdzenie zakresu wartości udostępnianego przez "
-"Twoje urządzenie."
-"<br>"
-"<br>Proszę przesunąć manipulator <b>osi %1 %2</b> Twojego urządzenia do pozycji "
-"<b>minimalnej</b>."
-"<br> "
-"<br>Proszę wcisnąć jakikolwiek przycisk na urządzeniu lub przycisk 'Dalej', aby "
-"przejść do następnego kroku.</qt>"
+"Twoje urządzenie.<br><br>Proszę przesunąć manipulator <b>osi %1 %2</b> "
+"Twojego urządzenia do pozycji <b>minimalnej</b>.<br> <br>Proszę wcisnąć "
+"jakikolwiek przycisk na urządzeniu lub przycisk 'Dalej', aby przejść do "
+"następnego kroku.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracja umożliwia sprawdzenie zakresu wartości udostępnianego przez "
-"Twoje urządzenie."
-"<br>"
-"<br>Proszę przesunąć manipulator <b>osi %1 %2</b> Twojego urządzenia do pozycji "
-"<b>środkowej</b>."
-"<br> "
-"<br>Proszę wcisnąć jakikolwiek przycisk na urządzeniu lub przycisk 'Dalej', aby "
-"przejść do następnego kroku.</qt>"
+"Twoje urządzenie.<br><br>Proszę przesunąć manipulator <b>osi %1 %2</b> "
+"Twojego urządzenia do pozycji <b>środkowej</b>.<br> <br>Proszę wcisnąć "
+"jakikolwiek przycisk na urządzeniu lub przycisk 'Dalej', aby przejść do "
+"następnego kroku.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracja umożliwia sprawdzenie zakresu wartości udostępnianego przez "
-"Twoje urządzenie."
-"<br>"
-"<br>Proszę przesunąć manipulator <b>osi %1 %2</b> Twojego urządzenia do pozycji "
-"<b>maksymalnej</b>."
-"<br> "
-"<br>Proszę wcisnąć jakikolwiek przycisk na urządzeniu lub przycisk 'Dalej', aby "
-"przejść do następnego kroku.</qt>"
+"Twoje urządzenie.<br><br>Proszę przesunąć manipulator <b>osi %1 %2</b> "
+"Twojego urządzenia do pozycji <b>maksymalnej</b>.<br> <br>Proszę wcisnąć "
+"jakikolwiek przycisk na urządzeniu lub przycisk 'Dalej', aby przejść do "
+"następnego kroku.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -132,11 +115,11 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Wersja aktualnie działającego sterownika jądra (%1.%2.%3) nie jest taka sama, "
-"dla jakiej ten moduł został skompilowany (%4.%5.%6)."
+"Wersja aktualnie działającego sterownika jądra (%1.%2.%3) nie jest taka "
+"sama, dla jakiej ten moduł został skompilowany (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -159,8 +142,8 @@ msgstr ""
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"Nie można zainicjalizować wartości kalibracyjnych dla urządzenia joysticka %1: "
-"%2"
+"Nie można zainicjalizować wartości kalibracyjnych dla urządzenia joysticka "
+"%1: %2"
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
@@ -182,40 +165,29 @@ msgstr "Moduł Centrum Sterowania TDE do testowania joysticków"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Joystick</h1> Ten moduł pozwala sprawdzić, czy Twój joystick działa "
-"poprawnie."
-"<br> Jeśli podaje niewłaściwe wartości dla którejś z osi, możesz spróbować to "
-"rozwiązać poprzez przeprowadzenie kalibracji."
-"<br> Ten moduł próbuje znaleźć dostępne urządzenia joysticków sprawdzając "
-"urządzenia /dev/js[0-4] i /dev/input/js[0-4]"
-"<br> Jeśli urządzenie joysticka ma inną nazwę, proszę ją podać w polu listy "
-"rozwijanej."
-"<br> Lista Przyciski pokazuje stan przycisków joysticka, lista Osie pokazuje "
-"aktualne wartości dla wszystkich osi."
-"<br> UWAGA: obecny sterownik dla Linuksa (jądra 2.4 i 2.6) wykrywa "
-"automatycznie tylko joysticki:"
-"<ul>"
-"<li>2-osiowe, 4-przyciskowe</li>"
-"<li>3-osiowe, 4-przyciskowe</li>"
-"<li>4-osiowe, 4-przyciskowe</li> "
-"<li>cyfrowe Saitek Cyborg</li></ul> (Szczegóły możesz znaleźć w źródłach "
-"Linuksa, w pliku source/Documentation/input/joystick.txt)"
+"poprawnie.<br> Jeśli podaje niewłaściwe wartości dla którejś z osi, możesz "
+"spróbować to rozwiązać poprzez przeprowadzenie kalibracji.<br> Ten moduł "
+"próbuje znaleźć dostępne urządzenia joysticków sprawdzając urządzenia /dev/"
+"js[0-4] i /dev/input/js[0-4]<br> Jeśli urządzenie joysticka ma inną nazwę, "
+"proszę ją podać w polu listy rozwijanej.<br> Lista Przyciski pokazuje stan "
+"przycisków joysticka, lista Osie pokazuje aktualne wartości dla wszystkich "
+"osi.<br> UWAGA: obecny sterownik dla Linuksa (jądra 2.4 i 2.6) wykrywa "
+"automatycznie tylko joysticki:<ul><li>2-osiowe, 4-przyciskowe</li><li>3-"
+"osiowe, 4-przyciskowe</li><li>4-osiowe, 4-przyciskowe</li> <li>cyfrowe "
+"Saitek Cyborg</li></ul> (Szczegóły możesz znaleźć w źródłach Linuksa, w "
+"pliku source/Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -255,15 +227,14 @@ msgstr "Kalibruj"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Nie znaleziono automatycznie żadnego urządzenia joysticka na tym komputerze."
-"<br>Sprawdzone zostały urządzenia /dev/js[0-4] i /dev/input/js[0-4]"
-"<br>Jeśli jesteś pewien, że joystick jest podłączony, podaj poprawną nazwę "
-"urządzenia joysticka."
+"<br>Sprawdzone zostały urządzenia /dev/js[0-4] i /dev/input/js[0-4]<br>Jeśli "
+"jesteś pewien, że joystick jest podłączony, podaj poprawną nazwę urządzenia "
+"joysticka."
 
 #: joywidget.cpp:236
 msgid ""
@@ -285,19 +256,13 @@ msgstr "Błąd urządzenia"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Program kalibracyjny sprawdzi teraz dokładność."
-"<br>"
-"<br><b>Proszę przesunąć wszystkie manipulatory osi do pozycji środkowej i nie "
-"dotykać joysticka.</b>"
-"<br> "
-"<br>Proszę kliknąć OK, aby rozpocząć kalibrację.</qt>"
+"<qt>Program kalibracyjny sprawdzi teraz dokładność.<br><br><b>Proszę "
+"przesunąć wszystkie manipulatory osi do pozycji środkowej i nie dotykać "
+"joysticka.</b><br> <br>Proszę kliknąć OK, aby rozpocząć kalibrację.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-pt/messages/tdebase/joystick.po b/tde-i18n-pt/messages/tdebase/joystick.po
index c37d3ce5931..455ebe00675 100644
--- a/tde-i18n-pt/messages/tdebase/joystick.po
+++ b/tde-i18n-pt/messages/tdebase/joystick.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-09-25 15:09+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <kde-i18n-pt@kde.org>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "X-Spell-Extra: esquerdino multi\n"
 "X-POFile-SpellExtra: Cyborg Documentation joysticks Saitek dev js txt\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Pedro Morais"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -48,55 +48,38 @@ msgstr "(normalmente Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>A calibração está a detectar a gama de valores do seu dispositivo."
-"<br>"
-"<br>Por favor mova o <b>eixo %1 %2</b> do seu dispositivo para a posição <b>"
-"mínima</b>."
-"<br>"
-"<br>Carregue em um dos botões do dispositivo para continuar para o próximo "
-"passo.</qt>"
+"<br><br>Por favor mova o <b>eixo %1 %2</b> do seu dispositivo para a posição "
+"<b>mínima</b>.<br><br>Carregue em um dos botões do dispositivo para "
+"continuar para o próximo passo.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>A calibração está a detectar a gama de valores do seu dispositivo."
-"<br>"
-"<br>Por favor mova o <b>eixo %1 %2</b> do seu dispositivo para a posição <b>"
-"central</b>."
-"<br>"
-"<br>Carregue em um dos botões do dispositivo para continuar para o próximo "
-"passo.</qt>"
+"<br><br>Por favor mova o <b>eixo %1 %2</b> do seu dispositivo para a posição "
+"<b>central</b>.<br><br>Carregue em um dos botões do dispositivo para "
+"continuar para o próximo passo.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>A calibração está a detectar a gama de valores do seu dispositivo."
-"<br>"
-"<br>Por favor mova o <b>eixo %1 %2</b> do seu dispositivo para a posição <b>"
-"máxima</b>."
-"<br>"
-"<br>Carregue em um dos botões do dispositivo para continuar para o próximo "
-"passo.</qt>"
+"<br><br>Por favor mova o <b>eixo %1 %2</b> do seu dispositivo para a posição "
+"<b>máxima</b>.<br><br>Carregue em um dos botões do dispositivo para "
+"continuar para o próximo passo.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -125,16 +108,16 @@ msgstr "O dispositivo dado %1 não é um joystick."
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
 msgstr ""
-"Não foi possível obter a versão do controlador do kernel para o dispositivo de "
-"joystick %1: %2"
+"Não foi possível obter a versão do controlador do kernel para o dispositivo "
+"de joystick %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"A versão do controlador de kernel actual (%1.%2.%3) não é a mesma para o qual "
-"este módulo foi compilado (%4.%5.%6)."
+"A versão do controlador de kernel actual (%1.%2.%3) não é a mesma para o "
+"qual este módulo foi compilado (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -149,14 +132,14 @@ msgstr ""
 #: joydevice.cpp:99
 msgid "Could not get calibration values for joystick device %1: %2"
 msgstr ""
-"Não foi possível obter os valores de calibração do dispositivo de joystick %1: "
-"%2"
+"Não foi possível obter os valores de calibração do dispositivo de joystick "
+"%1: %2"
 
 #: joydevice.cpp:105
 msgid "Could not restore calibration values for joystick device %1: %2"
 msgstr ""
-"Não foi possível recuperar os valores de calibração do dispositivo de joystick "
-"%1: %2"
+"Não foi possível recuperar os valores de calibração do dispositivo de "
+"joystick %1: %2"
 
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
@@ -185,39 +168,29 @@ msgstr "Módulo do Centro de Controlo do TDE para testar Joysticks"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Joystick</h1>Este módulo ajuda-o a verificar se o seu joystick se encontra "
-"a funcionar correctamente."
-"<br>Se ele der valores errados nos eixos, por tentar resolver isto com a "
-"calibração."
-"<br>Este módulo tenta encontrar todos os dispositivos de joystick disponíveis "
-"procurando em /dev/js[0-4] e em /dev/input/js[0-4]"
-"<br>Se o ficheiro de dispositivo for outro, indique-o na caixa."
-"<br>A lista de Botões ,mostra o estado dos botões no seu joystick, a lista de "
-"Eixos mostra o valor actual para cada um dos eixos."
-"<br>NOTA: o controlador actual de Linux (Kernel 2.4, 2.6) apenas consegue "
-"detectar automaticamente"
-"<ul>"
-"<li>joysticks de 2 eixos e 4 botões</li>"
-"<li>joysticks de 3 eixos e 4 botões</li>"
-"<li>joysticks de 4 eixos e 4 botões</li>"
-"<li>Joysticks Saitek Cyborg 'digital'</li></ul>(Para mais detalhes veja no "
-"código do Linux em Documentation/input/joystick.txt)"
+"<h1>Joystick</h1>Este módulo ajuda-o a verificar se o seu joystick se "
+"encontra a funcionar correctamente.<br>Se ele der valores errados nos eixos, "
+"por tentar resolver isto com a calibração.<br>Este módulo tenta encontrar "
+"todos os dispositivos de joystick disponíveis procurando em /dev/js[0-4] e "
+"em /dev/input/js[0-4]<br>Se o ficheiro de dispositivo for outro, indique-o "
+"na caixa.<br>A lista de Botões ,mostra o estado dos botões no seu joystick, "
+"a lista de Eixos mostra o valor actual para cada um dos eixos.<br>NOTA: o "
+"controlador actual de Linux (Kernel 2.4, 2.6) apenas consegue detectar "
+"automaticamente<ul><li>joysticks de 2 eixos e 4 botões</li><li>joysticks de "
+"3 eixos e 4 botões</li><li>joysticks de 4 eixos e 4 botões</li><li>Joysticks "
+"Saitek Cyborg 'digital'</li></ul>(Para mais detalhes veja no código do Linux "
+"em Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -257,15 +230,13 @@ msgstr "Calibrar"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Não foi possível encontrar automaticamente um Joystick neste computador."
-"<br>Foi procurado em /dev/js[0-4] e /dev/input/js[0-4]"
-"<br>Se sabe que está um ligado, indique qual o ficheiro do dispositivo "
-"correcto."
+"<br>Foi procurado em /dev/js[0-4] e /dev/input/js[0-4]<br>Se sabe que está "
+"um ligado, indique qual o ficheiro do dispositivo correcto."
 
 #: joywidget.cpp:236
 msgid ""
@@ -287,19 +258,13 @@ msgstr "Erro no Dispositivo"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>A calibração está prestes a verificar a precisão."
-"<br>"
-"<br><b>Por favor mova todos os eixos para a posição central e não deixe de "
-"tocar no Joystick.</b>"
-"<br>"
-"<br>Carregue em OK para iniciar a calibração.</qt>"
+"<qt>A calibração está prestes a verificar a precisão.<br><br><b>Por favor "
+"mova todos os eixos para a posição central e não deixe de tocar no Joystick."
+"</b><br><br>Carregue em OK para iniciar a calibração.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-pt_BR/messages/tdebase/joystick.po b/tde-i18n-pt_BR/messages/tdebase/joystick.po
index 13803ddb89b..13ff7f7f471 100644
--- a/tde-i18n-pt_BR/messages/tdebase/joystick.po
+++ b/tde-i18n-pt_BR/messages/tdebase/joystick.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-09-07 18:21-0300\n"
 "Last-Translator: Lisiane Sztoltz Teixeira <lisiane.teixeira@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Lisiane Sztoltz Teixeira"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -54,58 +54,38 @@ msgstr "(usualmente Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>A calibragem serve para verificar o intervalo de valores de entrega de seu  "
-"dispositivo."
-"<br>"
-"<br>Por favor, mova o <b>eixo %1 %2</b> do seu dispositivo para a posição <b>"
-"mínima</b>. "
-"<br>"
-"<br>Pressione qualquer botão do dispositivo, ou clique no botão 'Próximo', para "
-"prosseguir.</qt> "
+"<qt>A calibragem serve para verificar o intervalo de valores de entrega de "
+"seu  dispositivo.<br><br>Por favor, mova o <b>eixo %1 %2</b> do seu "
+"dispositivo para a posição <b>mínima</b>. <br><br>Pressione qualquer botão "
+"do dispositivo, ou clique no botão 'Próximo', para prosseguir.</qt> "
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>A calibragem serve para verificar o intervalo de valores de entrega de seu "
-"dispositivo."
-"<br>"
-"<br>Por favor, mova o <b>eixo %1 %2</b> do seu dispositivo para a posição <b>"
-"central</b>. "
-"<br>"
-"<br>Pressione qualquer botão do dispositivo, ou clique no botão 'Próximo', para "
-"prosseguir.</qt> "
+"<qt>A calibragem serve para verificar o intervalo de valores de entrega de "
+"seu dispositivo.<br><br>Por favor, mova o <b>eixo %1 %2</b> do seu "
+"dispositivo para a posição <b>central</b>. <br><br>Pressione qualquer botão "
+"do dispositivo, ou clique no botão 'Próximo', para prosseguir.</qt> "
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>A calibragem serve para verificar o intervalo de valores de entrega de seu "
-"dispositivo."
-"<br>"
-"<br>Por favor, mova o <b>eixo %1 %2</b> do seu dispositivo para a posição <b>"
-"máxima</b>. "
-"<br>"
-"<br>Pressione qualquer botão do dispositivo, ou clique no botão 'Próximo', para "
-"prosseguir.</qt> "
+"<qt>A calibragem serve para verificar o intervalo de valores de entrega de "
+"seu dispositivo.<br><br>Por favor, mova o <b>eixo %1 %2</b> do seu "
+"dispositivo para a posição <b>máxima</b>. <br><br>Pressione qualquer botão "
+"do dispositivo, ou clique no botão 'Próximo', para prosseguir.</qt> "
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -139,27 +119,29 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"O driver atual no kernel (%1.%2.%3) não é o driver para o qual este módulo foi "
-"compilado  (%4.%5.%6)."
+"O driver atual no kernel (%1.%2.%3) não é o driver para o qual este módulo "
+"foi compilado  (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
 msgstr ""
-"Não foi possível obter o número de botões para o dispositivo de joystick %1: %2"
+"Não foi possível obter o número de botões para o dispositivo de joystick %1: "
+"%2"
 
 #: joydevice.cpp:93
 msgid "Could not get number of axes for joystick device %1: %2"
 msgstr ""
-"Não foi possível obter o número de eixos para o dispositivo de joystick %1: %2"
+"Não foi possível obter o número de eixos para o dispositivo de joystick %1: "
+"%2"
 
 #: joydevice.cpp:99
 msgid "Could not get calibration values for joystick device %1: %2"
 msgstr ""
-"Não foi possível obter os valores de calibragem para o dispositivo de joystick "
-"%1: %2"
+"Não foi possível obter os valores de calibragem para o dispositivo de "
+"joystick %1: %2"
 
 #: joydevice.cpp:105
 msgid "Could not restore calibration values for joystick device %1: %2"
@@ -194,38 +176,30 @@ msgstr "Módulo do Centro de Controle do TDE para testar joysticks"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Joystick</h1> Este módulo ajuda você a verificar se seu joystick está "
-"funcionando corretamente."
-"<br>Se ele comunicar valores incorretos para os eixos, você pode tentar "
-"arrumá-los com a calibragem."
-"<br>Este módulo tenta encontrar todos os dispositivos de joystick disponíveis, "
-"verificando em  /dev/js[0-4] e  /dev/input/js[0-4]"
-"<br> Se você possui outro arquivo de dispositivos, digite-o na caixa correta."
-"<br>A lista de botões mostra o estado dos botões de seu joystick, e a lista de "
-"eixos mostra o valor atual para todos os eixos."
-"<br>NOTA: o driver para Linux atual (kernel 2.4, 2.6) pode detectar "
-"automaticamente somente <l>"
-"<li>joystick de 2 eixos e  4 botões</li>"
-"<li>joystick de 3 eixos e 4 botões</li>"
-"<li> joysticks de 4 eixos e 4 botões</li>"
-"<li>joystick 'digital' Saitek Cyborg </li></ul> (para mais detalhes, verifique "
-"a documentação em source/Documentation/input/joystick.txt)"
+"funcionando corretamente.<br>Se ele comunicar valores incorretos para os "
+"eixos, você pode tentar arrumá-los com a calibragem.<br>Este módulo tenta "
+"encontrar todos os dispositivos de joystick disponíveis, verificando em  /"
+"dev/js[0-4] e  /dev/input/js[0-4]<br> Se você possui outro arquivo de "
+"dispositivos, digite-o na caixa correta.<br>A lista de botões mostra o "
+"estado dos botões de seu joystick, e a lista de eixos mostra o valor atual "
+"para todos os eixos.<br>NOTA: o driver para Linux atual (kernel 2.4, 2.6) "
+"pode detectar automaticamente somente <l><li>joystick de 2 eixos e  4 "
+"botões</li><li>joystick de 3 eixos e 4 botões</li><li> joysticks de 4 eixos "
+"e 4 botões</li><li>joystick 'digital' Saitek Cyborg </li></ul> (para mais "
+"detalhes, verifique a documentação em source/Documentation/input/joystick."
+"txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -265,13 +239,12 @@ msgstr "Calibrar"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Nenhum dispositivo de joystick foi encontrado automaticamente neste computador."
-"<br>Verifique se /dev/js[0-4] ou /dev/input/js[0-4] existem. "
+"Nenhum dispositivo de joystick foi encontrado automaticamente neste "
+"computador.<br>Verifique se /dev/js[0-4] ou /dev/input/js[0-4] existem. "
 "<br>Se você sabe que existe um dispositivo conectado, digite o arquivo de "
 "dispositivo correto."
 
@@ -295,19 +268,14 @@ msgstr "Erro de dispositivo"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 "<qt>A calibragem é necessária para verificar a precisão de seu  dispositivo."
-"<br>"
-"<br><b>Por favor, mova todos os eixo do joystick para a posição central, e não "
-"toque mais nele.</b>"
-"<br>"
-"<br>Pressione OK para iniciar a calibragem.</qt> "
+"<br><br><b>Por favor, mova todos os eixo do joystick para a posição central, "
+"e não toque mais nele.</b><br><br>Pressione OK para iniciar a calibragem.</"
+"qt> "
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-ro/messages/tdebase/joystick.po b/tde-i18n-ro/messages/tdebase/joystick.po
index f9dec194c1e..ed8dcc16548 100644
--- a/tde-i18n-ro/messages/tdebase/joystick.po
+++ b/tde-i18n-ro/messages/tdebase/joystick.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2004-08-28 14:51+0300\n"
 "Last-Translator: Claudiu Costin <claudiuc@kde.org>\n"
 "Language-Team: Romanian <kde-i18n-ro@kde.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Claudiu Costin"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -54,54 +54,40 @@ msgstr ""
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Acum voi verifica domeniul de valori posibil pentru dispozitivul "
-"dumneavoastră."
-"<br>"
-"<br>Mişcaţi <b>axa %1</b> a dispozitivului în poziţia <b>minimă</b>."
-"<br>"
-"<br>Apăsaţi orice buton al dispozitivului pentru a trece la pasul următor.</qt>"
+"dumneavoastră.<br><br>Mişcaţi <b>axa %1</b> a dispozitivului în poziţia "
+"<b>minimă</b>.<br><br>Apăsaţi orice buton al dispozitivului pentru a trece "
+"la pasul următor.</qt>"
 
 #: caldialog.cpp:107
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Acum voi verifica domeniul de valori posibil pentru dispozitivul "
-"dumneavoastră."
-"<br>"
-"<br>Mişcaţi <b>axa %1</b> a dispozitivului în poziţia <b>centrală</b>."
-"<br>"
-"<br>Apăsaţi orice buton al dispozitivului pentru a trece la pasul următor.</qt>"
+"dumneavoastră.<br><br>Mişcaţi <b>axa %1</b> a dispozitivului în poziţia "
+"<b>centrală</b>.<br><br>Apăsaţi orice buton al dispozitivului pentru a trece "
+"la pasul următor.</qt>"
 
 #: caldialog.cpp:124
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Acum voi verifica domeniul de valori posibil pentru dispozitivul "
-"dumneavoastră."
-"<br>"
-"<br>Mişcaţi <b>axa %1</b> a dispozitivului în poziţia <b>maximă</b>."
-"<br>"
-"<br>Apăsaţi orice buton al dispozitivului pentru a trece la pasul următor.</qt>"
+"dumneavoastră.<br><br>Mişcaţi <b>axa %1</b> a dispozitivului în poziţia "
+"<b>maximă</b>.<br><br>Apăsaţi orice buton al dispozitivului pentru a trece "
+"la pasul următor.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -134,8 +120,8 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "Driver-ul de kernel în execuţie, cu versiunea (%1.%2.%3) nu este cel pentru "
 "care a fost compilat acest modul (%4.%5.%6)."
@@ -152,7 +138,8 @@ msgstr "Nu am putut afla numărul de axe pentru dispozitivul joystick %1: %2"
 #: joydevice.cpp:99
 msgid "Could not get calibration values for joystick device %1: %2"
 msgstr ""
-"Nu am putut determina valorile de calibrare pentru dispozitivul joystick %1: %2"
+"Nu am putut determina valorile de calibrare pentru dispozitivul joystick %1: "
+"%2"
 
 #: joydevice.cpp:105
 msgid "Could not restore calibration values for joystick device %1: %2"
@@ -162,8 +149,8 @@ msgstr ""
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"Nu am putut iniţializa valorile de calibrare pentru dispozitivul joystick %1: "
-"%2"
+"Nu am putut iniţializa valorile de calibrare pentru dispozitivul joystick "
+"%1: %2"
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
@@ -185,41 +172,30 @@ msgstr "Modul TDE de control pentru testarea joystick-urilor"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Joystick</h1> Acest modul vă ajută să verificaţi dacă joystick-ul "
-"dumneavoastră funcţionează corect."
-"<br>Dacă dă valori greşite pentru axe, atunci puteţi încerca să corectăti "
-"problema cu calibrarea."
-"<br>Acest modul încearcă să descopere toate dispozitivele joystick disponibile "
-"verificînd fisierele speciale /dev/js[0-4] şi /dev/input/js[0-4]."
-"<br>Dacă aveţi alt fişier de dispozitiv asociat, atunci îl puteţi introduce în "
-"căsuţa combinată."
-"<br>Lista de butoane afişează starea butoanelor joystick-ului, iar lista axelor "
-"valoarea curentă pentru toate axele."
-"<br>Observaţie: driver-ul de Linux actual (Kernel 2.4, 2.6) poate detecta "
-"automat numai"
-"<ul>"
-"<li>joystick cu 2 axe, 4 butoane</li>"
-"<li>joystick cu 3 axe, 4 butoane</li>"
-"<li>joystick cu 4 axe, 4 butoane</li>"
-"<li>joystick-uri 'digitale' Saitek Cyborg</li></ul> (Pentru detalii puteţi "
-"consulta fişierul Documentation/input/joystick.txt din codul sursă al "
-"kernel-ului Linux)"
+"dumneavoastră funcţionează corect.<br>Dacă dă valori greşite pentru axe, "
+"atunci puteţi încerca să corectăti problema cu calibrarea.<br>Acest modul "
+"încearcă să descopere toate dispozitivele joystick disponibile verificînd "
+"fisierele speciale /dev/js[0-4] şi /dev/input/js[0-4].<br>Dacă aveţi alt "
+"fişier de dispozitiv asociat, atunci îl puteţi introduce în căsuţa combinată."
+"<br>Lista de butoane afişează starea butoanelor joystick-ului, iar lista "
+"axelor valoarea curentă pentru toate axele.<br>Observaţie: driver-ul de "
+"Linux actual (Kernel 2.4, 2.6) poate detecta automat numai<ul><li>joystick "
+"cu 2 axe, 4 butoane</li><li>joystick cu 3 axe, 4 butoane</li><li>joystick cu "
+"4 axe, 4 butoane</li><li>joystick-uri 'digitale' Saitek Cyborg</li></ul> "
+"(Pentru detalii puteţi consulta fişierul Documentation/input/joystick.txt "
+"din codul sursă al kernel-ului Linux)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -260,14 +236,13 @@ msgstr "Calibrează"
 #: joywidget.cpp:190
 #, fuzzy
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Nu am detectat automat nici un dispozitiv joystick.\n"
-"Verificările au fost făcute pentru fişierele  speciale /dev/js[0-4] şi "
-"/dev/input/js[0-4]\n"
+"Verificările au fost făcute pentru fişierele  speciale /dev/js[0-4] şi /dev/"
+"input/js[0-4]\n"
 "Dacă ştiţi că există unul ataşat, atunci introduceţi fişierul de dispozitiv "
 "corect."
 
@@ -291,19 +266,13 @@ msgstr "Eroare de dispozitiv"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Operaţia de calibrare va verifica precizia."
-"<br>"
-"<br><b>Mutaţi toate axele în poziţia centrală şi nu mai atingeţi "
-"joystick-ul.</b>"
-"<br>"
-"<br>Apăsaţi butonul \"OK\" pentru a porni calibrarea.</qt>"
+"<qt>Operaţia de calibrare va verifica precizia.<br><br><b>Mutaţi toate axele "
+"în poziţia centrală şi nu mai atingeţi joystick-ul.</b><br><br>Apăsaţi "
+"butonul \"OK\" pentru a porni calibrarea.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-ru/messages/tdebase/joystick.po b/tde-i18n-ru/messages/tdebase/joystick.po
index cc1ea4238e2..53b20455f2c 100644
--- a/tde-i18n-ru/messages/tdebase/joystick.po
+++ b/tde-i18n-ru/messages/tdebase/joystick.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-10-23 13:23-0400\n"
 "Last-Translator: Gregory Mokhin <mok@kde.ru>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -12,16 +12,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Григорий Мохин"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -50,52 +50,38 @@ msgstr "(обычно Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Процедура калибровки готова определить диапазон чувствительности "
-"устройства."
-"<br>"
-"<br>Передвиньте указатель по  <b>оси %1 %2</b> в <b>минимальное</b> положение."
-"<br>"
-"<br>Для перехода к следующему этапу нажмите любую кнопку на устройстве.</qt>"
+"устройства.<br><br>Передвиньте указатель по  <b>оси %1 %2</b> в "
+"<b>минимальное</b> положение.<br><br>Для перехода к следующему этапу нажмите "
+"любую кнопку на устройстве.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Процедура калибровки готова определить диапазон чувствительности "
-"устройства."
-"<br>"
-"<br>Передвиньте указатель по <b>оси %1 %2</b> в <b>центральное</b> положение."
-"<br>"
-"<br>Для перехода к следующему этапу нажмите любую кнопку на устройстве.</qt>"
+"устройства.<br><br>Передвиньте указатель по <b>оси %1 %2</b> в "
+"<b>центральное</b> положение.<br><br>Для перехода к следующему этапу нажмите "
+"любую кнопку на устройстве.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Процедура калибровки готова определить диапазон чувствительности "
-"устройства."
-"<br>"
-"<br>Передвиньте указатель по <b>оси %1 %2</b> в <b>максимальное</b> положение."
-"<br>"
-"<br>Для перехода к следующему этапу нажмите любую кнопку на устройстве.</qt>"
+"устройства.<br><br>Передвиньте указатель по <b>оси %1 %2</b> в "
+"<b>максимальное</b> положение.<br><br>Для перехода к следующему этапу "
+"нажмите любую кнопку на устройстве.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -127,11 +113,11 @@ msgstr "Не удаётся загрузить модуль ядра для ус
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Текущая версия ядра (%1.%2.%3) отличается от той, для которой был собран модуль "
-"(%4.%5.%6)."
+"Текущая версия ядра (%1.%2.%3) отличается от той, для которой был собран "
+"модуль (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -155,7 +141,8 @@ msgstr ""
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"Не удаётся инициализировать значения калибровки для устройства джойстика %1: %2"
+"Не удаётся инициализировать значения калибровки для устройства джойстика %1: "
+"%2"
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
@@ -177,37 +164,29 @@ msgstr "Модуль Центра управления TDE для проверк
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Джойстик</h1>Этот модуль позволяет проверить правильность работы джойстика."
-"<br>Если значения для осей указаны неверно, это можно исправить с помощью "
-"процедуры калибровки."
-"<br>Устройства джойстика опрашиваются для /dev/js[0-4] и /dev/input/js[0-4]"
-"<br>Если ваш джойстик работает на другом устройстве, укажите его в поле ввода."
-"<br>В списке Кнопки показано состояние кнопок джойстика, а списке Оси - "
-"состояние осей."
-"<br>Примечание: в текущей реализации драйвер джойстика ядра Linux (для 2.4 и "
-"2.6) может правильно определить следующие устройства:"
-"<ul>"
-"<li>джойстик с двумя осями и четырьмя кнопками</li>"
-"<li>джойстик с тремя осями и четырьмя кнопками</li>"
-"<li>джойстик с четырьмя осями и четырьмя кнопками</li>"
-"<li>цифровые джойстики Saitek Cyborg</li></ul>(Подробнее об этом см. "
-"документацию ядра Linux, файл Documentation/input/joystick.txt)"
+"<h1>Джойстик</h1>Этот модуль позволяет проверить правильность работы "
+"джойстика.<br>Если значения для осей указаны неверно, это можно исправить с "
+"помощью процедуры калибровки.<br>Устройства джойстика опрашиваются для /dev/"
+"js[0-4] и /dev/input/js[0-4]<br>Если ваш джойстик работает на другом "
+"устройстве, укажите его в поле ввода.<br>В списке Кнопки показано состояние "
+"кнопок джойстика, а списке Оси - состояние осей.<br>Примечание: в текущей "
+"реализации драйвер джойстика ядра Linux (для 2.4 и 2.6) может правильно "
+"определить следующие устройства:<ul><li>джойстик с двумя осями и четырьмя "
+"кнопками</li><li>джойстик с тремя осями и четырьмя кнопками</li><li>джойстик "
+"с четырьмя осями и четырьмя кнопками</li><li>цифровые джойстики Saitek "
+"Cyborg</li></ul>(Подробнее об этом см. документацию ядра Linux, файл "
+"Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -247,15 +226,13 @@ msgstr "Калибровка"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Джойстики не обнаружены."
-"<br>Проверялись устройства /dev/js[0-4] и /dev/input/js[0-4]"
-"<br>Если вы знаете, на каком устройстве работает джойстик, укажите это "
-"значение."
+"Джойстики не обнаружены.<br>Проверялись устройства /dev/js[0-4] и /dev/input/"
+"js[0-4]<br>Если вы знаете, на каком устройстве работает джойстик, укажите "
+"это значение."
 
 #: joywidget.cpp:236
 msgid ""
@@ -277,19 +254,13 @@ msgstr "Ошибка устройства"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Начинается калибровка чувствительности."
-"<br>"
-"<br><b>Передвиньте джойстик в центральное положение по обеим осям и более не "
-"трогайте его.</b>"
-"<br>"
-"<br>Для начала калибровки нажмите OK.</qt>"
+"<qt>Начинается калибровка чувствительности.<br><br><b>Передвиньте джойстик в "
+"центральное положение по обеим осям и более не трогайте его.</b><br><br>Для "
+"начала калибровки нажмите OK.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-rw/messages/tdebase/joystick.po b/tde-i18n-rw/messages/tdebase/joystick.po
index 4c37ee14d63..fa44d777b51 100644
--- a/tde-i18n-rw/messages/tdebase/joystick.po
+++ b/tde-i18n-rw/messages/tdebase/joystick.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick 3.4\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-09-23 00:50-0800\n"
 "Last-Translator: Viateur <muvia@mail.rw>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -32,7 +32,7 @@ msgstr ""
 "Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien "
 "NSENGIYUMVA"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -63,55 +63,38 @@ msgstr "(uko bisanzwe Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Igena-ngero rifasha kugenzura igice cy'uduciro apareye yawe itanga."
-"<br>"
-"<br>Wakwimura <b>umurongo %1 %2</b> kuri apareye yawe ku mwanya <b>"
-"muto ushoboka</b>."
-"<br>"
-"<br>Kanda buto iyo ariyo yose kuri apareye yawe cyangwa ukande kuri buto "
-"'Bikurikira' mu gukomeza ku ntambwe ikurikira.</qt>"
+"<br><br>Wakwimura <b>umurongo %1 %2</b> kuri apareye yawe ku mwanya <b>muto "
+"ushoboka</b>.<br><br>Kanda buto iyo ariyo yose kuri apareye yawe cyangwa "
+"ukande kuri buto 'Bikurikira' mu gukomeza ku ntambwe ikurikira.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Igena-ngero rifasha kugenzura igice cy'uduciro apareye yawe itanga."
-"<br>"
-"<br>Wakwimura <b>umurongo %1 %2</b> kuri apareye yawe ku mwanya <b>wo hagati</b>"
-"."
-"<br>"
-"<br>Kanda buto iyo ariyo yose kuri apareye yawe cyangwa ukande kuri buto "
-"'Bikurikira' mu gukomeza ku ntambwe ikurikira.</qt>"
+"<br><br>Wakwimura <b>umurongo %1 %2</b> kuri apareye yawe ku mwanya <b>wo "
+"hagati</b>.<br><br>Kanda buto iyo ariyo yose kuri apareye yawe cyangwa "
+"ukande kuri buto 'Bikurikira' mu gukomeza ku ntambwe ikurikira.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Igena-ngero rifasha kugenzura igice cy'uduciro apareye yawe itanga."
-"<br>"
-"<br>Wakwimura <b>umurongo %1 %2</b> kuri apareye yawe ku mwanya <b>"
-"munini ushoboka</b>."
-"<br>"
-"<br>Kanda buto iyo ariyo yose kuri apareye yawe cyangwa ukande kuri buto "
-"'Bikurikira' mu gukomeza ku ntambwe ikurikira.</qt>"
+"<br><br>Wakwimura <b>umurongo %1 %2</b> kuri apareye yawe ku mwanya "
+"<b>munini ushoboka</b>.<br><br>Kanda buto iyo ariyo yose kuri apareye yawe "
+"cyangwa ukande kuri buto 'Bikurikira' mu gukomeza ku ntambwe ikurikira.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -145,8 +128,8 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "Verisiyo ya musomyi w'intima igezweho ikora (%1.%2.%3) ntabwo ariyo iki gice "
 "cyakorewe ihinyuza (%4.%5.%6)."
@@ -163,8 +146,8 @@ msgstr ""
 #: joydevice.cpp:99
 msgid "Could not get calibration values for joystick device %1: %2"
 msgstr ""
-"Ntibyashobotse kubona uduciro tw'igena-ngano tw'apareye y'agakoreshamukino %1 : "
-"%2 "
+"Ntibyashobotse kubona uduciro tw'igena-ngano tw'apareye y'agakoreshamukino "
+"%1 : %2 "
 
 #: joydevice.cpp:105
 msgid "Could not restore calibration values for joystick device %1: %2"
@@ -175,14 +158,14 @@ msgstr ""
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"Ntibyashobotse gutangiza uduciro tw'igena-ngano tw'apareye y'agakoreshamukino "
-"%1 : %2 "
+"Ntibyashobotse gutangiza uduciro tw'igena-ngano tw'apareye "
+"y'agakoreshamukino %1 : %2 "
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
 msgstr ""
-"Ntibyashobotse gushyiraho uduciro tw'igena-ngano tw'apareye y'agakoreshamukino "
-"%1 : %2 "
+"Ntibyashobotse gushyiraho uduciro tw'igena-ngano tw'apareye "
+"y'agakoreshamukino %1 : %2 "
 
 #: joydevice.cpp:121
 msgid "internal error - code %1 unknown"
@@ -199,40 +182,30 @@ msgstr "TDE Igice cy'Agace k'Igenzura mu kugerageza Udukoreshamukino"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Agakoreshamukino</h1>Iki gice gifasha kugenzura niba agakoreshamukino kari "
-"gukora neza."
-"<br>Niba gatanga uduciro tutaritwo tw'imirongo fatizo, ushobora kugerageza "
-"gukemura ibi ukoresheje igena-ngano. "
-"<br>Iki gice kigerageza kubona apareye z'agakoreshamukino zose zihari kigenzura "
-"/dev/js[0-4] na /dev/input/js[0-4]"
-"<br> Niba ufite idosiye y'apareye yindi, yinjize mu rutonde rwirambura."
-"<br> Ilisiti ya Buto yerekana imimerere ku gakoreshamukino kawe, ilisiti "
-"y'Imirongo yerekana agaciro kagezweho k'imirongo fatizo yose."
-"<br>ICYITONDERWA: musomyi w'apareye Linux igezweho (Intima 2.4, 2.6) ishobora "
-"gusa kubona byikoresha"
-"<ul>"
-"<li>2-umurongo fatizo, 4-buto agakoreshamukino</li>"
-"<li>3-umurongo fatizo, 4-buto agakoreshamukino</li>"
-"<li>4-umurongo fatizo, 4-buto agakoreshamukino</li>"
-"<li>Udukoreshamukino bimenyetsomibare Saitek Cyborg</li></ul>"
-"(Ku bisobanuro birambuye ushobora kugenzura "
-"source/Documentation/input/joystick.txt ya linux yawe)"
+"<h1>Agakoreshamukino</h1>Iki gice gifasha kugenzura niba agakoreshamukino "
+"kari gukora neza.<br>Niba gatanga uduciro tutaritwo tw'imirongo fatizo, "
+"ushobora kugerageza gukemura ibi ukoresheje igena-ngano. <br>Iki gice "
+"kigerageza kubona apareye z'agakoreshamukino zose zihari kigenzura /dev/"
+"js[0-4] na /dev/input/js[0-4]<br> Niba ufite idosiye y'apareye yindi, "
+"yinjize mu rutonde rwirambura.<br> Ilisiti ya Buto yerekana imimerere ku "
+"gakoreshamukino kawe, ilisiti y'Imirongo yerekana agaciro kagezweho "
+"k'imirongo fatizo yose.<br>ICYITONDERWA: musomyi w'apareye Linux igezweho "
+"(Intima 2.4, 2.6) ishobora gusa kubona byikoresha<ul><li>2-umurongo fatizo, "
+"4-buto agakoreshamukino</li><li>3-umurongo fatizo, 4-buto agakoreshamukino</"
+"li><li>4-umurongo fatizo, 4-buto agakoreshamukino</li><li>Udukoreshamukino "
+"bimenyetsomibare Saitek Cyborg</li></ul>(Ku bisobanuro birambuye ushobora "
+"kugenzura source/Documentation/input/joystick.txt ya linux yawe)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -272,15 +245,14 @@ msgstr "Kugena-ingano"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Nta apareye y'agakoreshomukino yabonetse mu buryo bwikoresha kuri iyi "
-"mudasobwa."
-"<br> Amagenzura yakozwe muri /dev/js[0-4] na /dev/input/js[0-4]"
-"<br>Niba uzi ko hari imwe ifasheho, watwinjiza idosiye nyayo  y'apareye."
+"mudasobwa.<br> Amagenzura yakozwe muri /dev/js[0-4] na /dev/input/"
+"js[0-4]<br>Niba uzi ko hari imwe ifasheho, watwinjiza idosiye nyayo  "
+"y'apareye."
 
 #: joywidget.cpp:236
 msgid ""
@@ -302,23 +274,17 @@ msgstr "Ikosa ry'Apareye"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Igena-ngero rifasha kugenzura igenzura ryuzuye."
-"<br>"
-"<br><b>Wakwimura imirongo fatizo yose ku mwanya wo hagati wayo kandi noneho "
-"ntiwongere gukora ku gakoreshomukino. </b>"
-"<br>"
-"<br>Kandi YEGO kugira utangize igena-ngero.</qt>"
+"<qt>Igena-ngero rifasha kugenzura igenzura ryuzuye.<br><br><b>Wakwimura "
+"imirongo fatizo yose ku mwanya wo hagati wayo kandi noneho ntiwongere gukora "
+"ku gakoreshomukino. </b><br><br>Kandi YEGO kugira utangize igena-ngero.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
 msgid "Restored all calibration values for joystick device %1."
 msgstr ""
-"Uduciro tw'igena-ngero twose twongeye kugaragazwa tw'apareye agakoreshamukino "
-"%1."
+"Uduciro tw'igena-ngero twose twongeye kugaragazwa tw'apareye "
+"agakoreshamukino %1."
diff --git a/tde-i18n-se/messages/tdebase/joystick.po b/tde-i18n-se/messages/tdebase/joystick.po
index e6998b942c2..4fa4d6c885a 100644
--- a/tde-i18n-se/messages/tdebase/joystick.po
+++ b/tde-i18n-se/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-10-24 00:14+0200\n"
 "Last-Translator: Børre Gaup <boerre@skolelinux.no>\n"
 "Language-Team: Northern Saami <i18n-sme@lister.ping.uio.no>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Børre Gaup"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -50,51 +50,37 @@ msgstr ""
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibreren iská dál ovttadaga árvoduovdda "
-"<br> "
-"<br>Sirddes dál ovttadaga <b>áksa %1 unnimus sajádahkii</b> "
-"<br>"
-"<br>Deaddil muhtin boalu ovttadagas vai joatkit boahtte lávkii.</qt>"
+"<qt>Kalibreren iská dál ovttadaga árvoduovdda <br> <br>Sirddes dál ovttadaga "
+"<b>áksa %1 unnimus sajádahkii</b> <br><br>Deaddil muhtin boalu ovttadagas "
+"vai joatkit boahtte lávkii.</qt>"
 
 #: caldialog.cpp:107
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibreren iská dál ovttadaga árvoduovdda "
-"<br> "
-"<br>Sirddes dál ovttadaga <b>áksa %1 guovddáš</b> sajádahkii "
-"<br>"
-"<br>Deaddil muhtin boalu ovttadagas vai joatkit boahtte lávkii.</qt>"
+"<qt>Kalibreren iská dál ovttadaga árvoduovdda <br> <br>Sirddes dál ovttadaga "
+"<b>áksa %1 guovddáš</b> sajádahkii <br><br>Deaddil muhtin boalu ovttadagas "
+"vai joatkit boahtte lávkii.</qt>"
 
 #: caldialog.cpp:124
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibreren iská dál ovttadaga árvoduovdda "
-"<br> "
-"<br>Sirddes dál ovttadaga <b>áksa %1 allamus</b> sajádahkii "
-"<br>"
-"<br>Deaddil muhtin boalu ovttadagas vai joatkit boahtte lávkii.</qt>"
+"<qt>Kalibreren iská dál ovttadaga árvoduovdda <br> <br>Sirddes dál ovttadaga "
+"<b>áksa %1 allamus</b> sajádahkii <br><br>Deaddil muhtin boalu ovttadagas "
+"vai joatkit boahtte lávkii.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -123,12 +109,13 @@ msgstr "Addojuvvon ovttadat %1 ii leat stivrensággi."
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
 msgstr ""
-"Ii sáhttán viežžat čoahkkostivrranveršuvdna stivrensággeovttadat %1: %2 várás."
+"Ii sáhttán viežžat čoahkkostivrranveršuvdna stivrensággeovttadat %1: %2 "
+"várás."
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 
 #: joydevice.cpp:87
@@ -170,21 +157,16 @@ msgstr ""
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 
 #: joywidget.cpp:43
@@ -225,10 +207,9 @@ msgstr ""
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 
 #: joywidget.cpp:236
@@ -248,12 +229,9 @@ msgstr ""
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 
 #: joywidget.cpp:372
diff --git a/tde-i18n-sk/messages/tdebase/joystick.po b/tde-i18n-sk/messages/tdebase/joystick.po
index bd2d0274970..f621bd1c9c6 100644
--- a/tde-i18n-sk/messages/tdebase/joystick.po
+++ b/tde-i18n-sk/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2006-03-23 21:32+0100\n"
 "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
 "Language-Team: Slovak <kde-i18n-doc@kde.org>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.1\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Stanislav Višňovský"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -50,52 +50,38 @@ msgstr "(zvyčajne Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibrácia skontroluje rozsah hodnôt, ktoré zariadenie vracia."
-"<br>"
-"<br>Prosím, presuňte <b>osy %1 %2</b> vašeho zariadenia na <b>minimum</b>. "
-"<br>"
-"<br>Stlačte ľubovolné tlačidlo na zariadení alebo Ďalej pre nasledujúci "
-"krok.</qt>"
+"<br><br>Prosím, presuňte <b>osy %1 %2</b> vašeho zariadenia na <b>minimum</"
+"b>. <br><br>Stlačte ľubovolné tlačidlo na zariadení alebo Ďalej pre "
+"nasledujúci krok.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibrácia skontroluje rozsah hodnôt, ktoré zariadenie vracia."
-"<br>"
-"<br>Prosím, presuňte <b>os %1 %2</b> vašeho zariadenia na <b>stred</b>. "
-"<br>"
-"<br>Stlačte ľubovolné tlačidlo na zariadení alebo Ďalej pre nasledujúci "
+"<br><br>Prosím, presuňte <b>os %1 %2</b> vašeho zariadenia na <b>stred</b>. "
+"<br><br>Stlačte ľubovolné tlačidlo na zariadení alebo Ďalej pre nasledujúci "
 "krok.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibrácia skontroluje rozsah hodnôt, ktoré zariadenie vracia."
-"<br>"
-"<br>Prosím, presuňte <b>os %1 %2</b> vašeho zariadenia na <b>maximum</b>. "
-"<br>"
-"<br>Stlačte ľubovolné tlačidlo na zariadení alebo Ďalej pre nasledujúci "
-"krok.</qt>"
+"<br><br>Prosím, presuňte <b>os %1 %2</b> vašeho zariadenia na <b>maximum</"
+"b>. <br><br>Stlačte ľubovolné tlačidlo na zariadení alebo Ďalej pre "
+"nasledujúci krok.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -128,11 +114,11 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Verzia práve bežiaceho ovládača jadra (%1.%2.%3) nie je tá, pre ktorú bol tento "
-"modul preložený (%4.%5.%6)."
+"Verzia práve bežiaceho ovládača jadra (%1.%2.%3) nie je tá, pre ktorú bol "
+"tento modul preložený (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -155,7 +141,8 @@ msgstr ""
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"Nepodarilo sa inicializovať hodnoty kalibrácie pre zariadenie joysticku %1: %2"
+"Nepodarilo sa inicializovať hodnoty kalibrácie pre zariadenie joysticku %1: "
+"%2"
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
@@ -177,38 +164,28 @@ msgstr "TDE modul Ovládacieho centra pre test joystickov"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Joystick</h1>Tento modul pomáha overiť, či váš joystick správne funguje."
 "<br>Ak zistí nepsrávne hodnoty pre osi, pokúsi sa ich opraviť pomocou "
-"kalibrácie."
-"<br>Tento modul sa pokúsi nájsť všetky dostupné zariadenia joystickov kontrolou "
-"súborov /dev/js[0-4] a /dev/input/js[0-4]"
-"<br>Ak máte iný súbor zariadenia, zadajte ho priamo."
-"<br>Zoznam tlačidiel ukazuje stav tlačidiel joysticku. Zoznam os obsahuje "
-"aktuálne hodnoty pre všetky osi."
+"kalibrácie.<br>Tento modul sa pokúsi nájsť všetky dostupné zariadenia "
+"joystickov kontrolou súborov /dev/js[0-4] a /dev/input/js[0-4]<br>Ak máte "
+"iný súbor zariadenia, zadajte ho priamo.<br>Zoznam tlačidiel ukazuje stav "
+"tlačidiel joysticku. Zoznam os obsahuje aktuálne hodnoty pre všetky osi."
 "<br>Poznámka: aktuálny ovládač v jadre Linuxu (Kernel 2.4, 2.6) dokáže "
-"automaticky určiť iba "
-"<ul>"
-"<li>joystick s 2 osami, 4 tlačidlami</li>"
-"<li>3 osami, 4 tlačidlami</li>"
-"<li>4 osami, 4 tlačidlami</li>"
-"<li>Digitálne joysticky Saitek Cyborg</li></ul>(Detaily nájdete v zdrojových "
-"kódoch jadra Linuxu v súbore Documentation/input/joystick.txt)"
+"automaticky určiť iba <ul><li>joystick s 2 osami, 4 tlačidlami</li><li>3 "
+"osami, 4 tlačidlami</li><li>4 osami, 4 tlačidlami</li><li>Digitálne "
+"joysticky Saitek Cyborg</li></ul>(Detaily nájdete v zdrojových kódoch jadra "
+"Linuxu v súbore Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -248,14 +225,13 @@ msgstr "Kalibrovať"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Na tomto počítači nebolo nájdené žiadne zariadenie typu joystick."
-"<br>Skontrolovali sa súbory /dev/js[0-4] a /dev/input/js[0-4]."
-"<br>Ak viete, kde je joystick pripojený, zadajte správny súbor zariadenia."
+"<br>Skontrolovali sa súbory /dev/js[0-4] a /dev/input/js[0-4].<br>Ak viete, "
+"kde je joystick pripojený, zadajte správny súbor zariadenia."
 
 #: joywidget.cpp:236
 msgid ""
@@ -277,19 +253,13 @@ msgstr "Chyba zariadenia"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibrácia je o kontrole presnosti."
-"<br>"
-"<br><b>Prosím, presuňte všetky osi do stredovej pozície a potom sa už joysticku "
-"nedotýkajte.</b>"
-"<br>"
-"<br>Stlačením OK spustíte kalibráciu.</qt>"
+"<qt>Kalibrácia je o kontrole presnosti.<br><br><b>Prosím, presuňte všetky "
+"osi do stredovej pozície a potom sa už joysticku nedotýkajte.</"
+"b><br><br>Stlačením OK spustíte kalibráciu.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-sl/messages/tdebase/joystick.po b/tde-i18n-sl/messages/tdebase/joystick.po
index 5d38f940152..5cbe036493f 100644
--- a/tde-i18n-sl/messages/tdebase/joystick.po
+++ b/tde-i18n-sl/messages/tdebase/joystick.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-10-01 21:07+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <Slovenian <sl@li.org>>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
 "n%100==4 ? 2 : 3);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Gregor Rakar,Jure Repinc"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -54,55 +54,38 @@ msgstr "(običajno Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracija bo preverila obseg vrednosti, ki jih ima vaša naprava."
-"<br>"
-"<br>Prosim premaknite <b>os %1 %2</b> na svoji napravi na <b>najnižji</b> "
-"položaj."
-"<br>"
-"<br>Pritisnite katerikoli gumb na napravi ali pa gumb »Naprej«, da nadaljujete "
-"z naslednjim korakom.</qt>"
+"<br><br>Prosim premaknite <b>os %1 %2</b> na svoji napravi na <b>najnižji</"
+"b> položaj.<br><br>Pritisnite katerikoli gumb na napravi ali pa gumb "
+"»Naprej«, da nadaljujete z naslednjim korakom.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracija bo preverila obseg vrednosti, ki jih ima vaša naprava."
-"<br>"
-"<br>Prosim premaknite <b>os %1 %2</b> na svoji napravi na <b>srednji</b> "
-"položaj."
-"<br>"
-"<br>Pritisnite katerikoli gumb na napravi ali pa gumb »Naprej«, da nadaljujete "
-"z naslednjim korakom.</qt>"
+"<br><br>Prosim premaknite <b>os %1 %2</b> na svoji napravi na <b>srednji</b> "
+"položaj.<br><br>Pritisnite katerikoli gumb na napravi ali pa gumb »Naprej«, "
+"da nadaljujete z naslednjim korakom.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracija bo preverila obseg vrednosti, ki jih ima vaša naprava."
-"<br>"
-"<br>Prosim premaknite <b>os %1 %2</b> na svoji napravi na <b>najvišji</b> "
-"položaj."
-"<br>"
-"<br>Pritisnite katerikoli gumb na napravi ali pa gumb »Naprej«, da nadaljujete "
-"z naslednjim korakom.</qt>"
+"<br><br>Prosim premaknite <b>os %1 %2</b> na svoji napravi na <b>najvišji</"
+"b> položaj.<br><br>Pritisnite katerikoli gumb na napravi ali pa gumb "
+"»Naprej«, da nadaljujete z naslednjim korakom.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -131,15 +114,16 @@ msgstr "Dana naprava %1 ni igralna palica."
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
 msgstr ""
-"Ni bilo možno dobiti različice gonilnika jedra za napravo igralne palice %1: %2"
+"Ni bilo možno dobiti različice gonilnika jedra za napravo igralne palice %1: "
+"%2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Gonilnik jedra, ki teče trenutno (%1.%2.%3), ni tisti, za katerega je bil modul "
-"preveden (%4.%5.%6)."
+"Gonilnik jedra, ki teče trenutno (%1.%2.%3), ni tisti, za katerega je bil "
+"modul preveden (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -152,24 +136,26 @@ msgstr "Ni bilo možno dobiti števila osi za napravo igralne palice %1: %2"
 #: joydevice.cpp:99
 msgid "Could not get calibration values for joystick device %1: %2"
 msgstr ""
-"Ni bilo možno dobiti kalibracijskih vrednosti za napravo igralne palice %1: %2"
+"Ni bilo možno dobiti kalibracijskih vrednosti za napravo igralne palice %1: "
+"%2"
 
 #: joydevice.cpp:105
 msgid "Could not restore calibration values for joystick device %1: %2"
 msgstr ""
-"Ni bilo možno obnoviti kalibracijske vrednosti za napravo igralne palice %1: %2"
+"Ni bilo možno obnoviti kalibracijske vrednosti za napravo igralne palice %1: "
+"%2"
 
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"Ni bilo možno inicializirati kalibracijske vrednosti za napravo igralne palice "
-"%1: %2"
+"Ni bilo možno inicializirati kalibracijske vrednosti za napravo igralne "
+"palice %1: %2"
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
 msgstr ""
-"Ni bilo možno uveljaviti kalibracijske vrednosti za napravo igralne palice %1: "
-"%2"
+"Ni bilo možno uveljaviti kalibracijske vrednosti za napravo igralne palice "
+"%1: %2"
 
 #: joydevice.cpp:121
 msgid "internal error - code %1 unknown"
@@ -186,40 +172,30 @@ msgstr "Modul Nadzornega središča TDE za preizkus igralnih palic"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Igralna palica</h1>Ta modul vam omogoča preveriti, če vaša igralna palica "
-"deluje pravilno."
-"<br>Če sporoča nepravilne vrednosti za osi, lahko poskusite razrešiti to s "
-"kalibracijo."
-"<br>Ta modul poskuša najti vse razpoložljive igralne palice s preverjanjem "
-"naprav /dev/js[0-4] in /dev/input/js[0-4]"
-"<br>Če imate drugo datoteko naprave, jo vnesite v kombinacijsko polje."
-"<br>Seznam Gumbi prikazuje stanje gumbov na igralni palici, seznam Osi pa "
-"trenutne vrednosti za vse osi."
-"<br>OPOZORILO: trenutnen gonilnik naprave Linuxa (jedri 2.4 in 2.6) lahko "
-"samodejno zazna samo"
-"<ul>"
-"<li>igralno palico z dvema osema in štirimi gumbi</li>"
-"<li>igralno palico s tremi osemi in štirimi gumbi</li>"
-"<li>igralno palico s štirimi osemi in štirimi gumbi</li>"
-"<li>»digitalne« igralne palice Saitek Cyborg</li></ul> "
-"(Za več podrobnosti preverite datoteko iz izvorne kode vašega Linuxa "
-"»izvorna_koda/Documentation/input/joystick.txt«)"
+"<h1>Igralna palica</h1>Ta modul vam omogoča preveriti, če vaša igralna "
+"palica deluje pravilno.<br>Če sporoča nepravilne vrednosti za osi, lahko "
+"poskusite razrešiti to s kalibracijo.<br>Ta modul poskuša najti vse "
+"razpoložljive igralne palice s preverjanjem naprav /dev/js[0-4] in /dev/"
+"input/js[0-4]<br>Če imate drugo datoteko naprave, jo vnesite v kombinacijsko "
+"polje.<br>Seznam Gumbi prikazuje stanje gumbov na igralni palici, seznam Osi "
+"pa trenutne vrednosti za vse osi.<br>OPOZORILO: trenutnen gonilnik naprave "
+"Linuxa (jedri 2.4 in 2.6) lahko samodejno zazna samo<ul><li>igralno palico z "
+"dvema osema in štirimi gumbi</li><li>igralno palico s tremi osemi in štirimi "
+"gumbi</li><li>igralno palico s štirimi osemi in štirimi gumbi</"
+"li><li>»digitalne« igralne palice Saitek Cyborg</li></ul> (Za več "
+"podrobnosti preverite datoteko iz izvorne kode vašega Linuxa »izvorna_koda/"
+"Documentation/input/joystick.txt«)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -259,15 +235,13 @@ msgstr "Kalibriraj"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Na tem računalniku ni bilo najdene naprave igralne palice. "
-"<br>Preverjanja so bila opravljena v /dev/js[0-4] in /dev/input/js[0-4] "
-"<br>Če veste, da imate igralno palico priključeno, prosim vnesite pravilno "
-"datoteko naprave."
+"Na tem računalniku ni bilo najdene naprave igralne palice. <br>Preverjanja "
+"so bila opravljena v /dev/js[0-4] in /dev/input/js[0-4] <br>Če veste, da "
+"imate igralno palico priključeno, prosim vnesite pravilno datoteko naprave."
 
 #: joywidget.cpp:236
 msgid ""
@@ -289,19 +263,13 @@ msgstr "Napaka naprave"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibracija bo preverila natančnost."
-"<br>"
-"<br><b>Prosim premaknite vse osi v njihov središčni položaj in nato se ne "
-"dotaknite več igralne palice.</b>"
-"<br>"
-"<br>Kliknite »V redu« za pričetek kalibracije.</qt>"
+"<qt>Kalibracija bo preverila natančnost.<br><br><b>Prosim premaknite vse osi "
+"v njihov središčni položaj in nato se ne dotaknite več igralne palice.</"
+"b><br><br>Kliknite »V redu« za pričetek kalibracije.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-sr/messages/tdebase/joystick.po b/tde-i18n-sr/messages/tdebase/joystick.po
index aac8cc6323e..08d4ec9ae7c 100644
--- a/tde-i18n-sr/messages/tdebase/joystick.po
+++ b/tde-i18n-sr/messages/tdebase/joystick.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-10-25 18:02+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Топлица Танасковић"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,51 +51,37 @@ msgstr "(обично Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Калибрација ће управо да провери опсег вредности које уређај даје."
-"<br>"
-"<br>Померите <b>осу %1 %2</b> уређаја на <b>минимум</b>."
-"<br>"
-"<br>Притисните било које дугме на уређају или кликните на „Следеће“ да "
+"<br><br>Померите <b>осу %1 %2</b> уређаја на <b>минимум</b>."
+"<br><br>Притисните било које дугме на уређају или кликните на „Следеће“ да "
 "наставите ка следећем кораку.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Калибрација ће управо да провери опсег вредности које уређај даје."
-"<br>"
-"<br>Померите <b>осу %1 %2</b> уређаја на <b>средину</b>."
-"<br>"
-"<br>Притисните било које дугме на уређају или кликните на „Следеће“ да "
+"<br><br>Померите <b>осу %1 %2</b> уређаја на <b>средину</b>."
+"<br><br>Притисните било које дугме на уређају или кликните на „Следеће“ да "
 "наставите ка следећем кораку.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Калибрација ће управо да провери опсег вредности које уређај даје."
-"<br>"
-"<br>Померите <b>осу %1 %2</b> уређаја на <b>максимум</b>."
-"<br>"
-"<br>Притисните било које дугме на уређају или кликните на „Следеће“ да "
+"<br><br>Померите <b>осу %1 %2</b> уређаја на <b>максимум</b>."
+"<br><br>Притисните било које дугме на уређају или кликните на „Следеће“ да "
 "наставите ка следећем кораку.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -130,8 +116,8 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "Верзија кернела који се извршава (%1.%2.%3) није она за коју је овај модул "
 "компајлиран (%4.%5.%6)."
@@ -176,39 +162,28 @@ msgstr "Модул TDE-овог контролног центра за тест�
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Џојстик</h1>Овај модул вам помаже да проверите да ли ваш џојстик ради "
-"исправно."
-"<br>Ако даје погрешне вредности за осе, можете покушати да то поправите "
-"калибрацијом."
-"<br>Овај модул покушава да пронађе све доступне џојстик уређаје проверавајући "
-"/dev/js[0-4] и /dev/input/js[0-4]"
-"<br>Ако имате неки други фајл уређаја, унесите га у комбо пољу."
-"<br>Листа дугмади приказује стање дугмади на вашем џојстику, листа оса "
-"приказује текуће вредности за све осе."
-"<br>НАПОМЕНА: Текући Linux управљачки програм (кернел и 2.4 и 2.6 серије) може "
-"аутоматски да открије само џојстике са:"
-"<ul>"
-"<li>две осе и четири дугмета</li>"
-"<li>три осе и четири дугмета</li>"
-"<li>четири осе и четири дугмета</li>"
-"<li>Saitek Cyborg „дигиталне“ џојстике</li></ul>(За детаље погледајте "
-"документацију за џојстике под Linux-ом)"
+"исправно.<br>Ако даје погрешне вредности за осе, можете покушати да то "
+"поправите калибрацијом.<br>Овај модул покушава да пронађе све доступне "
+"џојстик уређаје проверавајући /dev/js[0-4] и /dev/input/js[0-4]<br>Ако имате "
+"неки други фајл уређаја, унесите га у комбо пољу.<br>Листа дугмади приказује "
+"стање дугмади на вашем џојстику, листа оса приказује текуће вредности за све "
+"осе.<br>НАПОМЕНА: Текући Linux управљачки програм (кернел и 2.4 и 2.6 "
+"серије) може аутоматски да открије само џојстике са:<ul><li>две осе и четири "
+"дугмета</li><li>три осе и четири дугмета</li><li>четири осе и четири "
+"дугмета</li><li>Saitek Cyborg „дигиталне“ џојстике</li></ul>(За детаље "
+"погледајте документацију за џојстике под Linux-ом)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -248,14 +223,13 @@ msgstr "Калибриши"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Није пронађен ниједан џојстик прикључен на овај рачунар."
-"<br>Проверени су /dev/js[0-4] и /dev/input/js[0-4]"
-"<br>Ако сте сигурни да је џојстик прикључен, унесите исправан фајл уређаја."
+"Није пронађен ниједан џојстик прикључен на овај рачунар.<br>Проверени су /"
+"dev/js[0-4] и /dev/input/js[0-4]<br>Ако сте сигурни да је џојстик прикључен, "
+"унесите исправан фајл уређаја."
 
 #: joywidget.cpp:236
 msgid ""
@@ -277,18 +251,13 @@ msgstr "Грешка уређаја"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Калибрација ће управо да провери прецизност."
-"<br>"
-"<br><b>Померите све осе у њихову средишњу позицију и не померајте џојстик.</b>"
-"<br>"
-"<br>Притисните дугме „У реду“ да бисте започели калибрацију.</qt>"
+"<qt>Калибрација ће управо да провери прецизност.<br><br><b>Померите све осе "
+"у њихову средишњу позицију и не померајте џојстик.</b><br><br>Притисните "
+"дугме „У реду“ да бисте започели калибрацију.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-sr@Latn/messages/tdebase/joystick.po b/tde-i18n-sr@Latn/messages/tdebase/joystick.po
index ad627deb74f..0a6197f0282 100644
--- a/tde-i18n-sr@Latn/messages/tdebase/joystick.po
+++ b/tde-i18n-sr@Latn/messages/tdebase/joystick.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-10-25 18:02+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Toplica Tanasković"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,51 +51,37 @@ msgstr "(obično Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracija će upravo da proveri opseg vrednosti koje uređaj daje."
-"<br>"
-"<br>Pomerite <b>osu %1 %2</b> uređaja na <b>minimum</b>."
-"<br>"
-"<br>Pritisnite bilo koje dugme na uređaju ili kliknite na „Sledeće“ da "
+"<br><br>Pomerite <b>osu %1 %2</b> uređaja na <b>minimum</b>."
+"<br><br>Pritisnite bilo koje dugme na uređaju ili kliknite na „Sledeće“ da "
 "nastavite ka sledećem koraku.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracija će upravo da proveri opseg vrednosti koje uređaj daje."
-"<br>"
-"<br>Pomerite <b>osu %1 %2</b> uređaja na <b>sredinu</b>."
-"<br>"
-"<br>Pritisnite bilo koje dugme na uređaju ili kliknite na „Sledeće“ da "
+"<br><br>Pomerite <b>osu %1 %2</b> uređaja na <b>sredinu</b>."
+"<br><br>Pritisnite bilo koje dugme na uređaju ili kliknite na „Sledeće“ da "
 "nastavite ka sledećem koraku.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Kalibracija će upravo da proveri opseg vrednosti koje uređaj daje."
-"<br>"
-"<br>Pomerite <b>osu %1 %2</b> uređaja na <b>maksimum</b>."
-"<br>"
-"<br>Pritisnite bilo koje dugme na uređaju ili kliknite na „Sledeće“ da "
+"<br><br>Pomerite <b>osu %1 %2</b> uređaja na <b>maksimum</b>."
+"<br><br>Pritisnite bilo koje dugme na uređaju ili kliknite na „Sledeće“ da "
 "nastavite ka sledećem koraku.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -125,13 +111,13 @@ msgstr "Dati uređaj %1 nije džojstik."
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
 msgstr ""
-"Ne mogu da dobijem verziju kernelovog upravljačkog programa za džojstik uređaj "
-"%1: %2"
+"Ne mogu da dobijem verziju kernelovog upravljačkog programa za džojstik "
+"uređaj %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "Verzija kernela koji se izvršava (%1.%2.%3) nije ona za koju je ovaj modul "
 "kompajliran (%4.%5.%6)."
@@ -176,39 +162,28 @@ msgstr "Modul TDE-ovog kontrolnog centra za testiranje džojstika"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Džojstik</h1>Ovaj modul vam pomaže da proverite da li vaš džojstik radi "
-"ispravno."
-"<br>Ako daje pogrešne vrednosti za ose, možete pokušati da to popravite "
-"kalibracijom."
-"<br>Ovaj modul pokušava da pronađe sve dostupne džojstik uređaje proveravajući "
-"/dev/js[0-4] i /dev/input/js[0-4]"
-"<br>Ako imate neki drugi fajl uređaja, unesite ga u kombo polju."
-"<br>Lista dugmadi prikazuje stanje dugmadi na vašem džojstiku, lista osa "
-"prikazuje tekuće vrednosti za sve ose."
-"<br>NAPOMENA: Tekući Linux upravljački program (kernel i 2.4 i 2.6 serije) može "
-"automatski da otkrije samo džojstike sa:"
-"<ul>"
-"<li>dve ose i četiri dugmeta</li>"
-"<li>tri ose i četiri dugmeta</li>"
-"<li>četiri ose i četiri dugmeta</li>"
-"<li>Saitek Cyborg „digitalne“ džojstike</li></ul>(Za detalje pogledajte "
-"dokumentaciju za džojstike pod Linux-om)"
+"ispravno.<br>Ako daje pogrešne vrednosti za ose, možete pokušati da to "
+"popravite kalibracijom.<br>Ovaj modul pokušava da pronađe sve dostupne "
+"džojstik uređaje proveravajući /dev/js[0-4] i /dev/input/js[0-4]<br>Ako "
+"imate neki drugi fajl uređaja, unesite ga u kombo polju.<br>Lista dugmadi "
+"prikazuje stanje dugmadi na vašem džojstiku, lista osa prikazuje tekuće "
+"vrednosti za sve ose.<br>NAPOMENA: Tekući Linux upravljački program (kernel "
+"i 2.4 i 2.6 serije) može automatski da otkrije samo džojstike sa:<ul><li>dve "
+"ose i četiri dugmeta</li><li>tri ose i četiri dugmeta</li><li>četiri ose i "
+"četiri dugmeta</li><li>Saitek Cyborg „digitalne“ džojstike</li></ul>(Za "
+"detalje pogledajte dokumentaciju za džojstike pod Linux-om)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -248,14 +223,13 @@ msgstr "Kalibriši"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Nije pronađen nijedan džojstik priključen na ovaj računar."
-"<br>Provereni su /dev/js[0-4] i /dev/input/js[0-4]"
-"<br>Ako ste sigurni da je džojstik priključen, unesite ispravan fajl uređaja."
+"Nije pronađen nijedan džojstik priključen na ovaj računar.<br>Provereni su /"
+"dev/js[0-4] i /dev/input/js[0-4]<br>Ako ste sigurni da je džojstik "
+"priključen, unesite ispravan fajl uređaja."
 
 #: joywidget.cpp:236
 msgid ""
@@ -277,19 +251,13 @@ msgstr "Greška uređaja"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibracija će upravo da proveri preciznost."
-"<br>"
-"<br><b>Pomerite sve ose u njihovu središnju poziciju i ne pomerajte "
-"džojstik.</b>"
-"<br>"
-"<br>Pritisnite dugme „U redu“ da biste započeli kalibraciju.</qt>"
+"<qt>Kalibracija će upravo da proveri preciznost.<br><br><b>Pomerite sve ose "
+"u njihovu središnju poziciju i ne pomerajte džojstik.</b><br><br>Pritisnite "
+"dugme „U redu“ da biste započeli kalibraciju.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-sv/messages/tdebase/joystick.po b/tde-i18n-sv/messages/tdebase/joystick.po
index 51dc5c98053..3e270bd6d16 100644
--- a/tde-i18n-sv/messages/tdebase/joystick.po
+++ b/tde-i18n-sv/messages/tdebase/joystick.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-09-04 14:58+0200\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
 "Language-Team: Svenska <sv@li.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Stefan Asserhäll"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -52,52 +52,38 @@ msgstr "(oftast Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibreringen ska just kontrollera värdeintervallet som enheten levererar."
-"<br>"
-"<br>Flytta enhetens <b>axel %1 %2</b> till den <b>minimala</b> positionen."
-"<br>"
-"<br>Tryck på vilken knapp som helst på enheten eller knappen Nästa för att "
-"fortsätta med nästa steg.</qt>"
+"<qt>Kalibreringen ska just kontrollera värdeintervallet som enheten "
+"levererar.<br><br>Flytta enhetens <b>axel %1 %2</b> till den <b>minimala</b> "
+"positionen.<br><br>Tryck på vilken knapp som helst på enheten eller knappen "
+"Nästa för att fortsätta med nästa steg.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibreringen ska just kontrollera värdeintervallet som enheten levererar."
-"<br>"
-"<br>Flytta enhetens <b>axel %1 %2</b> till den <b>centrala</b> positionen."
-"<br>"
-"<br>Tryck på vilken knapp som helst på enheten eller knappen Nästa för att "
-"fortsätta med nästa steg.</qt>"
+"<qt>Kalibreringen ska just kontrollera värdeintervallet som enheten "
+"levererar.<br><br>Flytta enhetens <b>axel %1 %2</b> till den <b>centrala</b> "
+"positionen.<br><br>Tryck på vilken knapp som helst på enheten eller knappen "
+"Nästa för att fortsätta med nästa steg.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Kalibreringen ska just kontrollera värdeintervallet som enheten levererar."
-"<br>"
-"<br>Flytta enhetens <b>axel %1 %2</b> till den <b>maximala</b> positionen."
-"<br>"
-"<br>Tryck på vilken knapp som helst på enheten eller knappen Nästa för att "
-"fortsätta med nästa steg.</qt>"
+"<qt>Kalibreringen ska just kontrollera värdeintervallet som enheten "
+"levererar.<br><br>Flytta enhetens <b>axel %1 %2</b> till den <b>maximala</b> "
+"positionen.<br><br>Tryck på vilken knapp som helst på enheten eller knappen "
+"Nästa för att fortsätta med nästa steg.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -129,11 +115,11 @@ msgstr "Kunde inte hämta kärnans version för styrspaksenhet %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Versionen av kärnans drivrutin som för närvarande körs (%1.%2.%3) är inte den "
-"som modulen kompilerades för (%4.%5.%6)."
+"Versionen av kärnans drivrutin som för närvarande körs (%1.%2.%3) är inte "
+"den som modulen kompilerades för (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -174,38 +160,28 @@ msgstr "TDE-inställningsmodul för att testa styrspakar"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>Styrspak</h1> Den här modulen hjälper till att kontrollera om styrspaken "
-"fungerar som den ska."
-"<br>Om den levererar felaktiga värden för axlarna, kan du försöka lösa det med "
-"kalibrering."
-"<br> Modulen försöker hitta alla tillgängliga styrspaksenheter genom att "
-"kontrollera /dev/js[0-4] och /dev/input/js[0-4]"
-"<br>Listan med knappar visar knapparnas tillstånd på styrspaken, listan med "
-"axlar visar aktuellt värde för alla axlar."
-"<br>Observera: den aktuella drivrutinen i Linux (för kärnan 2.4 eller 2.6) kan "
-"bara automatiskt identifiera"
-"<ul>"
-"<li>2-axlars, 4-knappars styrspak</li>"
-"<li>3-axlars, 4-knappars styrspak</li>"
-"<li>4-axlars, 4-knappars styrspak</li>"
-"<li>Saitek Cyborg \"digitala\" styrspakar</li></ul>(För detaljinformation kan "
-"du titta i Linux-filen source/Documentation/input/joystick.txt)."
+"fungerar som den ska.<br>Om den levererar felaktiga värden för axlarna, kan "
+"du försöka lösa det med kalibrering.<br> Modulen försöker hitta alla "
+"tillgängliga styrspaksenheter genom att kontrollera /dev/js[0-4] och /dev/"
+"input/js[0-4]<br>Listan med knappar visar knapparnas tillstånd på "
+"styrspaken, listan med axlar visar aktuellt värde för alla axlar."
+"<br>Observera: den aktuella drivrutinen i Linux (för kärnan 2.4 eller 2.6) "
+"kan bara automatiskt identifiera<ul><li>2-axlars, 4-knappars styrspak</"
+"li><li>3-axlars, 4-knappars styrspak</li><li>4-axlars, 4-knappars styrspak</"
+"li><li>Saitek Cyborg \"digitala\" styrspakar</li></ul>(För detaljinformation "
+"kan du titta i Linux-filen source/Documentation/input/joystick.txt)."
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -245,14 +221,13 @@ msgstr "Kalibrera"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Ingen styrspaksenhet hittades automatiskt på datorn."
-"<br>Kontroller gjordes för /dev/js[0-4] och /dev/input/js[0-4]."
-"<br>Om du vet att en är ansluten, ange korrekt enhetsfil."
+"Ingen styrspaksenhet hittades automatiskt på datorn.<br>Kontroller gjordes "
+"för /dev/js[0-4] och /dev/input/js[0-4].<br>Om du vet att en är ansluten, "
+"ange korrekt enhetsfil."
 
 #: joywidget.cpp:236
 msgid ""
@@ -274,19 +249,13 @@ msgstr "Enhetsfel"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibreringen ska just kontrollera precisionen."
-"<br>"
-"<br><b>Flytta alla axlar till den centrala positionen och rör därefter inte "
-"styrspaken.</b>"
-"<br>"
-"<br>Klicka på OK för att starta kalibreringen.</qt>"
+"<qt>Kalibreringen ska just kontrollera precisionen.<br><br><b>Flytta alla "
+"axlar till den centrala positionen och rör därefter inte styrspaken.</"
+"b><br><br>Klicka på OK för att starta kalibreringen.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-ta/messages/tdebase/joystick.po b/tde-i18n-ta/messages/tdebase/joystick.po
index 5df3e5f5611..b64ac7b4117 100644
--- a/tde-i18n-ta/messages/tdebase/joystick.po
+++ b/tde-i18n-ta/messages/tdebase/joystick.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2004-08-09 03:18-0800\n"
 "Last-Translator: Tamil PC <tamilpc@ambalam.com>\n"
 "Language-Team:  <ta@li.org>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "விஜய்"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -50,51 +50,37 @@ msgstr ""
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>உங்கள் சாதனத்தின் அளவினை அளவொப்புமை பற்றி சரிபார்க்கவும்."
-"<br>"
-"<br>நகர்த்தும்<b>அச்சு %1</b> உங்கள் சாதனத்தில் <b>குறைந்தப்ட்ச</b> நிலை."
-"<br>"
-"<br>சாதனத்தின் பொத்தனை அழுத்தி அடுத்த கட்டத்திற்க்கு செல்வும்.</qt>"
+"<qt>உங்கள் சாதனத்தின் அளவினை அளவொப்புமை பற்றி சரிபார்க்கவும்.<br><br>நகர்த்தும்<b>அச்சு "
+"%1</b> உங்கள் சாதனத்தில் <b>குறைந்தப்ட்ச</b> நிலை.<br><br>சாதனத்தின் பொத்தனை அழுத்தி "
+"அடுத்த கட்டத்திற்க்கு செல்வும்.</qt>"
 
 #: caldialog.cpp:107
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>உங்கள் சாதனத்தின் அளவினை அளவொப்புமை பற்றி சரிபார்க்கவும்."
-"<br>"
-"<br>நகர்த்தும்<b>அச்சு %1</b> உங்கள் சாதனத்தில் <b>நடுவே</b> நிலை."
-"<br>"
-"<br>சாதனத்தின் பொத்தனை அழுத்தி அடுத்த கட்டத்திற்க்கு செல்வும்.</qt>"
+"<qt>உங்கள் சாதனத்தின் அளவினை அளவொப்புமை பற்றி சரிபார்க்கவும்.<br><br>நகர்த்தும்<b>அச்சு "
+"%1</b> உங்கள் சாதனத்தில் <b>நடுவே</b> நிலை.<br><br>சாதனத்தின் பொத்தனை அழுத்தி அடுத்த "
+"கட்டத்திற்க்கு செல்வும்.</qt>"
 
 #: caldialog.cpp:124
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>உங்கள் சாதனத்தின் அளவினை அளவொப்புமை பற்றி சரிபார்க்கவும்."
-"<br>"
-"<br>நகர்த்தும்<b>அச்சு %1</b> உங்கள் சாதனத்தில் <b>அதிகபட்ச</b> நிலை."
-"<br>"
-"<br>சாதனத்தின் பொத்தனை அழுத்தி அடுத்த கட்டத்திற்க்கு செல்வும்.</qt>"
+"<qt>உங்கள் சாதனத்தின் அளவினை அளவொப்புமை பற்றி சரிபார்க்கவும்.<br><br>நகர்த்தும்<b>அச்சு "
+"%1</b> உங்கள் சாதனத்தில் <b>அதிகபட்ச</b> நிலை.<br><br>சாதனத்தின் பொத்தனை அழுத்தி "
+"அடுத்த கட்டத்திற்க்கு செல்வும்.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -122,13 +108,12 @@ msgstr "%1 சாதனம் ஜாய்சிட்டிக் இல்ல�
 
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
-msgstr ""
-"கருவக இயக்கி பதிப்பை இயக்கும் கருவி சாதனம் %1 க்காக பெற முடியவில்லை: %2"
+msgstr "கருவக இயக்கி பதிப்பை இயக்கும் கருவி சாதனம் %1 க்காக பெற முடியவில்லை: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "தற்போது இயக்கும் கருவக இயக்கி பதிப்பு (%1.%2.%3) இந்த கூறு (%4.%5.%6) க்காக "
 "தொக்க்கவில்லை."
@@ -172,36 +157,27 @@ msgstr "TDE கட்டுப்பாட்டு மைய கூறுகள
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 "<h1>ƒ¡Â¢º¢ðÊì</h1>þó¾ ÜÚ ƒ¡Â¢º¢ðÊì ºÃ¢Â¡¸ §Å¨Ç ¦ºö¸¢È¾¡ ±É ºÃ¢ôÀ¡÷ìÌõ."
-"<br>«î͸ÙìÌ ¾ÅÈ¡É Á¾¢ô¨À «Ç¢ò¾¡ø,«Ç¦Å¡ôÒŨÁìÌû ºÃ¢¦ºö ÓÂüº¢ì¸Ä¡õ ."
-"<br>/dev/js[0-4] ÁüÚõ /dev/input/js[0-4] ºÃ¢À¡÷òÐ þó¾ ÜÚ «¨ÉòÐ ƒ¡öº¢ðÊ쨸Ôõ "
-"§¾Îõ"
-"<br>«Îò¾ º¡¾É §¸¡ôÒ þÕó¾¡ø,¦À¡ðÊÂÄ¢ø ¯ûÇ£¼×õ."
-"<br>¦À¡ò¾¡ý ÀðÊÂø ¯í¸û ƒ¡öº¢ðʸ¢ø ¯ûÇ ¦À¡ò¾¡ý¸Ç¢ý ¿¢¨Ä¨Â ¸¡ðÎõ,«¨ÉòÐ «î͸Ǣý "
-"¾ü§À¡¨¾Â Á¾¢ô¨À «îÍ ÀðÊÂø ¸¡ðÎõ."
-"<br>NOTE: ¾ü§À¡¨¾Â ĢɊ º¡¾É þÂ츢¡ø (¦¸÷Éø 2.4, 2.6) ÁðÎõ ¸ñÎÀ¢Êì¸ þÂÖõ"
-"<ul>"
-"<li>2-«î͸û, 4-¦À¡ò¾¡ý ƒ¡Â¢º¢ðÊì</li>"
-"<li>3-«î͸û, 4-¦À¡ò¾¡ý ƒ¡Â¢º¢ðÊì</li>"
-"<li>4-«î͸û, 4-¦À¡ò¾¡ý ƒ¡Â¢º¢ðÊì</li>"
-"<li>º¡Â¢ðì ºö§À¡÷ì 'ʃ¢ð¼ø' ƒ¡Â¢º¢ðÊì</li></ul>(§ÁÖõ Å¢ÅÃí¸ÙìÌ ¿£í¸û þ¨¾ "
-"À¡÷ì¸Ä¡õ Linux source/Documentation/input/joystick.txt)"
+"<br>«î͸ÙìÌ ¾ÅÈ¡É Á¾¢ô¨À «Ç¢ò¾¡ø,«Ç¦Å¡ôÒŨÁìÌû ºÃ¢¦ºö ÓÂüº¢ì¸Ä¡õ .<br>/dev/"
+"js[0-4] ÁüÚõ /dev/input/js[0-4] ºÃ¢À¡÷òÐ þó¾ ÜÚ «¨ÉòÐ ƒ¡öº¢ðÊ쨸Ôõ "
+"§¾Îõ<br>«Îò¾ º¡¾É §¸¡ôÒ þÕó¾¡ø,¦À¡ðÊÂÄ¢ø ¯ûÇ£¼×õ.<br>¦À¡ò¾¡ý ÀðÊÂø ¯í¸û ƒ¡öº"
+"¢ðʸ¢ø ¯ûÇ ¦À¡ò¾¡ý¸Ç¢ý ¿¢¨Ä¨Â ¸¡ðÎõ,«¨ÉòÐ «î͸Ǣý ¾ü§À¡¨¾Â Á¾¢ô¨À «îÍ ÀðÊÂø "
+"¸¡ðÎõ.<br>NOTE: ¾ü§À¡¨¾Â ĢɊ º¡¾É þÂ츢¡ø (¦¸÷Éø 2.4, 2.6) ÁðÎõ ¸ñÎÀ¢Êì¸ "
+"þÂÖõ<ul><li>2-«î͸û, 4-¦À¡ò¾¡ý ƒ¡Â¢º¢ðÊì</li><li>3-«î͸û, 4-¦À¡ò¾¡ý ƒ¡Â¢º¢ðÊì</"
+"li><li>4-«î͸û, 4-¦À¡ò¾¡ý ƒ¡Â¢º¢ðÊì</li><li>º¡Â¢ðì ºö§À¡÷ì 'ʃ¢ð¼ø' ƒ¡Â¢º¢ðÊì</"
+"li></ul>(§ÁÖõ Å¢ÅÃí¸ÙìÌ ¿£í¸û þ¨¾ À¡÷ì¸Ä¡õ Linux source/Documentation/input/"
+"joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -242,10 +218,9 @@ msgstr "அளவொப்புமை"
 #: joywidget.cpp:190
 #, fuzzy
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "இந்த கணினியில் ஜாய்ஸ்டிக் சாதனம் தானாகவே உள்ளது.\n"
 "/dev/js[0-4] and /dev/input/js[0-4]ல் செய்ததை சரிப்பார்க்கிறது\n"
@@ -258,8 +233,8 @@ msgid ""
 "enter a device file, like /dev/js0."
 msgstr ""
 "கொடுக்கப்பட்டுள்ள சாதனத்தின் பெயர் செல்லாது (/dev இல்லை).\n"
-"பட்டியலில் இருந்து ஒரு சாதனத்தை தேர்ந்தெடுக்கவும் அல்லது/dev/js0 போன்ற சாதனக் "
-"கோப்பை உள்ளிடவும்."
+"பட்டியலில் இருந்து ஒரு சாதனத்தை தேர்ந்தெடுக்கவும் அல்லது/dev/js0 போன்ற சாதனக் கோப்பை "
+"உள்ளிடவும்."
 
 #: joywidget.cpp:238
 msgid "Unknown Device"
@@ -271,24 +246,18 @@ msgstr "சாதன பிழை"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>«Ç¦Å¡ôÒŨÁ ÐøÄ¢Âò¨¾ ºÃ¢À¡÷ìÌõ."
-"<br>"
-"<br><b>¿Î§Å «¨Áó¾ «¨ÉòÐ «î͸¨ÇÔõ ¿¸÷ò¾×õ ÁüÚõ ƒ¡öº¢Ê쨸 ¦¾¡¼¾£÷¸û .</b>"
-"<br>"
-"<br>«Ç¦Å¡ôÒŨÁOK «Øò¾¢ ¦¾¡¼í¸×õ.</qt>"
+"<qt>«Ç¦Å¡ôÒŨÁ ÐøÄ¢Âò¨¾ ºÃ¢À¡÷ìÌõ.<br><br><b>¿Î§Å «¨Áó¾ «¨ÉòÐ «î͸¨ÇÔõ "
+"¿¸÷ò¾×õ ÁüÚõ ƒ¡öº¢Ê쨸 ¦¾¡¼¾£÷¸û .</b><br><br>«Ç¦Å¡ôÒŨÁOK «Øò¾¢ ¦¾¡¼í¸×õ.</"
+"qt>"
 
 #: joywidget.cpp:372
 #, c-format
 msgid "Restored all calibration values for joystick device %1."
-msgstr ""
-"அனைத்து ஒழுங்கிணைப்பு மதிப்புகளை இயக்குகருவி சாதனம் %1க்காக திரும்ப அமைக்கும்."
+msgstr "அனைத்து ஒழுங்கிணைப்பு மதிப்புகளை இயக்குகருவி சாதனம் %1க்காக திரும்ப அமைக்கும்."
 
 #~ msgid "No Device"
 #~ msgstr "சாதனம் இல்லை"
diff --git a/tde-i18n-tg/messages/tdebase/joystick.po b/tde-i18n-tg/messages/tdebase/joystick.po
index 1ef94a2546c..64ce0fdd3af 100644
--- a/tde-i18n-tg/messages/tdebase/joystick.po
+++ b/tde-i18n-tg/messages/tdebase/joystick.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2004-07-19 19:00+0000\n"
 "Last-Translator: Abrorova <H_Abrorova@rambler.ru>\n"
 "Language-Team:  Tajik\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Абророва Хиромон"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -53,60 +53,40 @@ msgstr ""
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Ҳоло калибрченкунӣ бо санҷидани қиммати маҳдудаи дастгоҳи дастраси шумо "
-"машғул аст."
-"<br>"
-"<br>Марҳамат карда <b>меҳварҳоро %1</b> дар дастгоҳи худ ба мавқеъи <b>"
-"хурдтарин</b> ҳаракат диҳед."
-"<br>"
-"<br>Дилхоҳ тугмаро дар дастгоҳ барои идома додан бо қадами оянда пахш "
-"кунед.</qt>"
+"машғул аст.<br><br>Марҳамат карда <b>меҳварҳоро %1</b> дар дастгоҳи худ ба "
+"мавқеъи <b>хурдтарин</b> ҳаракат диҳед.<br><br>Дилхоҳ тугмаро дар дастгоҳ "
+"барои идома додан бо қадами оянда пахш кунед.</qt>"
 
 #: caldialog.cpp:107
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Ҳоло калибрченкунӣ бо санҷидани қиммати маҳдудаи дастгоҳи дастраси шумо "
-"машғул аст."
-"<br>"
-"<br>Марҳамат карда <b>меҳварҳоро %1</b> дар дастгоҳи худ ба мавқеъи <b>"
-"мобайнӣ</b> ҳаракат диҳед."
-"<br>"
-"<br>Дилхоҳ тугмаро дар дастгоҳ барои идома додан бо қадами оянда пахш "
-"кунед.</qt>"
+"машғул аст.<br><br>Марҳамат карда <b>меҳварҳоро %1</b> дар дастгоҳи худ ба "
+"мавқеъи <b>мобайнӣ</b> ҳаракат диҳед.<br><br>Дилхоҳ тугмаро дар дастгоҳ "
+"барои идома додан бо қадами оянда пахш кунед.</qt>"
 
 #: caldialog.cpp:124
 #, fuzzy
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Ҳоло калибрченкунӣ бо санҷидани қиммати маҳдудаи дастгоҳи дастраси шумо "
-"машғул аст."
-"<br>"
-"<br>Марҳамат карда <b>меҳварҳоро %1</b> дар дастгоҳи худ ба мавқеъи <b>"
-"зиёдтарин</b> ҳаракат диҳед."
-"<br>"
-"<br>Дилхоҳ тугмаро дар дастгоҳ барои идома додан бо қадами оянда пахш "
-"кунед.</qt>"
+"машғул аст.<br><br>Марҳамат карда <b>меҳварҳоро %1</b> дар дастгоҳи худ ба "
+"мавқеъи <b>зиёдтарин</b> ҳаракат диҳед.<br><br>Дилхоҳ тугмаро дар дастгоҳ "
+"барои идома додан бо қадами оянда пахш кунед.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -135,13 +115,13 @@ msgstr "Дастгоҳи додашудаи %1 дастаи бозӣ нест."
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
 msgstr ""
-"Гирифтани нусхаи гардонандаи ҳаста барои дастгоҳи дастаи бозӣ нашуда истодааст "
-"%1: %2"
+"Гирифтани нусхаи гардонандаи ҳаста барои дастгоҳи дастаи бозӣ нашуда "
+"истодааст %1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "Нусхаи иҷрошавандаи ҷории гардонандаи ҳаста (%1.%2.%3) на онест, ки ин модул "
 "ҳамгардонӣ мекунад (%4.%5.%6)."
@@ -159,8 +139,8 @@ msgstr ""
 #: joydevice.cpp:99
 msgid "Could not get calibration values for joystick device %1: %2"
 msgstr ""
-"Гирифтани қиммати калибрченкунӣ барои дастгоҳи дастаи бозӣ нашуда истодааст %1: "
-"%2"
+"Гирифтани қиммати калибрченкунӣ барои дастгоҳи дастаи бозӣ нашуда истодааст "
+"%1: %2"
 
 #: joydevice.cpp:105
 msgid "Could not restore calibration values for joystick device %1: %2"
@@ -171,8 +151,8 @@ msgstr ""
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"Шиносоии қиммати калибрченкунӣ барои дастгоҳи дастаи бозӣ нашуда истодааст %1: "
-"%2"
+"Шиносоии қиммати калибрченкунӣ барои дастгоҳи дастаи бозӣ нашуда истодааст "
+"%1: %2"
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
@@ -195,41 +175,31 @@ msgstr "TDE Модули Марказии Идоракунӣ барои санҷ
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Дастаи бозӣ</h1>Ин модул ба шумо имконияти санҷидани дурустии кори дастаи "
-"бозиро медиҳад."
-"<br>Агар он қиммати нодурусти меҳварро вогузорад, пас шумо метавонед онро ба "
-"воситаи калибрченкунӣ ҳал намоед."
-"<br>Ин модул кӯшиши дарёфт намудани ҳамаи дастгоҳҳои дастаи бозии имконпазирро "
-"ба воситаи интихоби /dev/js[0-4] ва /dev/input/js[0-4] менамояд"
-"<br>Агар шумо дигар файли дастгоҳро дошта бошед, онро дар зерқутти ворид кунед."
-"<br>Рӯйхати Тугмаҳо ба шумо ҳолати тугмаҳоро дар дастаи бозии шумо нишон "
-"медиҳад, рӯйхати Меҳварҳо бошад, қиммати ҷориро барои ҳамаи меҳварҳо нишон "
-"медиҳад."
+"<h1>Дастаи бозӣ</h1>Ин модул ба шумо имконияти санҷидани дурустии кори "
+"дастаи бозиро медиҳад.<br>Агар он қиммати нодурусти меҳварро вогузорад, пас "
+"шумо метавонед онро ба воситаи калибрченкунӣ ҳал намоед.<br>Ин модул кӯшиши "
+"дарёфт намудани ҳамаи дастгоҳҳои дастаи бозии имконпазирро ба воситаи "
+"интихоби /dev/js[0-4] ва /dev/input/js[0-4] менамояд<br>Агар шумо дигар "
+"файли дастгоҳро дошта бошед, онро дар зерқутти ворид кунед.<br>Рӯйхати "
+"Тугмаҳо ба шумо ҳолати тугмаҳоро дар дастаи бозии шумо нишон медиҳад, "
+"рӯйхати Меҳварҳо бошад, қиммати ҷориро барои ҳамаи меҳварҳо нишон медиҳад."
 "<br>ЭЗОҲ: гардонандаи дастгоҳ ҷории Linux (Ҳастаи 2.4, 2.6) танҳо инҳоро "
-"худмуайян карда метавонад"
-"<ul>"
-"<li>2-меҳвар, дастаи базии 4-чортугмагӣ </li>"
-"<li>3-меҳвар, дастаи базии 4-чортугмагӣ</li>"
-"<li>4-меҳвар, дастаи базии 4-чортугмагӣ</li>"
-"<li>Saitek Cyborg 'рақамии' дастаҳои бозӣ</li></ul>(Барои маълумоти иловагӣ "
-"шумо метавонед Linux source/Documentation/input/joystick.txt-ро аз назар "
-"гузаронед)"
+"худмуайян карда метавонад<ul><li>2-меҳвар, дастаи базии 4-чортугмагӣ </"
+"li><li>3-меҳвар, дастаи базии 4-чортугмагӣ</li><li>4-меҳвар, дастаи базии 4-"
+"чортугмагӣ</li><li>Saitek Cyborg 'рақамии' дастаҳои бозӣ</li></ul>(Барои "
+"маълумоти иловагӣ шумо метавонед Linux source/Documentation/input/joystick."
+"txt-ро аз назар гузаронед)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -270,10 +240,9 @@ msgstr "Калибр"
 #: joywidget.cpp:190
 #, fuzzy
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Дар ин компютер ба таври худкор ягон дастгоҳи дастаи бозӣ пайдо нагардид.\n"
 "Санҷишҳо дар /dev/js[0-4] ва /dev/input/js[0-4] гузаронида шудаанд\n"
@@ -300,19 +269,13 @@ msgstr "Хатогии Дастгоҳ"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Ҳоло калибрченкунӣ бо санҷиши дақиқ машғул аст."
-"<br>"
-"<br><b>Марҳамат карда ҳамаи меҳварҳоро ба мавқеъи мобайнаи онҳо ҳаракат диҳед "
-"ва пас дигар дастаи бозиро нарасед.</b>"
-"<br>"
-"<br>Барои оғози калибрченкунӣ ба OK ангушт занед.</qt>"
+"<qt>Ҳоло калибрченкунӣ бо санҷиши дақиқ машғул аст.<br><br><b>Марҳамат карда "
+"ҳамаи меҳварҳоро ба мавқеъи мобайнаи онҳо ҳаракат диҳед ва пас дигар дастаи "
+"бозиро нарасед.</b><br><br>Барои оғози калибрченкунӣ ба OK ангушт занед.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-th/messages/tdebase/joystick.po b/tde-i18n-th/messages/tdebase/joystick.po
index dc87f840974..d1ef645355d 100644
--- a/tde-i18n-th/messages/tdebase/joystick.po
+++ b/tde-i18n-th/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-11-07 19:23+1100\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <en@li.org>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "สหชาติ อนุกูลกิจ"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -49,49 +49,35 @@ msgstr "(ตามปกติ คือ Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>การปรับตั้งคือการตรวจสอบขอบเขตค่าของอุปกรณ์ของคุณ"
-"<br>"
-"<br>กรุณาขยับ<b>แกน %1 %2</b> ที่อุปกรณ์ของคุณไปยังตำแหน่ง <b>ที่ต่ำที่สุด</b>"
-"<br>"
-"<br>กดปุ่มใดๆ บนอุปกรณ์ของคุณหรือคลิกที่ปุ่ม 'ต่อไป' เพื่อไปยังขั้นถัดไป</qt>"
+"<qt>การปรับตั้งคือการตรวจสอบขอบเขตค่าของอุปกรณ์ของคุณ<br><br>กรุณาขยับ<b>แกน %1 %2</b> "
+"ที่อุปกรณ์ของคุณไปยังตำแหน่ง <b>ที่ต่ำที่สุด</b><br><br>กดปุ่มใดๆ บนอุปกรณ์ของคุณหรือคลิกที่ปุ่ม "
+"'ต่อไป' เพื่อไปยังขั้นถัดไป</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>การปรับตั้งคือการตรวจสอบขอบเขตค่าของอุปกรณ์ของคุณ"
-"<br>"
-"<br>กรุณาขยับ<b>แกน %1 %2</b> ที่อุปกรณ์ของคุณไปยังตำแหน่ง <b>ตรงกลาง</b>"
-"<br>"
-"<br>กดปุ่มใดๆ บนอุปกรณ์ของคุณหรือคลิกที่ปุ่ม 'ต่อไป' เพื่อไปยังขั้นถัดไป</qt>"
+"<qt>การปรับตั้งคือการตรวจสอบขอบเขตค่าของอุปกรณ์ของคุณ<br><br>กรุณาขยับ<b>แกน %1 %2</b> "
+"ที่อุปกรณ์ของคุณไปยังตำแหน่ง <b>ตรงกลาง</b><br><br>กดปุ่มใดๆ บนอุปกรณ์ของคุณหรือคลิกที่ปุ่ม "
+"'ต่อไป' เพื่อไปยังขั้นถัดไป</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>การปรับตั้งคือการตรวจสอบขอบเขตค่าของอุปกรณ์ของคุณ"
-"<br>"
-"<br>กรุณาขยับ<b>แกน %1 %2</b> ที่อุปกรณ์ของคุณไปยังตำแหน่ง <b>ที่สูงที่สุด</b>"
-"<br>"
-"<br>กดปุ่มใดๆ บนอุปกรณ์ของคุณหรือคลิกที่ปุ่ม 'ต่อไป' เพื่อไปยังขั้นถัดไป</qt>"
+"<qt>การปรับตั้งคือการตรวจสอบขอบเขตค่าของอุปกรณ์ของคุณ<br><br>กรุณาขยับ<b>แกน %1 %2</b> "
+"ที่อุปกรณ์ของคุณไปยังตำแหน่ง <b>ที่สูงที่สุด</b><br><br>กดปุ่มใดๆ บนอุปกรณ์ของคุณหรือคลิกที่ปุ่ม "
+"'ต่อไป' เพื่อไปยังขั้นถัดไป</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -119,13 +105,12 @@ msgstr "อุปกรณ์ %1 ไม่ใช่จอยสติก"
 
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
-msgstr ""
-"ไม่สามารถดึงเอาค่าเวอร์ชั่นของไดรเวอร์ในเคอร์เนลสำหรับอุปกรณ์จอยสติก %1ได้: %2"
+msgstr "ไม่สามารถดึงเอาค่าเวอร์ชั่นของไดรเวอร์ในเคอร์เนลสำหรับอุปกรณ์จอยสติก %1ได้: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 "โมดูลนี้ถูกคอมไพล์มาสำหรับไดรเวอร์ในเคอร์เนลเวอร์ชั่น %4.%5.%6 "
 "ไม่ใช่เวอร์ชั่นที่กำลังทำงานอยู่ขณะนี้ (%1.%2.%3)"
@@ -169,38 +154,27 @@ msgstr "โมดูลศูนย์ควบคุม TDE เพื่อท�
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>จอยสติก</h1>โมดูลนี้จะช่วยตรวจสอบว่าจอยสติกของคุณทำงานอย่างถูกต้องหรือไม่"
-"<br>หากค่าของแกนออกมาผิด คุณสามารถลองแก้ไขได้โดยทำการปรับตั้ง"
-"<br>โมโุลนี้จะลองหาอุปกรณ์จอยสติกทั้งหมดที่มีอยู่ โดยการตรวจสอบที่ /dev/js[0-4] "
-"และ /dev/input/js[0-4]"
-"<br>หากคุณมีแฟ้มอุปกรณ์อันอื่น ให้ใส่ค่าลงไปที่กล่องคอมโบ"
-"<br> รายการ 'ปุ่ม' จะแสดงสถานะของปุ่มบนจอยสติกของคุณ, รายการ 'แกน' "
-"จะแสดงค่าที่ใช้อยู่สำหรับแกนทุกแกน"
-"<br>หมายเหตุ: ไดรเวอร์อุปกรณ์ของ Linux ในปัจจุบัน (เคอร์เนล 2.4ม 2.6) "
-"สามารถตรวจสอบโดยอัตโนมัติได้แค่"
-"<ul>"
-"<li>จอยสติก แบบ 2 แกน 4 ปุ่ม</li>"
-"<li>จอยสติก แบบ 3 แกน 4 ปุ่ม</li>"
-"<li>จอยสติก แบบ 4 แกน 4ปุ่ม</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(หากต้องการรายละเอียด "
-"คุณสามารถอ่านได้ที่ source/Documentation/input/joystick.txt ของ Linux "
-"ที่คุณกำลังใช้อยู่)"
+"<h1>จอยสติก</"
+"h1>โมดูลนี้จะช่วยตรวจสอบว่าจอยสติกของคุณทำงานอย่างถูกต้องหรือไม่<br>หากค่าของแกนออกมาผิด "
+"คุณสามารถลองแก้ไขได้โดยทำการปรับตั้ง<br>โมโุลนี้จะลองหาอุปกรณ์จอยสติกทั้งหมดที่มีอยู่ "
+"โดยการตรวจสอบที่ /dev/js[0-4] และ /dev/input/js[0-4]<br>หากคุณมีแฟ้มอุปกรณ์อันอื่น "
+"ให้ใส่ค่าลงไปที่กล่องคอมโบ<br> รายการ 'ปุ่ม' จะแสดงสถานะของปุ่มบนจอยสติกของคุณ, รายการ "
+"'แกน' จะแสดงค่าที่ใช้อยู่สำหรับแกนทุกแกน<br>หมายเหตุ: ไดรเวอร์อุปกรณ์ของ Linux ในปัจจุบัน "
+"(เคอร์เนล 2.4ม 2.6) สามารถตรวจสอบโดยอัตโนมัติได้แค่<ul><li>จอยสติก แบบ 2 แกน 4 ปุ่ม</"
+"li><li>จอยสติก แบบ 3 แกน 4 ปุ่ม</li><li>จอยสติก แบบ 4 แกน 4ปุ่ม</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(หากต้องการรายละเอียด คุณสามารถอ่านได้ที่ "
+"source/Documentation/input/joystick.txt ของ Linux ที่คุณกำลังใช้อยู่)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -240,14 +214,12 @@ msgstr "ปรับตั้ง"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"ไม่มีการพบจอยสติกโดยอัตโนมัติบนคอมพิวเตอร์เครื่องนี้"
-"<br>ได้ทำการตรวจสอบแล้วใน /dev/js[0-4] และ /dev/input/js[0-4]"
-"<br> หากคุณได้ติดตั้งแล้ว กรุณาใส่ชื่อแฟ้มอุปกรณ์ที่ถูกต้อง"
+"ไม่มีการพบจอยสติกโดยอัตโนมัติบนคอมพิวเตอร์เครื่องนี้<br>ได้ทำการตรวจสอบแล้วใน /dev/js[0-4] "
+"และ /dev/input/js[0-4]<br> หากคุณได้ติดตั้งแล้ว กรุณาใส่ชื่อแฟ้มอุปกรณ์ที่ถูกต้อง"
 
 #: joywidget.cpp:236
 msgid ""
@@ -269,12 +241,9 @@ msgstr "เกิดข้อผิดพลาดกับอุปกรณ์
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 "<qt>การปรับตั้งเพื่อการตรวจสอบความแม่นยำ\n"
 "\n"
diff --git a/tde-i18n-tr/messages/tdebase/joystick.po b/tde-i18n-tr/messages/tdebase/joystick.po
index 76d5d349eea..460eb3e8047 100644
--- a/tde-i18n-tr/messages/tdebase/joystick.po
+++ b/tde-i18n-tr/messages/tdebase/joystick.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2007-07-05 07:00+0300\n"
 "Last-Translator: Serdar Soytetir\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Görkem Çetin"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -53,55 +53,38 @@ msgstr "(genellikler Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Bu kalibrasyon ile sizin cihazınızın gönderdiği değer aralıkları kontrol "
-"edilecektir."
-"<br>"
-"<br>Oyun kumandanızı<b>%1 %2 ekseninde</b> <b>minimum</b> noktasına getirin."
-"<br>"
-"<br>Bir sonraki adıma geçmek için herhangi bir tuşa veya'İleri' düğmesine "
-"basın.</qt>"
+"edilecektir.<br><br>Oyun kumandanızı<b>%1 %2 ekseninde</b> <b>minimum</b> "
+"noktasına getirin.<br><br>Bir sonraki adıma geçmek için herhangi bir tuşa "
+"veya'İleri' düğmesine basın.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Bu kalibrasyon ile sizin cihazınızın gönderdiği değer aralıkları kontrol "
-"edilecektir."
-"<br>"
-"<br>Oyun kumandanızı<b>%1 %2 ekseninde</b> <b>merkez</b> noktasına getirin."
-"<br>"
-"<br>Bir sonraki adıma geçmek için herhangi bir tuşa veya'İleri' düğmesine "
-"basın.</qt>"
+"edilecektir.<br><br>Oyun kumandanızı<b>%1 %2 ekseninde</b> <b>merkez</b> "
+"noktasına getirin.<br><br>Bir sonraki adıma geçmek için herhangi bir tuşa "
+"veya'İleri' düğmesine basın.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Bu kalibrasyon ile sizin cihazınızın gönderdiği değer aralıkları kontrol "
-"edilecektir."
-"<br>"
-"<br>Oyun kumandanızı<b>%1 %2 ekseninde</b> <b>maksimum</b> noktasına getirin."
-"<br>"
-"<br>Bir sonraki adıma geçmek için herhangi bir tuşa veya'İleri' düğmesine "
-"basın.</qt> "
+"edilecektir.<br><br>Oyun kumandanızı<b>%1 %2 ekseninde</b> <b>maksimum</b> "
+"noktasına getirin.<br><br>Bir sonraki adıma geçmek için herhangi bir tuşa "
+"veya'İleri' düğmesine basın.</qt> "
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -133,11 +116,11 @@ msgstr "%1 oyun kumandası için çekirdek sürücü sürümü alınamadı:%2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Şu anki çekirdek sürümünüz (%1.%2.%3) , bu modülün derlendiği çekirdek sürümü "
-"(%4.%5.%6) ile uyumlu değil."
+"Şu anki çekirdek sürümünüz (%1.%2.%3) , bu modülün derlendiği çekirdek "
+"sürümü (%4.%5.%6) ile uyumlu değil."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -180,40 +163,29 @@ msgstr ""
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Oyun kumandası</h1> Bu modül oyun kumandanızın düzgün çalışıp çalışmadığını "
-"kontrole yardım eder. "
-"<br> Eğer cihaz eksenler için yanlış değerler gönderiyorsa , bu sorunu "
-"kalibrasyon ile aşabilirsiniz. "
-"<br>Bu modül /dev/js[0-4] ve dev/input/js[0-4] kontrolü yaparak uygun tüm oyun "
-"kumandalarını bulmaya çalışır. "
-"<br>Eğer başka bir cihaz dosyanız varsa bunu combobox'a girin. "
-"<br>Düğme listesi oyun kumandası üzerindeki tüm düğmeleri belirtir , Eksen "
-"listesi ise tüm eksenler için değerleri veriri. "
-"<br>Not: Şu anki Linux Cihaz Sürücüsü (Çekirdek 2.4, 2.6) sadece otomatik "
-"tanıma yapabilir. "
-"<ul> "
-"<li>2-eksen , 4-düğmeli oyun kumandası</li> "
-"<li>3-eksen , 4-düğmeli oyun kumandası</li> "
-"<li>4-eksen , 4-düğmeli oyun kumandası</li> "
-"<li>Saitek Cyborg Sayısal Oyun kumandaları</li></ul>"
-"(Detaylar için Linux source/Documentation/input/joystick.txt dosyasını kontrol "
-"edin)"
+"<h1>Oyun kumandası</h1> Bu modül oyun kumandanızın düzgün çalışıp "
+"çalışmadığını kontrole yardım eder. <br> Eğer cihaz eksenler için yanlış "
+"değerler gönderiyorsa , bu sorunu kalibrasyon ile aşabilirsiniz. <br>Bu "
+"modül /dev/js[0-4] ve dev/input/js[0-4] kontrolü yaparak uygun tüm oyun "
+"kumandalarını bulmaya çalışır. <br>Eğer başka bir cihaz dosyanız varsa bunu "
+"combobox'a girin. <br>Düğme listesi oyun kumandası üzerindeki tüm düğmeleri "
+"belirtir , Eksen listesi ise tüm eksenler için değerleri veriri. <br>Not: Şu "
+"anki Linux Cihaz Sürücüsü (Çekirdek 2.4, 2.6) sadece otomatik tanıma "
+"yapabilir. <ul> <li>2-eksen , 4-düğmeli oyun kumandası</li> <li>3-eksen , 4-"
+"düğmeli oyun kumandası</li> <li>4-eksen , 4-düğmeli oyun kumandası</li> "
+"<li>Saitek Cyborg Sayısal Oyun kumandaları</li></ul>(Detaylar için Linux "
+"source/Documentation/input/joystick.txt dosyasını kontrol edin)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -253,15 +225,13 @@ msgstr "Kalibrasyon"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Bu bilgisayarda otomatik olarak hiç bir oyun kumanda cihazı bulunamadı."
-"<br>/dev/js[0-4] ve /devinput/js[0-4] te arama yapıldı"
-"<br>Eğer bağlı bir oyun kumandası olduğundan eminseniz, lütfen doğru cihaz "
-"dosyasını girin."
+"Bu bilgisayarda otomatik olarak hiç bir oyun kumanda cihazı bulunamadı.<br>/"
+"dev/js[0-4] ve /devinput/js[0-4] te arama yapıldı<br>Eğer bağlı bir oyun "
+"kumandası olduğundan eminseniz, lütfen doğru cihaz dosyasını girin."
 
 #: joywidget.cpp:236
 msgid ""
@@ -283,19 +253,13 @@ msgstr "Aygıt Hatası"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Kalibrasyon doğruluğu kontrol ediyor."
-"<br>"
-"<br><b>Lütfen tüm yönleri merkez konumuna getirin ve oyun kumandasına daha "
-"fazla dokunmayın.</b>"
-"<br>"
-"<br>Kalibrasyonu başlatmak için OK tuşuna basın.</qt>"
+"<qt>Kalibrasyon doğruluğu kontrol ediyor.<br><br><b>Lütfen tüm yönleri "
+"merkez konumuna getirin ve oyun kumandasına daha fazla dokunmayın.</"
+"b><br><br>Kalibrasyonu başlatmak için OK tuşuna basın.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-uk/messages/tdebase/joystick.po b/tde-i18n-uk/messages/tdebase/joystick.po
index 4803bc22717..fb14dd0ca18 100644
--- a/tde-i18n-uk/messages/tdebase/joystick.po
+++ b/tde-i18n-uk/messages/tdebase/joystick.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2006-12-16 16:59-0500\n"
 "Last-Translator: Andriy Rysin <rysin@kde.org>\n"
 "Language-Team: Ukrainian <linux@linux.org.ua>\n"
@@ -16,16 +16,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Іван Петрущак"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -54,55 +54,38 @@ msgstr "(зазвичай, Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Тепер калібрування перевірить діапазон значень драйверів вашого пристрою."
-"<br>"
-"<br>Будь ласка, переведіть <b>вісь %1 %2</b> вашого пристрою у позицію <b>"
-"мінімуму</b>."
-"<br>"
-"<br>Натисніть будь-яку кнопку пристрою або клацніть \"Далі\", щоб перейти до "
-"наступного кроку.</qt>"
+"<br><br>Будь ласка, переведіть <b>вісь %1 %2</b> вашого пристрою у позицію "
+"<b>мінімуму</b>.<br><br>Натисніть будь-яку кнопку пристрою або клацніть "
+"\"Далі\", щоб перейти до наступного кроку.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Тепер калібрування перевірить діапазон значень драйверів вашого пристрою."
-"<br>"
-"<br>Будь ласка, переведіть <b>вісь %1 %2</b> вашого пристрою у позицію <b>"
-"центру</b>."
-"<br>"
-"<br>Натисніть будь-яку кнопку пристрою або клацніть \"Далі\", щоб перейти до "
-"наступного кроку.</qt>"
+"<br><br>Будь ласка, переведіть <b>вісь %1 %2</b> вашого пристрою у позицію "
+"<b>центру</b>.<br><br>Натисніть будь-яку кнопку пристрою або клацніть \"Далі"
+"\", щоб перейти до наступного кроку.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Тепер калібрування перевірить діапазон значень драйверів вашого пристрою."
-"<br>"
-"<br>Будь ласка, переведіть <b>вісь %1 %2</b> вашого пристрою у позицію <b>"
-"максимуму</b>."
-"<br>"
-"<br>Натисніть будь-яку кнопку пристрою або клацніть \"Далі\", щоб перейти до "
-"наступного кроку.</qt>"
+"<br><br>Будь ласка, переведіть <b>вісь %1 %2</b> вашого пристрою у позицію "
+"<b>максимуму</b>.<br><br>Натисніть будь-яку кнопку пристрою або клацніть "
+"\"Далі\", щоб перейти до наступного кроку.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -134,11 +117,11 @@ msgstr "Не вдалося визначити версію драйвера я�
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Поточна версія драйвера ядра (%1.%2.%3) відрізняється від тієї, для якої модуль "
-"був скомпільований (%4.%5.%6)."
+"Поточна версія драйвера ядра (%1.%2.%3) відрізняється від тієї, для якої "
+"модуль був скомпільований (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -180,38 +163,28 @@ msgstr "Модуль центру керування TDE для тестуван
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
-msgstr ""
-"<h1>Джойстик</h1>Цей модуль допомагає перевірити роботу джойстика."
-"<br>Якщо він видає неправильні значення для осей, можна спробувати направити "
-"його калібруванням."
-"<br>Цей модуль намагається виявити всі наявні джойстикові пристрої за допомогою "
-"перегляду /dev/js[0-4] і /dev/input/js[0-4]"
-"<br>Якщо є інший файл пристрою, введіть його в поле зі списком."
-"<br>Список кнопок показує стан кнопок вашого джойстика, а список осей - поточні "
-"значення всіх осей."
-"<br>ПРИМІТКА: в даний час драйвер пристрою Linux (Ядро 2.4, 2.6) в змозі "
-"автоматично виявити тільки"
-"<ul>"
-"<li>2-осьовий, 4-кнопковий джойстик</li>"
-"<li>3-осьовий, 4-кнопковий джойстик</li>"
-"<li>4-осьовий, 4-кнопковий джойстик</li>"
-"<li>Saitek Cyborg \"цифрові\" джойстики</li></ul>(Для подробиць зверніться до "
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
 "source/Documentation/input/joystick.txt)"
+msgstr ""
+"<h1>Джойстик</h1>Цей модуль допомагає перевірити роботу джойстика.<br>Якщо "
+"він видає неправильні значення для осей, можна спробувати направити його "
+"калібруванням.<br>Цей модуль намагається виявити всі наявні джойстикові "
+"пристрої за допомогою перегляду /dev/js[0-4] і /dev/input/js[0-4]<br>Якщо є "
+"інший файл пристрою, введіть його в поле зі списком.<br>Список кнопок "
+"показує стан кнопок вашого джойстика, а список осей - поточні значення всіх "
+"осей.<br>ПРИМІТКА: в даний час драйвер пристрою Linux (Ядро 2.4, 2.6) в "
+"змозі автоматично виявити тільки<ul><li>2-осьовий, 4-кнопковий джойстик</"
+"li><li>3-осьовий, 4-кнопковий джойстик</li><li>4-осьовий, 4-кнопковий "
+"джойстик</li><li>Saitek Cyborg \"цифрові\" джойстики</li></ul>(Для подробиць "
+"зверніться до source/Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -251,14 +224,13 @@ msgstr "Відкалібрувати"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 "Не вдалося автоматично знайти пристрій джойстика на цьому комп'ютері."
-"<br>Було переглянуто /dev/js[0-4] і /dev/input/js[0-4]"
-"<br>Якщо пристрій приєднано, будь ласка, вкажіть правильний файл пристрою."
+"<br>Було переглянуто /dev/js[0-4] і /dev/input/js[0-4]<br>Якщо пристрій "
+"приєднано, будь ласка, вкажіть правильний файл пристрою."
 
 #: joywidget.cpp:236
 msgid ""
@@ -280,19 +252,13 @@ msgstr "Помилка пристрою"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Зараз буде перевірено точність."
-"<br>"
-"<br><b>Будь ласка, переведіть усі осі у їх центральні позиції і не доторкайтесь "
-"до джойстика.</b>"
-"<br>"
-"<br>Натисніть Гаразд, щоб розпочати калібрування.</qt>"
+"<qt>Зараз буде перевірено точність.<br><br><b>Будь ласка, переведіть усі осі "
+"у їх центральні позиції і не доторкайтесь до джойстика.</b><br><br>Натисніть "
+"Гаразд, щоб розпочати калібрування.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-uz/messages/tdebase/joystick.po b/tde-i18n-uz/messages/tdebase/joystick.po
index f31d2b6df4d..f6eb589eae4 100644
--- a/tde-i18n-uz/messages/tdebase/joystick.po
+++ b/tde-i18n-uz/messages/tdebase/joystick.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2004-06-06 00:21+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Mashrab Quvatov"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -50,33 +50,25 @@ msgstr ""
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -109,8 +101,8 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 
 #: joydevice.cpp:87
@@ -152,21 +144,16 @@ msgstr ""
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 
 #: joywidget.cpp:43
@@ -207,10 +194,9 @@ msgstr ""
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 
 #: joywidget.cpp:236
@@ -230,12 +216,9 @@ msgstr "Uskuna xatosi"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 
 #: joywidget.cpp:372
diff --git a/tde-i18n-uz@cyrillic/messages/tdebase/joystick.po b/tde-i18n-uz@cyrillic/messages/tdebase/joystick.po
index 4b8bae9e167..094a80e58f3 100644
--- a/tde-i18n-uz@cyrillic/messages/tdebase/joystick.po
+++ b/tde-i18n-uz@cyrillic/messages/tdebase/joystick.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2004-06-06 00:21+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Машраб Қуватов"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -50,33 +50,25 @@ msgstr ""
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
@@ -109,8 +101,8 @@ msgstr ""
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
 
 #: joydevice.cpp:87
@@ -152,21 +144,16 @@ msgstr ""
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
 
 #: joywidget.cpp:43
@@ -207,10 +194,9 @@ msgstr ""
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
 
 #: joywidget.cpp:236
@@ -230,12 +216,9 @@ msgstr "Ускуна хатоси"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
 
 #: joywidget.cpp:372
diff --git a/tde-i18n-vi/messages/tdebase/joystick.po b/tde-i18n-vi/messages/tdebase/joystick.po
index f71418111fb..5b907f6c1a1 100644
--- a/tde-i18n-vi/messages/tdebase/joystick.po
+++ b/tde-i18n-vi/messages/tdebase/joystick.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2006-05-06 12:42+0200\n"
 "Last-Translator: Trần Thế Trung <tttrung@hotmail.com>\n"
 "Language-Team: Vietnamese <kde-l10n-vi@kde.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Plural-Forms: nplurals=1;plural=0\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Phan Vĩnh Thịnh"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -52,54 +52,38 @@ msgstr "(thường là Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Trình cân chỉnh sắp kiểm tra các dải giá trị mà thiết bị của bạn cung cấp."
-"<br>"
-"<br>Xin hãy di chuyển <b>trục %1 %2</b> trên thiết bị tới vị trí <b>nhỏ nhất</b>"
-"."
-"<br>"
-"<br>Nhấn bất kỳ phím nào trên thiết bị hoặc nút 'Tiếp theo' để tiếp tục bước "
-"kiểm tratiếp theo.</qt>"
+"<qt>Trình cân chỉnh sắp kiểm tra các dải giá trị mà thiết bị của bạn cung "
+"cấp.<br><br>Xin hãy di chuyển <b>trục %1 %2</b> trên thiết bị tới vị trí "
+"<b>nhỏ nhất</b>.<br><br>Nhấn bất kỳ phím nào trên thiết bị hoặc nút 'Tiếp "
+"theo' để tiếp tục bước kiểm tratiếp theo.</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Trình cân chỉnh sắp kiểm tra các dải giá trị mà thiết bị của bạn cung cấp."
-"<br>"
-"<br>Xin hãy di chuyển <b>trục %1 %2</b> trên thiết bị tới vị trí <b>ở giữa</b>."
-"<br>"
-"<br>Nhấn bất kỳ phím nào trên thiết bị hoặc nút 'Tiếp theo' để tiếp tục bước "
-"kiểm tratiếp theo.</qt>"
+"<qt>Trình cân chỉnh sắp kiểm tra các dải giá trị mà thiết bị của bạn cung "
+"cấp.<br><br>Xin hãy di chuyển <b>trục %1 %2</b> trên thiết bị tới vị trí "
+"<b>ở giữa</b>.<br><br>Nhấn bất kỳ phím nào trên thiết bị hoặc nút 'Tiếp "
+"theo' để tiếp tục bước kiểm tratiếp theo.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Trình cân chỉnh sắp kiểm tra các dải giá trị mà thiết bị của bạn cung cấp."
-"<br>"
-"<br>Xin hãy di chuyển <b>trục %1 %2</b> trên thiết bị tới vị trí <b>lớn nhất</b>"
-"."
-"<br>"
-"<br>Nhấn bất kỳ phím nào trên thiết bị hoặc nút 'Tiếp theo' để tiếp tục bước "
-"kiểm tratiếp theo.</qt>"
+"<qt>Trình cân chỉnh sắp kiểm tra các dải giá trị mà thiết bị của bạn cung "
+"cấp.<br><br>Xin hãy di chuyển <b>trục %1 %2</b> trên thiết bị tới vị trí "
+"<b>lớn nhất</b>.<br><br>Nhấn bất kỳ phím nào trên thiết bị hoặc nút 'Tiếp "
+"theo' để tiếp tục bước kiểm tratiếp theo.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -128,16 +112,16 @@ msgstr "Thiết bị %1 không phải là một cần điều khiển."
 #: joydevice.cpp:66
 msgid "Could not get kernel driver version for joystick device %1: %2"
 msgstr ""
-"Không đọc được phiên bản trình điều khiển nhân cho thiết bị cần điều khiển %1: "
-"%2"
+"Không đọc được phiên bản trình điều khiển nhân cho thiết bị cần điều khiển "
+"%1: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Phiên bản trình điểu nhân đang chạy (%1.%2.%3) không phải là phiên bản mà môđun "
-"được biên dịch cho (%4.%5.%6)."
+"Phiên bản trình điểu nhân đang chạy (%1.%2.%3) không phải là phiên bản mà "
+"môđun được biên dịch cho (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -181,39 +165,28 @@ msgstr "Môđun trung tâm điều khiển của TDE để thử cần điều k
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Cần điều khiển</h1>Môđun này giúp kiểm tra xem cần điều khiển có làm việc "
-"đúng không."
-"<br>Nếu nó đưa ra giá trị sai cho trục, bạn có thể sửa lại bằng trình cân "
-"chỉnh."
-"<br>Môđun này thử tìm tất cả những thiết bị cần điều khiển bằng cách kiểm tra "
-"/dev/js[0-4] và /dev/input/js[0-4]"
-"<br>Nếu bạn có tập tin thiết bị khác, nhập nó vào hộp lựa chọn."
-"<br>Danh sach Nút hiển thị trạng thái các nút trên cần điều khiển của bạn, danh "
-"sách Trục hiển thị các giá trị hiện nay của các trục."
-"<br>CHÚ Ý: trình điều khiển thiết bị Linux đang dùng (Kernel 2.4, 2.6) chỉ có "
-"thể tự động phát hiện"
-"<ul>"
-"<li>cần điều khiển 2-trục, 4-nút</li>"
-"<li>cần điều khiển 3-trục, 4-nút</li>"
-"<li>cần điều khiển 4-trục, 4-nút</li>"
-"<li>cần điều khiển Saitek Cyborg 'số'</li></ul>(Để biết thêm chi tiết, xem "
-"Linux source/Documentation/input/joystick.txt)"
+"<h1>Cần điều khiển</h1>Môđun này giúp kiểm tra xem cần điều khiển có làm "
+"việc đúng không.<br>Nếu nó đưa ra giá trị sai cho trục, bạn có thể sửa lại "
+"bằng trình cân chỉnh.<br>Môđun này thử tìm tất cả những thiết bị cần điều "
+"khiển bằng cách kiểm tra /dev/js[0-4] và /dev/input/js[0-4]<br>Nếu bạn có "
+"tập tin thiết bị khác, nhập nó vào hộp lựa chọn.<br>Danh sach Nút hiển thị "
+"trạng thái các nút trên cần điều khiển của bạn, danh sách Trục hiển thị các "
+"giá trị hiện nay của các trục.<br>CHÚ Ý: trình điều khiển thiết bị Linux "
+"đang dùng (Kernel 2.4, 2.6) chỉ có thể tự động phát hiện<ul><li>cần điều "
+"khiển 2-trục, 4-nút</li><li>cần điều khiển 3-trục, 4-nút</li><li>cần điều "
+"khiển 4-trục, 4-nút</li><li>cần điều khiển Saitek Cyborg 'số'</li></ul>(Để "
+"biết thêm chi tiết, xem Linux source/Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -253,15 +226,13 @@ msgstr "Cân chỉnh"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Không có cần điều khiển nào được tìm thấy tự động trên máy."
-"<br>Kiểm tra được thực hiện trong /dev/js[0-4] và /dev/input/js[0-4]"
-"<br>Nếu bạn biết là có cần điều khiển được gắn vào, hãy nhập tập tin thiết bị "
-"cho nó."
+"Không có cần điều khiển nào được tìm thấy tự động trên máy.<br>Kiểm tra được "
+"thực hiện trong /dev/js[0-4] và /dev/input/js[0-4]<br>Nếu bạn biết là có cần "
+"điều khiển được gắn vào, hãy nhập tập tin thiết bị cho nó."
 
 #: joywidget.cpp:236
 msgid ""
@@ -283,19 +254,13 @@ msgstr "Lỗi thiết bị"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Trình cân chỉnh sắp kiểm tra sự chính xác."
-"<br>"
-"<br><b>Xin hãy di chuyển mọi trục tới vị trí trung tâm rồi đừng chạm vào cần "
-"điều khiển.</b>"
-"<br>"
-"<br>Nhấn OK để bắt đầu cân chỉnh.</qt>"
+"<qt>Trình cân chỉnh sắp kiểm tra sự chính xác.<br><br><b>Xin hãy di chuyển "
+"mọi trục tới vị trí trung tâm rồi đừng chạm vào cần điều khiển.</"
+"b><br><br>Nhấn OK để bắt đầu cân chỉnh.</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-wa/messages/tdebase/joystick.po b/tde-i18n-wa/messages/tdebase/joystick.po
index c3a94c92737..74af0830d1c 100644
--- a/tde-i18n-wa/messages/tdebase/joystick.po
+++ b/tde-i18n-wa/messages/tdebase/joystick.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: desktop files\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2007-09-08 23:20+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Djan Cayron"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -52,52 +52,41 @@ msgstr "(normålmint Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>Li calibraedje va-z ataker l' verifiaedje del djive di valixhance ki vost "
-"éndjin po dner."
-"<br>"
-"<br>Bodjîz s' i vs plait <b>les acses %1 %2</b> so vost éndjin al plaece <b>"
-"minimom</b>."
-"<br>"
-"<br>Tchôkî n' telminme ké boton so l' éndjin ou clitchîz sol boton 'Shuvant' po "
-"continouwer å dgré d' après.</qt>"
+"<qt>Li calibraedje va-z ataker l' verifiaedje del djive di valixhance ki "
+"vost éndjin po dner.<br><br>Bodjîz s' i vs plait <b>les acses %1 %2</b> so "
+"vost éndjin al plaece <b>minimom</b>.<br><br>Tchôkî n' telminme ké boton so "
+"l' éndjin ou clitchîz sol boton 'Shuvant' po continouwer å dgré d' après.</"
+"qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Li calibraedje va verifyî l' fortchete di valixhances ki vost éndjin "
-"evoye.<br /><br />S' i vs plait bodjîz les <b>aessis %1 %2</b> "
-"di vosse djîsse disk' al plaece <b>do mitan</b>.<br /><br />"
-"Tchôkîz so tot l' minme ké boton do djîsse ou clitchîz so «Shuvant» po "
-"continouwer avou l' etape shuvante.</qt>"
+"evoye.<br /><br />S' i vs plait bodjîz les <b>aessis %1 %2</b> di vosse "
+"djîsse disk' al plaece <b>do mitan</b>.<br /><br />Tchôkîz so tot l' minme "
+"ké boton do djîsse ou clitchîz so «Shuvant» po continouwer avou l' etape "
+"shuvante.</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
 "<qt>Li calibraedje va verifyî l' fortchete di valixhances ki vost éndjin "
-"evoye.<br /><br />S' i vs plait bodjîz les <b>aessis %1 %2</b> "
-"di vosse djîsse disk' al plaece <b>macsimom</b>.<br /><br />"
-"Tchôkîz so tot l' minme ké boton do djîsse ou clitchîz so «Shuvant» po "
-"continouwer avou l' etape shuvante.</qt>"
+"evoye.<br /><br />S' i vs plait bodjîz les <b>aessis %1 %2</b> di vosse "
+"djîsse disk' al plaece <b>macsimom</b>.<br /><br />Tchôkîz so tot l' minme "
+"ké boton do djîsse ou clitchîz so «Shuvant» po continouwer avou l' etape "
+"shuvante.</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -129,11 +118,11 @@ msgstr "Dji n' a nén savou aveur li modêye do mineu nawea po l' éndjin %1:
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr ""
-"Li modêye do mineu nawea en alaedje pol moumint (%1.%2.%3) n' est nén l' cene "
-"ki ç' module ci a stî copilé po (%4.%5.%6)."
+"Li modêye do mineu nawea en alaedje pol moumint (%1.%2.%3) n' est nén "
+"l' cene ki ç' module ci a stî copilé po (%4.%5.%6)."
 
 #: joydevice.cpp:87
 msgid "Could not get number of buttons for joystick device %1: %2"
@@ -157,14 +146,14 @@ msgstr ""
 #: joydevice.cpp:111
 msgid "Could not initialize calibration values for joystick device %1: %2"
 msgstr ""
-"Dji n' a nén savou inicialijhî les valixhances di calibraedje po l' éndjin %1: "
-"%2"
+"Dji n' a nén savou inicialijhî les valixhances di calibraedje po l' éndjin "
+"%1: %2"
 
 #: joydevice.cpp:117
 msgid "Could not apply calibration values for joystick device %1: %2"
 msgstr ""
-"Dji n' a nén savou mete en ouve les valixhances di calibraedje po l' éndjin %1: "
-"%2"
+"Dji n' a nén savou mete en ouve les valixhances di calibraedje po l' éndjin "
+"%1: %2"
 
 #: joydevice.cpp:121
 msgid "internal error - code %1 unknown"
@@ -181,38 +170,30 @@ msgstr "Module do cinte di contrôle di TDE po sayî les djîsses di djeu"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>Djîsse di djeu</h1>Ci module ci vs aide a verifyî si vosse djîsse di djeu "
-"va bén a môde di djin.<br />S' i dene des mwaijhès valixhances po ls aessis, "
-"vos ploz sayî d' coridjî çoula avou l' calibraedje.<br />"
-"Ci module ci saye di trover tos les éndjins di djîsse di djey k' i gn a tot "
-"cwerant après /dev/js[0-4] et /dev/input/js[0-4]<br />"
-"Si vos avoz des ôtes fitchîs d' éndjin, tapez les dins l' boesse di tecse<br />"
-"Li djivêye di botons mostere l' estat des botons di vosse djîsse, li djîvêye "
-"des aessis mostere li valixhance do moumint po tos ls aessis.<br />"
-"NOTE: li nawea Linux do moumint (naweas 2.4, 2.6) pout seulmint detecter "
-"otomaticmint les djîsses"
-"<ul>"
-"<li>a 3 aessis, 4 botons</li>"
-"<li>a 4 aessis, 4 botons</li>"
-"<li>a 2 aessis, 4 botons</li>"
-"<li>Saitek Cyborg digital</li></ul>(Po pus di racsegnes loukîz l' fitchî "
-"source/Documentation/input/joystick.txt do côde sourdant do nawea Linux)"
+"<h1>Djîsse di djeu</h1>Ci module ci vs aide a verifyî si vosse djîsse di "
+"djeu va bén a môde di djin.<br />S' i dene des mwaijhès valixhances po ls "
+"aessis, vos ploz sayî d' coridjî çoula avou l' calibraedje.<br />Ci module "
+"ci saye di trover tos les éndjins di djîsse di djey k' i gn a tot cwerant "
+"après /dev/js[0-4] et /dev/input/js[0-4]<br />Si vos avoz des ôtes fitchîs "
+"d' éndjin, tapez les dins l' boesse di tecse<br />Li djivêye di botons "
+"mostere l' estat des botons di vosse djîsse, li djîvêye des aessis mostere "
+"li valixhance do moumint po tos ls aessis.<br />NOTE: li nawea Linux do "
+"moumint (naweas 2.4, 2.6) pout seulmint detecter otomaticmint les "
+"djîsses<ul><li>a 3 aessis, 4 botons</li><li>a 4 aessis, 4 botons</li><li>a 2 "
+"aessis, 4 botons</li><li>Saitek Cyborg digital</li></ul>(Po pus di racsegnes "
+"loukîz l' fitchî source/Documentation/input/joystick.txt do côde sourdant do "
+"nawea Linux)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -252,14 +233,13 @@ msgstr "Calibrer"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"Nol éndjin djîsse di djeu d' trové otomaticmint so cisse copiutrece ci.<br />"
-"Li cweraedje a stî fwait po /dev/js[0-4] eyet /dev/input/js[0-4]<br />"
-"Si vos savoz k' end a onk di raloyî al copiutrece, dinez s' i vs plait li "
+"Nol éndjin djîsse di djeu d' trové otomaticmint so cisse copiutrece ci.<br /"
+">Li cweraedje a stî fwait po /dev/js[0-4] eyet /dev/input/js[0-4]<br />Si "
+"vos savoz k' end a onk di raloyî al copiutrece, dinez s' i vs plait li "
 "tchmin corek do fitchî d' éndjin."
 
 #: joywidget.cpp:236
@@ -282,21 +262,18 @@ msgstr "Aroke d' éndjin"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>Li calibraedje va verifyî l' precizion.<br /><br /><b>"
-"S' i vs plait bodjîz tos les aessis disk' a leu pôzucion do mitan et poy ni "
-"toûtchîz pus l' djîsse.</b><br /><br />Clitchîz «'l est bon» po-z ataker "
-"l' calibraedje</qt>"
+"<qt>Li calibraedje va verifyî l' precizion.<br /><br /><b>S' i vs plait "
+"bodjîz tos les aessis disk' a leu pôzucion do mitan et poy ni toûtchîz pus "
+"l' djîsse.</b><br /><br />Clitchîz «'l est bon» po-z ataker l' calibraedje</"
+"qt>"
 
 #: joywidget.cpp:372
 #, c-format
 msgid "Restored all calibration values for joystick device %1."
 msgstr ""
-"Rimete come divant totes les valixhances di calibraedje po l' éndjin djîsse di "
-"djeu %1."
+"Rimete come divant totes les valixhances di calibraedje po l' éndjin djîsse "
+"di djeu %1."
diff --git a/tde-i18n-zh_CN/messages/tdebase/joystick.po b/tde-i18n-zh_CN/messages/tdebase/joystick.po
index be149439448..a3ffe39012e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/joystick.po
+++ b/tde-i18n-zh_CN/messages/tdebase/joystick.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2004-08-01 22:45+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "开源软件国际化之简体中文组"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -49,49 +49,35 @@ msgstr "(通常是 Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>校准即将检查您设备发射值的范围。"
-"<br>"
-"<br>请将您设备上的 <b>%1 %2 轴</b>移动到<b>最小</b>位置。"
-"<br>"
-"<br>按下设备上的任何按钮，或者单击“下一步”按钮可以继续下一步的校准。</qt>"
+"<qt>校准即将检查您设备发射值的范围。<br><br>请将您设备上的 <b>%1 %2 轴</b>移"
+"动到<b>最小</b>位置。<br><br>按下设备上的任何按钮，或者单击“下一步”按钮可以继"
+"续下一步的校准。</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>校准即将检查您设备发射值的范围。"
-"<br>"
-"<br>请将您设备上的 <b>%1 %2 轴</b>移动到<b>中心</b>位置。"
-"<br>"
-"<br>按下设备上的任何按钮，或者单击“下一步”按钮可以继续下一步的校准。</qt>"
+"<qt>校准即将检查您设备发射值的范围。<br><br>请将您设备上的 <b>%1 %2 轴</b>移"
+"动到<b>中心</b>位置。<br><br>按下设备上的任何按钮，或者单击“下一步”按钮可以继"
+"续下一步的校准。</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>校准即将检查您设备发射值的范围。"
-"<br>"
-"<br>请将您设备上的 <b>%1 %2 轴</b>移动到<b>最大</b>位置。"
-"<br>"
-"<br>按下设备上的任何按钮，或者单击“下一步”按钮可以继续下一步的校准。</qt>"
+"<qt>校准即将检查您设备发射值的范围。<br><br>请将您设备上的 <b>%1 %2 轴</b>移"
+"动到<b>最大</b>位置。<br><br>按下设备上的任何按钮，或者单击“下一步”按钮可以继"
+"续下一步的校准。</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -123,8 +109,8 @@ msgstr "无法获得游戏杆设备 %1 的内核驱动程序版本：%2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr "目前运行的内核驱动程序版本(%1.%2.%3)不是此编译该模块的版本(%4.%5.%6)。"
 
 #: joydevice.cpp:87
@@ -166,34 +152,25 @@ msgstr "测试游戏杆的 TDE 控制中心模块"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>游戏杆</h1>此模块可帮助您检查游戏杆是否工作正常。"
-"<br>如果游戏杆轴发送的值出错，您可以尝试通过校准来解决。"
-"<br>此模块将会检查 /dev/js[0-4] 和 /dev/input/js[0-4] 上连接的全部游戏杆设备。"
-"<br>如果您有其它设备文件，请在组合框中输入。"
-"<br>按钮列表将会显示您游戏杆上按钮的状态，而轴列表将会显示全部轴的当前值。"
-"<br>注意：目前的 Linux 设备驱动程序(内核 2.4、2.6)只能自动检测"
-"<ul>"
-"<li>双轴四按钮的游戏杆</li>"
-"<li>三轴四按钮的游戏杆</li>"
-"<li>四轴四按钮的游戏杆</li>"
-"<li>Saitek Cyborg 数码游戏杆</li></ul>(有关详情，请您查看您 Linux "
-"的源代码/Documentation/input/joystick.txt)"
+"<h1>游戏杆</h1>此模块可帮助您检查游戏杆是否工作正常。<br>如果游戏杆轴发送的值"
+"出错，您可以尝试通过校准来解决。<br>此模块将会检查 /dev/js[0-4] 和 /dev/"
+"input/js[0-4] 上连接的全部游戏杆设备。<br>如果您有其它设备文件，请在组合框中"
+"输入。<br>按钮列表将会显示您游戏杆上按钮的状态，而轴列表将会显示全部轴的当前"
+"值。<br>注意：目前的 Linux 设备驱动程序(内核 2.4、2.6)只能自动检测<ul><li>双"
+"轴四按钮的游戏杆</li><li>三轴四按钮的游戏杆</li><li>四轴四按钮的游戏杆</"
+"li><li>Saitek Cyborg 数码游戏杆</li></ul>(有关详情，请您查看您 Linux 的源代"
+"码/Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -233,14 +210,12 @@ msgstr "校准"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"没有在此计算机上找到游戏杆设备。"
-"<br>刚刚已经检查过了 /dev/js[0-4] 和 /dev/input/js[0-4]"
-"<br>如果您确定已经连接好了游戏杆，请输入正确的设备文件。"
+"没有在此计算机上找到游戏杆设备。<br>刚刚已经检查过了 /dev/js[0-4] 和 /dev/"
+"input/js[0-4]<br>如果您确定已经连接好了游戏杆，请输入正确的设备文件。"
 
 #: joywidget.cpp:236
 msgid ""
@@ -261,18 +236,12 @@ msgstr "设备错误"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
 msgstr ""
-"<qt>校准即将检查精度。"
-"<br>"
-"<br><b>请将全部轴都推到中心位置，然后就不要再碰游戏杆了。</b>"
-"<br>"
-"<br>单击确定可以开始校准。</qt>"
+"<qt>校准即将检查精度。<br><br><b>请将全部轴都推到中心位置，然后就不要再碰游戏"
+"杆了。</b><br><br>单击确定可以开始校准。</qt>"
 
 #: joywidget.cpp:372
 #, c-format
diff --git a/tde-i18n-zh_TW/messages/tdebase/joystick.po b/tde-i18n-zh_TW/messages/tdebase/joystick.po
index d0dc47fd904..17f830e2006 100644
--- a/tde-i18n-zh_TW/messages/tdebase/joystick.po
+++ b/tde-i18n-zh_TW/messages/tdebase/joystick.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2005-10-21 21:09+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "葉信佑"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -48,49 +48,32 @@ msgstr "(通常是 Y)"
 #: caldialog.cpp:90
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>minimum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>準備偵測裝置移動範圍。"
-"<br>"
-"<br>請移動裝置的<b>%1 軸 %2</b>到<b>最小</b>的位置。"
-"<br>"
-"<br>按下搖桿任意鍵或按「下一步」繼續。</qt>"
+"<qt>準備偵測裝置移動範圍。<br><br>請移動裝置的<b>%1 軸 %2</b>到<b>最小</b>的"
+"位置。<br><br>按下搖桿任意鍵或按「下一步」繼續。</qt>"
 
 #: caldialog.cpp:107
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>center</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>準備偵測裝置移動範圍。"
-"<br>"
-"<br>請移動裝置的<b>%1 軸 %2</b>到<b>中央</b>的位置。"
-"<br>"
-"<br>按下搖桿任意鍵或按「下一步」繼續。</qt>"
+"<qt>準備偵測裝置移動範圍。<br><br>請移動裝置的<b>%1 軸 %2</b>到<b>中央</b>的"
+"位置。<br><br>按下搖桿任意鍵或按「下一步」繼續。</qt>"
 
 #: caldialog.cpp:124
 msgid ""
 "<qt>Calibration is about to check the value range your device delivers."
-"<br>"
-"<br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
-"position."
-"<br>"
-"<br>Press any button on the device or click on the 'Next' button to continue "
-"with the next step.</qt>"
+"<br><br>Please move <b>axis %1 %2</b> on your device to the <b>maximum</b> "
+"position.<br><br>Press any button on the device or click on the 'Next' "
+"button to continue with the next step.</qt>"
 msgstr ""
-"<qt>準備偵測裝置移動範圍。"
-"<br>"
-"<br>請移動裝置的<b>%1 軸 %2</b>到<b>最大</b>的位置。"
-"<br>"
-"<br>按下搖桿任意鍵或按「下一步」繼續。</qt>"
+"<qt>準備偵測裝置移動範圍。<br><br>請移動裝置的<b>%1 軸 %2</b>到<b>最大</b>的"
+"位置。<br><br>按下搖桿任意鍵或按「下一步」繼續。</qt>"
 
 #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367
 msgid "Communication Error"
@@ -122,8 +105,8 @@ msgstr "無法取得搖桿 %1 的核心驅動程式版本: %2"
 
 #: joydevice.cpp:80
 msgid ""
-"The current running kernel driver version (%1.%2.%3) is not the one this module "
-"was compiled for (%4.%5.%6)."
+"The current running kernel driver version (%1.%2.%3) is not the one this "
+"module was compiled for (%4.%5.%6)."
 msgstr "該模組所編譯的核心(%4.%5.%6)與正執行中的核心驅動程式版本(%1.%2.%3)不符"
 
 #: joydevice.cpp:87
@@ -165,34 +148,24 @@ msgstr "TDE 控制中心搖桿測試模組"
 #: joystick.cpp:77
 msgid ""
 "<h1>Joystick</h1>This module helps to check if your joystick is working "
-"correctly."
-"<br>If it delivers wrong values for the axes, you can try to solve this with "
-"the calibration."
-"<br>This module tries to find all available joystick devices by checking "
-"/dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you have another device file, enter it in the combobox."
-"<br>The Buttons list shows the state of the buttons on your joystick, the Axes "
-"list shows the current value for all axes."
-"<br>NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect"
-"<ul>"
-"<li>2-axis, 4-button joystick</li>"
-"<li>3-axis, 4-button joystick</li>"
-"<li>4-axis, 4-button joystick</li>"
-"<li>Saitek Cyborg 'digital' joysticks</li></ul>(For details you can check your "
-"Linux source/Documentation/input/joystick.txt)"
+"correctly.<br>If it delivers wrong values for the axes, you can try to solve "
+"this with the calibration.<br>This module tries to find all available "
+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]<br>If you "
+"have another device file, enter it in the combobox.<br>The Buttons list "
+"shows the state of the buttons on your joystick, the Axes list shows the "
+"current value for all axes.<br>NOTE: the current Linux device driver (Kernel "
+"2.4, 2.6) can only autodetect<ul><li>2-axis, 4-button joystick</li><li>3-"
+"axis, 4-button joystick</li><li>4-axis, 4-button joystick</li><li>Saitek "
+"Cyborg 'digital' joysticks</li></ul>(For details you can check your Linux "
+"source/Documentation/input/joystick.txt)"
 msgstr ""
-"<h1>搖桿</h1>該模組能幫您檢查搖桿是否設定正確."
-"<br>如果搖桿送出錯誤的方向, 您可以重新校正搖桿."
-"<br>該模組會試著搜尋 /dev/js[0-4] 和 /dev/input/js[0-4] 找出可使用的搖桿"
-"<br>如果您有其他的裝置檔, 輸入到裝置清單新增."
-"<br>按鍵清單列出搖桿上的所有按鍵, 座標列表列出所有的座標位置."
-"<br>注意: 現在的 Linux (核心 2.4, 2.6) 驅動程式可以自動偵測"
-"<ul>"
-"<li>2-軸, 4-鍵 搖桿</li>"
-"<li>3-軸, 4-鍵 搖桿</li>"
-"<li>4-軸, 4-鍵 搖桿</li>"
-"<li>Saitek Cyborg 'digital' 搖桿</li></ul>(更多的資訊請參閱 Linux 源碼中的 "
-"Documentation/input/joystick.txt)"
+"<h1>搖桿</h1>該模組能幫您檢查搖桿是否設定正確.<br>如果搖桿送出錯誤的方向, 您"
+"可以重新校正搖桿.<br>該模組會試著搜尋 /dev/js[0-4] 和 /dev/input/js[0-4] 找出"
+"可使用的搖桿<br>如果您有其他的裝置檔, 輸入到裝置清單新增.<br>按鍵清單列出搖桿"
+"上的所有按鍵, 座標列表列出所有的座標位置.<br>注意: 現在的 Linux (核心 2.4, "
+"2.6) 驅動程式可以自動偵測<ul><li>2-軸, 4-鍵 搖桿</li><li>3-軸, 4-鍵 搖桿</"
+"li><li>4-軸, 4-鍵 搖桿</li><li>Saitek Cyborg 'digital' 搖桿</li></ul>(更多的"
+"資訊請參閱 Linux 源碼中的 Documentation/input/joystick.txt)"
 
 #: joywidget.cpp:43
 msgid "PRESSED"
@@ -232,13 +205,11 @@ msgstr "校正"
 
 #: joywidget.cpp:190
 msgid ""
-"No joystick device automatically found on this computer."
-"<br>Checks were done in /dev/js[0-4] and /dev/input/js[0-4]"
-"<br>If you know that there is one attached, please enter the correct device "
-"file."
+"No joystick device automatically found on this computer.<br>Checks were done "
+"in /dev/js[0-4] and /dev/input/js[0-4]<br>If you know that there is one "
+"attached, please enter the correct device file."
 msgstr ""
-"電腦上找不到任何搖桿。"
-"<br>檢查 /dev/js[0-4] 和 /dev/input/js[0-4] 是否正常"
+"電腦上找不到任何搖桿。<br>檢查 /dev/js[0-4] 和 /dev/input/js[0-4] 是否正常"
 "<br>如果已確認連線，請輸入正確的裝置檔案。"
 
 #: joywidget.cpp:236
@@ -261,13 +232,12 @@ msgstr "裝置錯誤"
 
 #: joywidget.cpp:337
 msgid ""
-"<qt>Calibration is about to check the precision."
-"<br>"
-"<br><b>Please move all axes to their center position and then do not touch the "
-"joystick anymore.</b>"
-"<br>"
-"<br>Click OK to start the calibration.</qt>"
-msgstr "<qt>準備校正準確度.<br><br><b>請將轉軸移到中心然後不要再接觸搖桿.</b><br><br>按下確定開始校正.</qt>"
+"<qt>Calibration is about to check the precision.<br><br><b>Please move all "
+"axes to their center position and then do not touch the joystick anymore.</"
+"b><br><br>Click OK to start the calibration.</qt>"
+msgstr ""
+"<qt>準備校正準確度.<br><br><b>請將轉軸移到中心然後不要再接觸搖桿.</b><br><br>"
+"按下確定開始校正.</qt>"
 
 #: joywidget.cpp:372
 #, c-format