diff --git a/tde-i18n-af/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-af/messages/tdebase/kcmcomponentchooser.po
index eb1c023f0ba..c046080e172 100644
--- a/tde-i18n-af/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-af/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser 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-11-23 16:50+0200\n"
 "Last-Translator: Kobus <kabousv@therugby.co.za>\n"
 "Language-Team: AFRIKAANS <translate-discuss-af@lists.sourceforge.net>\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 "Kobus Venter"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -46,8 +46,8 @@ msgstr "Onbekend"
 #: componentchooser.cpp:408
 #, fuzzy
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Jy het die verstek komponent van jou keuse verander, wil jy die "
 "veranderinge nou stoor?</qt>"
@@ -58,11 +58,11 @@ msgstr "Geen beskrywing beskikbaar"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Kies uit die onderstaande lys watter komponent moet as die verstek gebruik word "
-"vir die %1 diens."
+"Kies uit die onderstaande lys watter komponent moet as die verstek gebruik "
+"word vir die %1 diens."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -76,224 +76,184 @@ msgstr "Komponent Kieser"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Maak <b>http</b> en <b>https</b> URLs oop</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "in 'n applikasie gebaseer op die inhoud van die URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "in die volgende blaaier"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Verstek Komponent"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Hier kan jy die komponent program verander. Komponente is programme wat basiese "
-"take hanteer, soos die terminaal emuleerder, die teks redigeerder en die e-pos "
-"kliënt. Verskillende TDE applikasies moet soms 'n konsole emuleeder aktiveer, "
-"'n boodskap stuur of teks vertoon. Om dit konsekwent te doen, sal hierdie "
-"applikasies altyd dieselfde komponent oproep. Jy kan hier kies watter programme "
-"hierdie komponente is."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"Hier kan jy die komponent program verander. Komponente is programme wat "
+"basiese take hanteer, soos die terminaal emuleerder, die teks redigeerder en "
+"die e-pos kliënt. Verskillende TDE applikasies moet soms 'n konsole "
+"emuleeder aktiveer, 'n boodskap stuur of teks vertoon. Om dit konsekwent te "
+"doen, sal hierdie applikasies altyd dieselfde komponent oproep. Jy kan hier "
+"kies watter programme hierdie komponente is."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Komponent Beskrywing"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Hier kan jy 'n kort beskrywing sien van die gekose komponent. Om die gekose "
-"komponent te verander, kliek op die linkerkantste lys. Om die komponent program "
-"te verander, kies dit asseblief hieronder."
+"komponent te verander, kliek op die linkerkantste lys. Om die komponent "
+"program te verander, kies dit asseblief hieronder."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Hierdie lys wys die konfigureerbare komponent tipes. Kliek op die komponent "
-"wat jy wil konfigureer.</p>\n"
-"<p>In hierdie dialoog kan jy TDE se verstek komponente verander. Komponente is "
-"programme wat basiese take hanteer, soos die terminaal emuleerder, die teks "
-"redigeerder en dei e-pos kliënt. Verskillende TDE applikasies moet soms 'n "
-"konsole emuleeder aktiveer, 'n boodskap stuur of teks vertoon. Om dit "
-"konsekwent te doen, sal hierdie applikasies altyd dieselfde komponent oproep. "
-"Jy kan hier kies watter programme hierdie komponente is.</p>\n"
+"<p>Hierdie lys wys die konfigureerbare komponent tipes. Kliek op die "
+"komponent wat jy wil konfigureer.</p>\n"
+"<p>In hierdie dialoog kan jy TDE se verstek komponente verander. Komponente "
+"is programme wat basiese take hanteer, soos die terminaal emuleerder, die "
+"teks redigeerder en dei e-pos kliënt. Verskillende TDE applikasies moet soms "
+"'n konsole emuleeder aktiveer, 'n boodskap stuur of teks vertoon. Om dit "
+"konsekwent te doen, sal hierdie applikasies altyd dieselfde komponent "
+"oproep. Jy kan hier kies watter programme hierdie komponente is.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Ontvanger Adres</li> "
-"<li>%s: Onderwerp</li> "
-"<li>%c: Deurslag Kopie (CC)</li> "
-"<li>%b: Geheime Deurslag Kopie (GDK)</li> "
-"<li>%B: Sjabloon inhoud teks</li> "
-"<li>%A: Byvoegsel </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Ontvanger Adres</li> <li>%s: Onderwerp</li> <li>%c: Deurslag "
+"Kopie (CC)</li> <li>%b: Geheime Deurslag Kopie (GDK)</li> <li>%B: Sjabloon "
+"inhoud teks</li> <li>%A: Byvoegsel </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Kliek hierdie knoppie om jou voorkeur e-pos program te kies. Let daarop dat die "
-"lêer wat jy kies 'n opdrag uivoerbare kenmerk moet hê, om dit aanvaarbaar te "
-"maak."
-"<br> Jy kan ook 'n aantal plek houers gebruik wat vervang sal word met werklike "
-"waardes wanneer die e-pos program geroep word:"
-"<ul> "
-"<li>%t: Ontvanger Adres</li> "
-"<li>%s: Onderwerp</li> "
-"<li>%c: Deurslag Kopie (DK)</li> "
-"<li>%b: Geheime Deurslag Kopie (GDK)</li> "
-"<li>%B: Sjabloon inhoud teks</li> "
-"<li>%A: Byvoegsel </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Kliek hierdie knoppie om jou voorkeur e-pos program te kies. Let daarop dat "
+"die lêer wat jy kies 'n opdrag uivoerbare kenmerk moet hê, om dit "
+"aanvaarbaar te maak.<br> Jy kan ook 'n aantal plek houers gebruik wat "
+"vervang sal word met werklike waardes wanneer die e-pos program geroep word:"
+"<ul> <li>%t: Ontvanger Adres</li> <li>%s: Onderwerp</li> <li>%c: Deurslag "
+"Kopie (DK)</li> <li>%b: Geheime Deurslag Kopie (GDK)</li> <li>%B: Sjabloon "
+"inhoud teks</li> <li>%A: Byvoegsel </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Kliek hier om na die e-pos kliënt se program lêer te soek"
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Hardloop in terminaal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Kies hierdie opsie indien jy wil hê dat die e-pos kliënt in 'n terminaal "
 "venster (bv. <em>Konsole</em>) moet oopmaak."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "Gebruik KPos as voorkeur e-pos klient"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KPos is die standaard Pos program vir die TDE werkskerm."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Gebruik 'n ander e-pos kliënt:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Kies hierdie opsie om 'n ander e-pos program te gebruik"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Gebruik 'n ander &terminaal program:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Gebruik Konsole as die terminaal applikasie"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Kliek hierdie knoppie om jou voorkeur terminaal program te kies. Let daarop dat "
-"die lêer wat jy kies 'n opdrag uivoerbare kenmerk moet hê, om dit aanvaarbaar "
-"te maak."
-"<br> Let ook daarop dat sommige programme wat die Terminaal Emuleerder gebruik "
-"nie sal werk indien jy opdrag argumente (Bv. konsole -ls) byvoeg nie."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"Kliek hierdie knoppie om jou voorkeur terminaal program te kies. Let daarop "
+"dat die lêer wat jy kies 'n opdrag uivoerbare kenmerk moet hê, om dit "
+"aanvaarbaar te maak.<br> Let ook daarop dat sommige programme wat die "
+"Terminaal Emuleerder gebruik nie sal werk indien jy opdrag argumente (Bv. "
+"konsole -ls) byvoeg nie."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Kliek hier om na terminaal program te soek"
diff --git a/tde-i18n-ar/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-ar/messages/tdebase/kcmcomponentchooser.po
index bd300955361..2ca411d13db 100644
--- a/tde-i18n-ar/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-ar/messages/tdebase/kcmcomponentchooser.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-06 22:17+0100\n"
 "Last-Translator: محمد سعد  Mohamed SAAD <metehyi@free.fr>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -19,13 +19,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"
@@ -50,8 +50,8 @@ msgstr "غير معروف"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>لقد غييرت خيارك للمكون الافتراضي ، هل تريد حفظ هذا التغيير الآن ؟</qt>"
 
@@ -61,8 +61,8 @@ msgstr "لا وصف متوفر"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr "إختر من اللائحة أدناه أي مكون يجب إستعماله إفتراضياً للخدمة %1."
 
 #: kcm_componentchooser.cpp:34
@@ -77,46 +77,41 @@ msgstr "أداة إختيار المكونات"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>إفتح الوصلات <b>http</b> و <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "في تطبيق مؤسس على محتويات الوصلة URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "في المتصفح التالي:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "المكون الإفتراضي"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "هنا يمكنك تغيير البرنامج المكوِّن. المكوِّنات هي برامج تتولّى أمر المهام "
 "الأساسية، مثل محاكي الشاشة الطرفية، محرّر النصوص ومستفيد البريد الالكتروني. "
@@ -124,36 +119,33 @@ msgstr ""
 "تظهر بعض النص. لتفعل ذلك بشكل مُتّسق، تنادي هذه التطبيقات دائماً نفس المكوّنات. "
 "يمكنك أن تختار هنا ما هي البرامج التي هي هذه المكوّنات."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "وصف المكون"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "يمكنك هنا قراءة وصف بسيط للمكوّن المحدد حالياً. لتغيّر المكوّن المحدد، اضغط على "
 "اللائحة إلى اليسار.لتغيّر البرنامج المكوّن، رجاء اختره في الأسفل."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
@@ -161,135 +153,103 @@ msgstr ""
 "تريد تهيئته.</p>\n"
 "<p>في مربع الحوار هذا يمكنك تغيير مكوّنات كيدي الافتراضية. المكوّنات هي برامج "
 "تتولى أمر مهامّ أساسية، مثل محاكي الشاشة الطرفية، محرّر النصوص ومستفيد البريد "
-"الالكتروني. تطبيقات كيدي المختلفة تحتاج أحياناً أن تشغّل محاكي شاشة طرفية، ترسل "
-"بريداً أو تظهر بعض النص. لتفعل ذلك بشكل مُتّسق، تنادي هذه التطبيقات دائماً نفس "
-"المكوّنات. يمكنك أن تختار هنا ما هي البرامج التي هي هذه المكوّنات.\n"
+"الالكتروني. تطبيقات كيدي المختلفة تحتاج أحياناً أن تشغّل محاكي شاشة طرفية، "
+"ترسل بريداً أو تظهر بعض النص. لتفعل ذلك بشكل مُتّسق، تنادي هذه التطبيقات دائماً "
+"نفس المكوّنات. يمكنك أن تختار هنا ما هي البرامج التي هي هذه المكوّنات.\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: عنوان المُراسل</li> "
-"<li>%s: الموضوع</li> "
-"<li>%c: مرفقة (CC)</li> "
-"<li>%b:مرفق مخفييّة (BCC)</li> "
-"<li>%B: نصّ الرّسالة القالب</li> "
-"<li>%A: الحقرفق </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: عنوان المُراسل</li> <li>%s: الموضوع</li> <li>%c: مرفقة (CC)</li> "
+"<li>%b:مرفق مخفييّة (BCC)</li> <li>%B: نصّ الرّسالة القالب</li> <li>%A: الحقرفق "
+"</li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"اضغط هذا الزر لاختيار برنامج البريد المفضل. لاحظ أن الملف الذي ستختاره يجب أن "
-"يكون ملفاً تنفيذياً لكي يتم قبوله."
-"<br> يمكن أيضاً تمرير بعض القيم التي سيتم تبديلها بالقيم الحقيقية عند استدعاء "
-"برنامح البريد:"
-"<ul> "
-"<li>%t: عنوان المُستلم </li> "
-"<li>%s: الموضوع</li> "
-"<li>%c: نسخة كربونيّة (CC)</li> "
-"<li>%b: نسخة كربونيّة خفيّة (BCC)</li> "
-"<li>%B: نصّ الرّسالة القالب</li> "
-"<li>%A: المُرفق </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"اضغط هذا الزر لاختيار برنامج البريد المفضل. لاحظ أن الملف الذي ستختاره يجب "
+"أن يكون ملفاً تنفيذياً لكي يتم قبوله.<br> يمكن أيضاً تمرير بعض القيم التي سيتم "
+"تبديلها بالقيم الحقيقية عند استدعاء برنامح البريد:<ul> <li>%t: عنوان المُستلم "
+"</li> <li>%s: الموضوع</li> <li>%c: نسخة كربونيّة (CC)</li> <li>%b: نسخة "
+"كربونيّة خفيّة (BCC)</li> <li>%B: نصّ الرّسالة القالب</li> <li>%A: المُرفق </li> "
+"</ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "أنقر هنا لتستعرض بحثاً عن ملف برنامج البريد."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&شغل في مطراف"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "قم بتفعيل هذا الخيار اذا كنت تريد قتح برنامج البريد المختار في سطر الأوامر "
 "(مثال. <em>Konsole</em>)"
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&إتعمل KMail كبرنامج البريد المفضل"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "إنّ البرنامج Kmail هو برنامج البريد المعياري لسطح المكتب TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "إستعمل برنامج &بريد إلكتروني مختلف:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "حدد هذا الخيار إذا كنت تريد إستعمال أي برنامج بريد آخر."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "إستعمل برنامج &مطراف مختلف:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "ا&ستخدم Konsole كتطبيق للمطراف"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "إضغط على هذا الزرّ كي تختار زبون المطراف المفضّل. لاحظ أنّ يجب على الملف اللذي "
-"تختاره أن يكون تنفيذي النوع كي يجري قبوله."
-"<br> لاحظ أيضاً أنّ بعض البرامج اللتي تستعمل مضاهاة المطراف قد لا تعمل إذا أضفت "
-"إليها ضوابط سطر الأمر  ( مثلاً : konsole -ls)."
+"تختاره أن يكون تنفيذي النوع كي يجري قبوله.<br> لاحظ أيضاً أنّ بعض البرامج "
+"اللتي تستعمل مضاهاة المطراف قد لا تعمل إذا أضفت إليها ضوابط سطر الأمر  "
+"( مثلاً : konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "أنقر هنا لتستعرض بحثاً عن برنامج المطراف."
@@ -299,7 +259,9 @@ msgstr "أنقر هنا لتستعرض بحثاً عن برنامج المطرا
 #~ msgstr "&إتعمل KMail كبرنامج البريد المفضل"
 
 #, fuzzy
-#~ msgid "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE desktop."
+#~ msgid ""
+#~ "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE "
+#~ "desktop."
 #~ msgstr "إنّ البرنامج Kmail هو برنامج البريد المعياري لسطح المكتب TDE."
 
 #~ msgid "Form1"
diff --git a/tde-i18n-az/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-az/messages/tdebase/kcmcomponentchooser.po
index 753d08cbf41..546bfcadcb6 100644
--- a/tde-i18n-az/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-az/messages/tdebase/kcmcomponentchooser.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-20 22:35+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -16,13 +16,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 "Mətin Əmirov"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -47,8 +47,8 @@ msgstr "Namə'lum"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 
 #: componentchooser.cpp:412
@@ -57,8 +57,8 @@ msgstr "İzahat mövcud deyil"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 
 #: kcm_componentchooser.cpp:34
@@ -73,179 +73,148 @@ msgstr "Tərkib Hissəsi Seçicisi"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr ""
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr ""
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr ""
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Ön Qurğulu Tərkib Hissəsi"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Tərkib Hissəsinin İzahatı"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Poçt proqramını seçmək üçün buraya basın."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Terminalda işə sal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&KMail proqramını epoçt alıcısı olaraq işlət"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail TDE masa üstünün standart epoçt proqramıdır."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Fərqli &epoçt proqramını işlət:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Fərqli &terminal proqramını işlət:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Terminal proqramı olaraq Konsole-u işlət"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Terminal proqramını seçmək üçün buraya tıqlayın."
@@ -255,5 +224,7 @@ msgstr "Terminal proqramını seçmək üçün buraya tıqlayın."
 #~ msgstr "&KMail proqramını epoçt alıcısı olaraq işlət"
 
 #, fuzzy
-#~ msgid "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE desktop."
+#~ msgid ""
+#~ "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE "
+#~ "desktop."
 #~ msgstr "KMail TDE masa üstünün standart epoçt proqramıdır."
diff --git a/tde-i18n-be/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-be/messages/tdebase/kcmcomponentchooser.po
index d97260c7fbe..97755f9a8f8 100644
--- a/tde-i18n-be/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-be/messages/tdebase/kcmcomponentchooser.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-22 11:42+0300\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <kde-i18n-doc@kde.org>\n"
@@ -13,17 +13,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.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"
+"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"
 "&& (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"
@@ -47,8 +47,8 @@ msgstr "Невядомы"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr "<qt>Вы змянілі стандартны кампанент. Хочаце запісаць змены?</qt>"
 
 #: componentchooser.cpp:412
@@ -57,10 +57,11 @@ msgstr "Апісанне адсутнічае"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Выберыце са спісу, які кампанент неабходна зрабіць стандартным для сервісу %1."
+"Выберыце са спісу, які кампанент неабходна зрабіць стандартным для сервісу "
+"%1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -74,189 +75,154 @@ msgstr "Выбар кампанентаў"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Адкрываць URL тыпу <b>http</b> і <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "у праграме, заснаванай на змесце URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "у наступным вандроўніку:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Стандартны кампанент"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Апісанне кампаненту"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Адрасат</li> "
-"<li>%s: Тэма</li> "
-"<li>%c: Копія (CC)</li> "
-"<li>%b: Схаваная копія (BCC)</li> "
-"<li>%B: Шаблонны тэкст</li> "
-"<li>%A: Далучаны файл </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Адрасат</li> <li>%s: Тэма</li> <li>%c: Копія (CC)</li> <li>%b: "
+"Схаваная копія (BCC)</li> <li>%B: Шаблонны тэкст</li> <li>%A: Далучаны файл "
+"</li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Націснціе, каб шукаць файл паштовай праграмы."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Запускаць у тэрмінале"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Уключыце гэтую опцыю, каб запускаць выбраны паштовы кліент у акне тэрміналу "
 "(напр., <em>Кансолі</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Зрабіць KMail улюбёным паштовым кліентам"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr ""
 "Kmail з'яўляецца стандартным паштовым кліентам працоўнага асяроддзя TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Выкарыстоўваць іншы &паштовы кліент:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Уключыце гэтую опцыю, каб выкарыстоўваць іншую паштовую праграму."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Выкарыстоўваць іншую &тэрмінальную праграму:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Зрабіць &Кансоль улюбёнай тэрмінальнай праграмай"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Націсніце тут, каб шукаць тэрмінальную праграму."
diff --git a/tde-i18n-bg/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-bg/messages/tdebase/kcmcomponentchooser.po
index 08be266d003..f47cf7ee5b4 100644
--- a/tde-i18n-bg/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-bg/messages/tdebase/kcmcomponentchooser.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-26 10:03+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"
@@ -48,11 +48,11 @@ msgstr "Неизвестно"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Променихте стандартни компоненти. Искате ли промените да бъдат "
-"записани?</qt>"
+"<qt>Променихте стандартни компоненти. Искате ли промените да бъдат записани?"
+"</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -60,8 +60,8 @@ msgstr "Няма налично описание"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr "Изберете от списъка какво да се използва по подразбиране за \"%1\"."
 
 #: kcm_componentchooser.cpp:34
@@ -76,209 +76,169 @@ msgstr "Избор на компоненти"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Отваряне на адреси <b>http</b> и <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "с различни програми според типа и съдържанието на адреса"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "със следния браузър:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Стандартен компонент"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Избор на компонентни програми. Компонентите са програми, които изпълняват "
 "основни задачи, като терминал, текстов редактор, пощенски клиент и пр. Някои "
-"програми често се нуждаят да извикат терминала или да покажат новопристигнала "
-"поща. За да се изпълняват тези функции правилно, програмите викат съответните "
-"компоненти и им предават управлението. От тук може да изберете компонентите, "
-"които ще се използват от другите програми. Системата идва със стандартно "
-"избрани компоненти, които покриват голям обхват от нужди. Не се препоръчва тези "
-"компоненти да се подменят."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"програми често се нуждаят да извикат терминала или да покажат "
+"новопристигнала поща. За да се изпълняват тези функции правилно, програмите "
+"викат съответните компоненти и им предават управлението. От тук може да "
+"изберете компонентите, които ще се използват от другите програми. Системата "
+"идва със стандартно избрани компоненти, които покриват голям обхват от "
+"нужди. Не се препоръчва тези компоненти да се подменят."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Описание на компонента"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr "Описание на компонента."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>Списък на компонентите, които могат да се променят.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Адрес на получателя.</li> "
-"<li>%s: Относно.</li> "
-"<li>%c: Копие до (CC).</li> "
-"<li>%b: Скрито копие до (BCC).</li> "
-"<li>%B: Тяло на текста.</li> "
-"<li>%A: Прикачени файлове</li>.</ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Адрес на получателя.</li> <li>%s: Относно.</li> <li>%c: Копие "
+"до (CC).</li> <li>%b: Скрито копие до (BCC).</li> <li>%B: Тяло на текста.</"
+"li> <li>%A: Прикачени файлове</li>.</ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Избор на предпочитан пощенски клиент. Моля, имайте предвид, че избраният файл "
-"трябва да е изпълним. Също така, на пощенския клиент може да се изпращат "
-"няколко параметъра:"
-"<ul> "
-"<li>%t: Адрес на получателя.</li> "
-"<li>%s: Относно.</li> "
-"<li>%c: Копие до (CC).</li> "
-"<li>%b: Скрито копие до (BCC).</li> "
-"<li>%B: Тяло на текста.</li> "
-"<li>%A: Прикачени файлове</li>.</ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Избор на предпочитан пощенски клиент. Моля, имайте предвид, че избраният "
+"файл трябва да е изпълним. Също така, на пощенския клиент може да се "
+"изпращат няколко параметъра:<ul> <li>%t: Адрес на получателя.</li> <li>%s: "
+"Относно.</li> <li>%c: Копие до (CC).</li> <li>%b: Скрито копие до (BCC).</"
+"li> <li>%B: Тяло на текста.</li> <li>%A: Прикачени файлове</li>.</ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Избор на пощенски клиент."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Изп&ълнение в терминала"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Изпълнение в терминала. Ако използвате пощенски клиент в текстов режим, трябва "
-"да активирате тази опция."
+"Изпълнение в терминала. Ако използвате пощенски клиент в текстов режим, "
+"трябва да активирате тази опция."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Използване на KMail като пощенски клиент"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Стандартният пощенски клиент за системата е KMail."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "И&зползване на друг пощенски клиент:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Използване на друг пощенски клиент, различен от стандартния."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "И&зползване на друга терминална програма:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Използване на Konsole като терминална програма"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr "Избор на терминална програма."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Избор на терминална програма."
diff --git a/tde-i18n-br/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-br/messages/tdebase/kcmcomponentchooser.po
index bd38c6f90cb..00f2560604f 100644
--- a/tde-i18n-br/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-br/messages/tdebase/kcmcomponentchooser.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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 17:19+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"
@@ -42,8 +42,8 @@ msgstr "Dianav"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 
 #: componentchooser.cpp:412
@@ -52,8 +52,8 @@ msgstr "N'eus deskrivadur ebet da gaout"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 
 #: kcm_componentchooser.cpp:34
@@ -68,179 +68,148 @@ msgstr "Dibaber ar parzhioù"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Digeriñ an URLs <b>http</b> ha <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr ""
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr ""
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr " ..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Deskrivadur ar parzhioù"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Klikit amañ da furchal evit restr ar programm postel."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Seveniñ e-barzh un termenell"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Implijit un kliant &postel all :"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Implijit ur programm &termenell all :"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Klikit amañ da furchal evit programmoù termenell."
diff --git a/tde-i18n-bs/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-bs/messages/tdebase/kcmcomponentchooser.po
index 54b8fe6c580..d0636bd14e8 100644
--- a/tde-i18n-bs/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-bs/messages/tdebase/kcmcomponentchooser.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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:19+0100\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\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 "Vedran Ljubović"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -47,11 +47,11 @@ msgstr "Nepoznato"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Izmijenili ste vašu izabranu podrazumijevanu komponentu. Želite li snimiti "
-"ovu izmjenu?</qt>"
+"<qt>Izmijenili ste vašu izabranu podrazumijevanu komponentu. Želite li "
+"snimiti ovu izmjenu?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -59,8 +59,8 @@ msgstr "Opis nije dostupan"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Sa liste ispod izaberite komponentu koja će se podrazumijevati za servis %1."
 
@@ -76,225 +76,185 @@ msgstr "Izbornik komponenti"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Otvara <b>http</b> i <b>https</b> adrese</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "u programu zasnovanom na sadržaju adrese"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "u sljedećem pregledniku:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Podrazumijevana komponenta"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Ovdje možete promijeniti komponente. Komponente su programi koji rukuju "
-"jednostavnim zadacima, kao što je simulator terminala, editor teksta ili e-mail "
-"klijent. Razne TDE aplikacije ponekad trebaju pozvati simulator treminala, "
-"poslati e-mail ili prikazati neki tekst. Da bi to bilo izvršeno na konzistentan "
-"način, ove aplikacije će uvijek koristiti iste komponente. Ovdje možete "
-"izabrati koji programi će imati ulogu ovih komponenti."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"jednostavnim zadacima, kao što je simulator terminala, editor teksta ili e-"
+"mail klijent. Razne TDE aplikacije ponekad trebaju pozvati simulator "
+"treminala, poslati e-mail ili prikazati neki tekst. Da bi to bilo izvršeno "
+"na konzistentan način, ove aplikacije će uvijek koristiti iste komponente. "
+"Ovdje možete izabrati koji programi će imati ulogu ovih komponenti."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Opis komponente"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Ovdje možete pročitati kratak opis trenutno izabrane komponente. Da biste "
 "promijenili izabranu komponentu, kliknite na listu lijevo. Da izmijenite "
 "program komponente,  molim izaberite ga ispod."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>Ova lista pokazuje podesive vrste komponenti. Kliknite na komponentu koju "
 "želite podesiti.</p>\n"
 "<p>U ovom dijalogu možete promijeniti podrazumijevane TDE komponente. "
-"Komponente su programi koji rukuju jednostavnim zadacima, kao što je simulator "
-"terminala, editor teksta ili e-mail klijent. Razne TDE aplikacije ponekad "
-"trebaju pozvati simulator treminala, poslati e-mail ili prikazati neki tekst. "
-"Da bi to bilo izvršeno na konzistentan način, ove aplikacije će uvijek "
-"koristiti iste komponente. Ovdje možete izabrati koji programi će imati ulogu "
-"ovih komponenti.</p>\n"
+"Komponente su programi koji rukuju jednostavnim zadacima, kao što je "
+"simulator terminala, editor teksta ili e-mail klijent. Razne TDE aplikacije "
+"ponekad trebaju pozvati simulator treminala, poslati e-mail ili prikazati "
+"neki tekst. Da bi to bilo izvršeno na konzistentan način, ove aplikacije će "
+"uvijek koristiti iste komponente. Ovdje možete izabrati koji programi će "
+"imati ulogu ovih komponenti.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Adresa primatelja</li> "
-"<li>%s: Tema</li> "
-"<li>%c: Kopija (CC)</li> "
-"<li>%b: Slijepa kopija (BCC)</li> "
-"<li>%B: Preložak za tekst poruke</li> "
+"<ul> <li>%t: Adresa primatelja</li> <li>%s: Tema</li> <li>%c: Kopija (CC)</"
+"li> <li>%b: Slijepa kopija (BCC)</li> <li>%B: Preložak za tekst poruke</li> "
 "<li>%A: Prilog </li> </ul>"
 
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Pritisnite ovo dugme da izaberete vaš omiljeni email klijent. Molim zapamtite "
-"da datoteka koju izaberete mora imati podešen atribut izvršivosti kako bi bila "
-"prihvaćena."
-"<br> Također možete koristiti više varijabli koje će biti zamijenjene stvarnim "
-"vrijednostima kada pozovete email klijent:"
-"<ul> "
-"<li>%t: Adresa primatelja</li> "
-"<li>%s: Tema</li> "
-"<li>%c: Kopija (CC)</li> "
-"<li>%b: Slijepa kopija (BCC)</li> "
-"<li>%B: Preložak za tekst poruke</li> "
-"<li>%A: Prilog </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Pritisnite ovo dugme da izaberete vaš omiljeni email klijent. Molim "
+"zapamtite da datoteka koju izaberete mora imati podešen atribut izvršivosti "
+"kako bi bila prihvaćena.<br> Također možete koristiti više varijabli koje će "
+"biti zamijenjene stvarnim vrijednostima kada pozovete email klijent:<ul> <li>"
+"%t: Adresa primatelja</li> <li>%s: Tema</li> <li>%c: Kopija (CC)</li> <li>"
+"%b: Slijepa kopija (BCC)</li> <li>%B: Preložak za tekst poruke</li> <li>%A: "
+"Prilog </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Kliknite ovdje da potražite datoteku mail programa."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Pokreni u terminalu"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Aktivirajte ovu opciju ako želite da izabrani email klijent bude izvršen u "
 "terminalu (npr. <em>Konzola</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Koristi KMail kao preferirani email klijent"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail je standardni e-mail program TDE okoline."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Koristi neki drugi &email klijent:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Izaberite ovu opciju ako želite koristiti neki drugi e-mail program."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Koristi neki drugi &terminal program:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Koristi Konzolu kao terminal program"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Pritisnite ovo dugme da izaberete vaš omiljeni terminalski klijent. Molim "
-"zapamtite da datoteka koju izaberete mora imati postavljen izvršni atribut kako "
-"bi bila prihvaćena."
-"<br> Takođe primijetite da neki programi koji koriste Simulator Terminala neće "
-"raditi ako dodate argumente na komandnoj liniji (na primjer: konsole -ls)."
+"zapamtite da datoteka koju izaberete mora imati postavljen izvršni atribut "
+"kako bi bila prihvaćena.<br> Takođe primijetite da neki programi koji "
+"koriste Simulator Terminala neće raditi ako dodate argumente na komandnoj "
+"liniji (na primjer: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Kliknite ovdje da potražite terminalski program."
diff --git a/tde-i18n-ca/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-ca/messages/tdebase/kcmcomponentchooser.po
index e81f8a53653..61fdc521cdd 100644
--- a/tde-i18n-ca/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-ca/messages/tdebase/kcmcomponentchooser.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-23 19:55+0100\n"
 "Last-Translator: Sebastià Pla i Sanz <sps@sastia.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -17,13 +17,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,Antoni Bella Perez"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -47,11 +47,11 @@ msgstr "Desconegut"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Heu canviat el component per omissió escollit, voleu desar el canvi "
-"ara?</qt>"
+"<qt>Heu canviat el component per omissió escollit, voleu desar el canvi ara?"
+"</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -59,8 +59,8 @@ msgstr "No hi ha disponible cap descripció"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "De la llista de sota trieu quin component s'hauria d'usar per omissió pel "
 "servei %1."
@@ -77,226 +77,188 @@ msgstr "Selector de component"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Obre URLs <b>http</b> i <b>https</b>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "a una aplicació basada en el contingut de l'URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "al fullejador següent:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Component per omissió"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Aquí podeu canviar el programa component. Els components són programes que "
-"gestionen tasques bàsiques, tal com l'emulació de terminal, l'edició de text i "
-"el client de correu electrònic. A vegades es requereixen diverses aplicacions "
-"TDE per a invocar a un emulador de consola, enviar un correu o mostrar algun "
-"text. Per a fer que això sigui consistent, aquestes aplicacions cridaran als "
-"mateixos components. Aquí podreu triar quins seran aquests components."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"gestionen tasques bàsiques, tal com l'emulació de terminal, l'edició de text "
+"i el client de correu electrònic. A vegades es requereixen diverses "
+"aplicacions TDE per a invocar a un emulador de consola, enviar un correu o "
+"mostrar algun text. Per a fer que això sigui consistent, aquestes "
+"aplicacions cridaran als mateixos components. Aquí podreu triar quins seran "
+"aquests components."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Descripció del component"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Aquí podeu llegir una petita descripció del component actualment seleccionat. "
-"Per a seleccionar-ne un altre, cliqueu a sobre seu a la llista de l'esquerra. "
-"Per a canviar el programa component, si us plau, escolliu-lo a sota"
+"Aquí podeu llegir una petita descripció del component actualment "
+"seleccionat. Per a seleccionar-ne un altre, cliqueu a sobre seu a la llista "
+"de l'esquerra. Per a canviar el programa component, si us plau, escolliu-lo "
+"a sota"
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Aquesta llista mostra els tipus de components configurables. Cliqueu en el "
-"component que voleu configurar.</p>\n"
+"<p>Aquesta llista mostra els tipus de components configurables. Cliqueu en "
+"el component que voleu configurar.</p>\n"
 "<p>En aquest diàleg podeu canviar els components per omissió del TDE. Els "
-"components són programes que gestionen tasques bàsiques, tal com l'emulació de "
-"terminal, l'edició de text i el client de correu electrònic. A vegades es "
-"requereixen diverses aplicacions  TDE per a invocar a un emulador de consola, "
-"enviar un correu o mostrar algun text. Per a fer que això sigui consistent, "
-"aquestes aplicacions cridaran als mateixos components. Aquí podreu triar quins "
-"seran aquests components.</p>\n"
+"components són programes que gestionen tasques bàsiques, tal com l'emulació "
+"de terminal, l'edició de text i el client de correu electrònic. A vegades es "
+"requereixen diverses aplicacions  TDE per a invocar a un emulador de "
+"consola, enviar un correu o mostrar algun text. Per a fer que això sigui "
+"consistent, aquestes aplicacions cridaran als mateixos components. Aquí "
+"podreu triar quins seran aquests components.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul>"
-"<li>%t: Adreça del receptor</li> "
-"<li>%s: Assumpte</li> "
-"<li>%c: Còpia (CC)</li> "
-"<li>%b: Còpia cega (BCC)</li> "
-"<li>%B: Plantilla del text del cos</li> "
-"<li>%A: Adjunt </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul><li>%t: Adreça del receptor</li> <li>%s: Assumpte</li> <li>%c: Còpia "
+"(CC)</li> <li>%b: Còpia cega (BCC)</li> <li>%B: Plantilla del text del cos</"
+"li> <li>%A: Adjunt </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Premeu aquest botó per seleccionar el vostre client de correu favorit. Tingueu "
-"present que el fitxer que seleccioneu ha de tenir l'atribut executable per tal "
-"de ser acceptat."
-"<br> També podeu usar diverses reserves de lloc que es remplaçaran amb els "
-"valors actuals quan es cridi el client de correu:"
-"<ul> "
-"<li>%t: Adreça del destinatari</li> "
-"<li>%s: Assumpte</li> "
-"<li>%c: Còpia (CC)</li> "
-"<li>%b: Còpia cega (BCC)</li> "
-"<li>%B: Plantilla del text del cos</li> "
-"<li>%A: Adjunt </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Premeu aquest botó per seleccionar el vostre client de correu favorit. "
+"Tingueu present que el fitxer que seleccioneu ha de tenir l'atribut "
+"executable per tal de ser acceptat.<br> També podeu usar diverses reserves "
+"de lloc que es remplaçaran amb els valors actuals quan es cridi el client de "
+"correu:<ul> <li>%t: Adreça del destinatari</li> <li>%s: Assumpte</li> <li>"
+"%c: Còpia (CC)</li> <li>%b: Còpia cega (BCC)</li> <li>%B: Plantilla del text "
+"del cos</li> <li>%A: Adjunt </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Cliqueu aquí per a cercar el fitxer del programa de correu."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Executa a &terminal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Activeu aquesta opció si voleu que el client de correu seleccionat s'executi a "
-"una terminal (p.ex. <em>Konsole</em>)."
+"Activeu aquesta opció si voleu que el client de correu seleccionat s'executi "
+"a una terminal (p.ex. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "Usa &KMail com a client de correu preferit"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail és el programa estàndard per al correu a l'escriptori TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Usa un cli&ent de correu diferent:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Seleccionar aquesta opció si desitgeu emprar un altre programa de correu."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Usa un programa de &terminal diferent:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Usa &Konsole com a aplicació de terminal"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Premeu aquest botó per a seleccionar el vostre client de terminal preferit. "
-"Tingueu present que el fitxer que seleccioneu ha de tenir establert l'atribut "
-"executable per tal de ser acceptat. "
-"<br> Tingueu present també que alguns programes que usen Terminal Emulator no "
-"funcionaran si afegiu arguments de línia de comandaments (Exemple: konsole -ls)"
+"Tingueu present que el fitxer que seleccioneu ha de tenir establert "
+"l'atribut executable per tal de ser acceptat. <br> Tingueu present també que "
+"alguns programes que usen Terminal Emulator no funcionaran si afegiu "
+"arguments de línia de comandaments (Exemple: konsole -ls)"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Cliqueu aquí per a buscar el programa de terminal."
diff --git a/tde-i18n-cs/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-cs/messages/tdebase/kcmcomponentchooser.po
index 81054f2caa5..1f956bf1401 100644
--- a/tde-i18n-cs/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-cs/messages/tdebase/kcmcomponentchooser.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-24 15:15+0100\n"
 "Last-Translator: Klara Cihlarova <koty@seznam.cz>\n"
 "Language-Team: Czech <suse@suse.cz>\n"
@@ -15,24 +15,24 @@ 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%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"
-"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"
-"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
+"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"
+"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"
+"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:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Lukáš Tinkl"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -56,11 +56,11 @@ msgstr "Neznámé"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Změnili jste svou výchozí komponentu, přejete si nyní uložit tuto "
-"změnu?</qt>"
+"<qt>Změnili jste svou výchozí komponentu, přejete si nyní uložit tuto změnu?"
+"</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -68,11 +68,11 @@ msgstr "Žádný dostupný popis"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Ze seznamu níže zvolte komponentu, která má být použita jako výchozí pro službu "
-"'%1'."
+"Ze seznamu níže zvolte komponentu, která má být použita jako výchozí pro "
+"službu '%1'."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -86,223 +86,182 @@ msgstr "Výběr komponent"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c) 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Otevírat <b>http</b> a <b>https</b> URL</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "v aplikaci závislé na obsahu URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "v tomto prohlížeči:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Výchozí komponenta"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Zde můžete změnit komponentu programu. Komponenty jsou programy, které "
 "obsluhují základní úkoly, jako je emulátor terminálu, textový editor nebo "
-"emailový klient. Různé aplikace TDE občas potřebují spustit emulátor terminálu, "
-"odeslat email nebo zobrazit text. K zachování konzistentnosti tyto aplikace "
-"vždy volají stejné komponenty. Zde si můžete zvolit komponenty jednotlivých "
-"programů."
+"emailový klient. Různé aplikace TDE občas potřebují spustit emulátor "
+"terminálu, odeslat email nebo zobrazit text. K zachování konzistentnosti "
+"tyto aplikace vždy volají stejné komponenty. Zde si můžete zvolit komponenty "
+"jednotlivých programů."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Popis komponenty"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Zde si můžete přečíst krátký popisek aktuálně vybrané komponenty. Ke změně "
 "vybrané komponenty klikněte v seznamu vlevo a vyberte si odpovídající "
 "komponentu níže."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p> Tento seznam zobrazuje konfigurovatelné typy komponent. Klikněte na "
 "komponentu, kterou chcete nastavit.</p>\n"
-"<p>Komponenty jsou programy, které obsluhují základní úkoly, jako je emulátor "
-"terminálu, textový editor nebo emailový klient. Různé aplikace TDE občas "
-"potřebují spustit emulátor terminálu, odeslat email nebo zobrazit text. K "
-"zachování konzistentnosti tyto aplikace vždy volají stejné komponenty. Zde si "
-"můžete zvolit komponenty jednotlivých programů.</p>\n"
+"<p>Komponenty jsou programy, které obsluhují základní úkoly, jako je "
+"emulátor terminálu, textový editor nebo emailový klient. Různé aplikace TDE "
+"občas potřebují spustit emulátor terminálu, odeslat email nebo zobrazit "
+"text. K zachování konzistentnosti tyto aplikace vždy volají stejné "
+"komponenty. Zde si můžete zvolit komponenty jednotlivých programů.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul>"
-"<li>%t: Adresa příjemce</li> "
-"<li>%s: Předmět</li>"
-"<li>%c: Kopie (CC)</li>"
-"<li>%b: Slepá kopie (BCC)</li>"
-"<li>%B: Šablona obsahu</li> "
-"<li>%A: Příloha</li></ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul><li>%t: Adresa příjemce</li> <li>%s: Předmět</li><li>%c: Kopie (CC)</"
+"li><li>%b: Slepá kopie (BCC)</li><li>%B: Šablona obsahu</li> <li>%A: "
+"Příloha</li></ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Stiskněte toto tlačítko k výběru upřednostňovaného poštovního klienta. Prosím "
-"uvědomte si, že vybraný soubor musí mít nastaveny práva ke spouštění, aby mohl "
-"být akceptován."
-"<br> Můžete též použít několik substitučních zkratek, které budou nahrazeny "
-"následujícími hodnotami:"
-"<ul>"
-"<li>%t: adresa příjemce</li> "
-"<li>%s: Předmět</li>"
-"<li>%c: Kopie (CC)</li>"
-"<li>%b: Slepá kopie (BCC)</li>"
-"<li>%B: Šablona obsahu</li> "
-"<li>%A: Příloha</li></ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Stiskněte toto tlačítko k výběru upřednostňovaného poštovního klienta. "
+"Prosím uvědomte si, že vybraný soubor musí mít nastaveny práva ke spouštění, "
+"aby mohl být akceptován.<br> Můžete též použít několik substitučních "
+"zkratek, které budou nahrazeny následujícími hodnotami:<ul><li>%t: adresa "
+"příjemce</li> <li>%s: Předmět</li><li>%c: Kopie (CC)</li><li>%b: Slepá kopie "
+"(BCC)</li><li>%B: Šablona obsahu</li> <li>%A: Příloha</li></ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Klikněte zde pro vyhledání poštovního programu."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Spustit v te&rminálu"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Chcete-li spouštět vybraného poštovního klienta v terminálu (např. <em>"
-"Konsole</em>), pak zaškrtněte tuto volbu."
+"Chcete-li spouštět vybraného poštovního klienta v terminálu (např. "
+"<em>Konsole</em>), pak zaškrtněte tuto volbu."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "Po&užít KMail jako preferovaného poštovního klienta"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail je standardní poštovní program prostředí TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Použít jiného poštovního kli&enta:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Zvolte tuto možnost, chcete-li použít jiný poštovní program."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Použít jiný &terminálový program:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Po&užít Konsoli jako terminálovou aplikaci"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Stiskněte toto tlačítko k výběru upřednostňovaného terminálového klienta. "
 "Prosím uvědomte si, že vybraný soubor musí mít nastaveny práva ke spouštění, "
-"aby mohl být akceptován."
-"<br> Dále si všimněte, že některé terminálové programy nebudou fungovat, pokud "
-"jim předáte volby na příkazovém řádku (např. konsole -ls)."
+"aby mohl být akceptován.<br> Dále si všimněte, že některé terminálové "
+"programy nebudou fungovat, pokud jim předáte volby na příkazovém řádku "
+"(např. konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Klikněte zde pro vyhledání terminálového programu."
diff --git a/tde-i18n-cy/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-cy/messages/tdebase/kcmcomponentchooser.po
index ade8a6dc9bc..ec231ac900c 100644
--- a/tde-i18n-cy/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-cy/messages/tdebase/kcmcomponentchooser.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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 06:59+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -16,13 +16,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 "Owain Green drwy KGyfieithu"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -47,11 +47,11 @@ msgstr "Anhysbys"
 #: componentchooser.cpp:408
 #, fuzzy
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Newidioch gydran ragosod eich dewis, ydych am gadw'r newid yna nawr? <BR>"
-"<BR>Bydd dewis <B>Na</B> yn taflu'ch newidiadau</qt>"
+"<qt>Newidioch gydran ragosod eich dewis, ydych am gadw'r newid yna nawr? "
+"<BR><BR>Bydd dewis <B>Na</B> yn taflu'ch newidiadau</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -59,11 +59,11 @@ msgstr "Dim disgrifiad ar gael"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Dewiswch o'r restr isod pa gydrannau y dylid eu defnyddio'n ragosod ar gyfer y "
-"gwasanaeth %1."
+"Dewiswch o'r restr isod pa gydrannau y dylid eu defnyddio'n ragosod ar gyfer "
+"y gwasanaeth %1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -77,224 +77,185 @@ msgstr "Dewisydd Cydrannau"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(h)(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Agor URLau <b>http</b> ac <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "mewn cymhwysiad a seilir ar gynnwys yr URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "yn y porydd gwe yma:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Cydran Ragosodedig"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Yma gallwch newid y rhaglen gydrannau.  Mae cydrannau yn raglenni sy'n trin "
-"tasgiau gwahanol, fel yr efelychydd terfynell, y golygydd testun, a'r dibynnydd "
-"ebost.  Weithiau mae'n rhaid i gymhwysiadau gwahanol TDE ymgychywn efelychydd "
-"terfynell, anfon ebost, neu dangos testun.  Er mwyn gwneud hyn yn gyson, mae'r "
-"cymhwysiadau yma o hyd yn galw'r un un gydran.  Gallwch ddewis yma pa raglenni "
-"y mae'r cydrannau yma.   "
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"tasgiau gwahanol, fel yr efelychydd terfynell, y golygydd testun, a'r "
+"dibynnydd ebost.  Weithiau mae'n rhaid i gymhwysiadau gwahanol TDE ymgychywn "
+"efelychydd terfynell, anfon ebost, neu dangos testun.  Er mwyn gwneud hyn yn "
+"gyson, mae'r cymhwysiadau yma o hyd yn galw'r un un gydran.  Gallwch ddewis "
+"yma pa raglenni y mae'r cydrannau yma.   "
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Disgrifiad y Gydran"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Yma gallwch darllen disgrifiad bach o'r gydran a ddewisir ar hyn o bryd.  Er "
-"mwyn newid y gydran benodol, cliciwch ar y rhestr i'r chwith.  Er mwyn newid y "
-"rhaglen gydran, dewiswch hi isod."
+"mwyn newid y gydran benodol, cliciwch ar y rhestr i'r chwith.  Er mwyn newid "
+"y rhaglen gydran, dewiswch hi isod."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>Ymddengys y rhestr yma y mathau o gydran a ellir ffurfweddu.  Cliciwch y "
 "gydran yr hoffech ffurfweddu.</p>\n"
 "<p>Yn yr ymgom yma, gallwch newid cydrannau rhagosod TDE.  Mae cydrannau yn "
-"raglenni sy'n trin tasgiau sylfaenol, fel yr efelychydd terfynell, y golygydd "
-"testun, a'r dibynnydd ebost.  Weithiau mae'n rhaid i gymhwysiadau gwahanol TDE "
-"ymgychywn efelychydd terfynell, anfon ebost, neu dangos testun.  Er mwyn gwneud "
-"hyn yn gyson, mae'r cymhwysiadau yma o hyd yn galw'r un un gydran.  Gallwch "
-"ddewis yma pa raglenni y mae'r cydrannau yma.</p>\n"
+"raglenni sy'n trin tasgiau sylfaenol, fel yr efelychydd terfynell, y "
+"golygydd testun, a'r dibynnydd ebost.  Weithiau mae'n rhaid i gymhwysiadau "
+"gwahanol TDE ymgychywn efelychydd terfynell, anfon ebost, neu dangos "
+"testun.  Er mwyn gwneud hyn yn gyson, mae'r cymhwysiadau yma o hyd yn galw'r "
+"un un gydran.  Gallwch ddewis yma pa raglenni y mae'r cydrannau yma.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Cyfeiriad y derbynnydd</li> "
-"<li>%s: Pwnc</li> "
-"<li>%c: Copi Carbon (CC)</li> "
-"<li>%b: Copi Carbon Dall (BCC)</li> "
-"<li>%B: Testun corff patrymlun</li> "
-"<li>%A: Atodiad </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Cyfeiriad y derbynnydd</li> <li>%s: Pwnc</li> <li>%c: Copi "
+"Carbon (CC)</li> <li>%b: Copi Carbon Dall (BCC)</li> <li>%B: Testun corff "
+"patrymlun</li> <li>%A: Atodiad </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Gwasgwch y botwm yma i ddewis eich hoff ddibynnydd ebost. Noder bod rhaid bod y "
-"briodwedd weithredadwy wedi'i gosod ar y ffeil y dewiswch er mwyn ei derbyn."
-"<br> Gallwch hefyd ddefnyddio sawl daliwr lle i'w hamnewid â'r gwerthoedd gwir "
-"pan elwir y dybynnydd ebost:"
-"<ul> "
-"<li>%t: Cyfeiriad y derbynnydd</li> "
-"<li>%s: Pwnc</li> "
-"<li>%c: Copi Carbon (CC)</li> "
-"<li>%b: Copi Carbon Dall (BCC)</li> "
-"<li>%B: Testun corff patrymlun</li> "
-"<li>%A: Atodiad </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Gwasgwch y botwm yma i ddewis eich hoff ddibynnydd ebost. Noder bod rhaid "
+"bod y briodwedd weithredadwy wedi'i gosod ar y ffeil y dewiswch er mwyn ei "
+"derbyn.<br> Gallwch hefyd ddefnyddio sawl daliwr lle i'w hamnewid â'r "
+"gwerthoedd gwir pan elwir y dybynnydd ebost:<ul> <li>%t: Cyfeiriad y "
+"derbynnydd</li> <li>%s: Pwnc</li> <li>%c: Copi Carbon (CC)</li> <li>%b: Copi "
+"Carbon Dall (BCC)</li> <li>%B: Testun corff patrymlun</li> <li>%A: Atodiad </"
+"li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Cliciwch yma i bori am y ffeil rhaglen ebost."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Rhedeg mewn terfynnell"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Gweithredolwch y dewisiad yma os ydych am redeg y dibynnydd ebost dewisiedig "
 "mewn terfynnell (e.e. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Defnyddio KMail yn hoff ddibynnydd ebost"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr " Kmail yw'r rhaglen safonol ebost ar gyfer y penbwrdd TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Defnyddio dibynnydd &ebost arall:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Dewiswch y dewisiad yma os hoffech ddefnyddio rhyw rhaglen ebost arall."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Defnyddio rhaglen d&erfynnell arall:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Defnyddio Konsole yn gymhwysiad terfynnell"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Gwasgwch y botwm yma i ddewis eich hoff ddibynnydd terfynnell.  Noder bod rhaid "
-"gosod y priodoledd gweithredadwy ar y ffeil a ddewisir iddi gael ei derbyn. "
-"<br>Noder hefyd na fydd rhai rhaglenni sy'n defnyddio Efelychydd Terfynnell yn "
-"gweithio os ychwanegwch ymresymiadau llinell orchymyn (Enghraifft: knonsole "
-"-ls)."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"Gwasgwch y botwm yma i ddewis eich hoff ddibynnydd terfynnell.  Noder bod "
+"rhaid gosod y priodoledd gweithredadwy ar y ffeil a ddewisir iddi gael ei "
+"derbyn. <br>Noder hefyd na fydd rhai rhaglenni sy'n defnyddio Efelychydd "
+"Terfynnell yn gweithio os ychwanegwch ymresymiadau llinell orchymyn "
+"(Enghraifft: knonsole -ls)."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Cliciwch yma i bori am y rhaglen derfynnell."
@@ -304,7 +265,9 @@ msgstr "Cliciwch yma i bori am y rhaglen derfynnell."
 #~ msgstr "&Defnyddio KMail yn hoff ddibynnydd ebost"
 
 #, fuzzy
-#~ msgid "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE desktop."
+#~ msgid ""
+#~ "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE "
+#~ "desktop."
 #~ msgstr " Kmail yw'r rhaglen safonol ebost ar gyfer y penbwrdd TDE."
 
 #~ msgid "Form1"
diff --git a/tde-i18n-da/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-da/messages/tdebase/kcmcomponentchooser.po
index 1de8ca473d6..16b03fe89ad 100644
--- a/tde-i18n-da/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-da/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-21 07:36-0500\n"
 "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Plural-Forms: \n"
 "Plural-Forms: \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"
@@ -47,8 +47,8 @@ msgstr "Ukendt"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Du ændrede din foretrukne standardkomponent. Ønsker du at gemme denne "
 "ændring nu ?</qt>"
@@ -59,8 +59,8 @@ msgstr "Ingen beskrivelse tilgængelig"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Vælg fra listen nedenfor hvilke komponenter der skal bruges som standard for "
 "%1-tjenesten."
@@ -77,222 +77,184 @@ msgstr "Komponentvælger"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Åbn <b>http</b> og <b>https</b> URL'er</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "i et program baseret på indholdet af URL'en"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "i følgende browser:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Standard-komponent"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Her kan ændre komponentprogrammet. Komponenter er programmer der håndterer "
 "basale opgaver, såsom terminalemulator, teksteditor og e-mail-klient. "
-"Forskellige TDE-programmer har sommetider brug for at starte en "
-"konsol-emulator, sende et brev eller vise noget tekst. For at gøre dette på en "
-"konsistent måde, kalder disse programmer altid de samme komponenter. Her kan du "
-"vælge hvilke programmer disse komponenter er."
+"Forskellige TDE-programmer har sommetider brug for at starte en konsol-"
+"emulator, sende et brev eller vise noget tekst. For at gøre dette på en "
+"konsistent måde, kalder disse programmer altid de samme komponenter. Her kan "
+"du vælge hvilke programmer disse komponenter er."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Komponentbeskrivelse"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Her kan du læse en lille beskrivelse af den komponent der er valgt nu. For at "
-"ændre den valgte komponent, klikkes på listen til venstre. For at ændre "
+"Her kan du læse en lille beskrivelse af den komponent der er valgt nu. For "
+"at ændre den valgte komponent, klikkes på listen til venstre. For at ændre "
 "komponentprogrammet vælges det nedenfor."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Denne liste viser de indstillelige komponenttyper. Klik på den komponent du "
-"ønsker at indstille.</p>\n"
+"<p>Denne liste viser de indstillelige komponenttyper. Klik på den komponent "
+"du ønsker at indstille.</p>\n"
 "<p>I denne dialog kan du ændre TDE's standardkomponenter. Komponenter er "
-"programmer der håndterer basale opgaver, såsom terminalemulator, teksteditor og "
-"e-mail-klient. Forskellige TDE-programmer har sommetider brug for at starte en "
-"konsol-emulator, sende et brev eller vise noget tekst. For at gøre dette på en "
-"konsistent måde, kalder disse programmer altid de samme komponenter. Her kan du "
-"vælge hvilke programmer disse komponenter er.</p>\n"
+"programmer der håndterer basale opgaver, såsom terminalemulator, teksteditor "
+"og e-mail-klient. Forskellige TDE-programmer har sommetider brug for at "
+"starte en konsol-emulator, sende et brev eller vise noget tekst. For at gøre "
+"dette på en konsistent måde, kalder disse programmer altid de samme "
+"komponenter. Her kan du vælge hvilke programmer disse komponenter er.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Modtagers adresse</li> "
-"<li>%s: Emne</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Skabelonens brødtekst</li> "
-"<li>%A: Bilag </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Modtagers adresse</li> <li>%s: Emne</li> <li>%c: Carbon Copy "
+"(CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Skabelonens "
+"brødtekst</li> <li>%A: Bilag </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Tryk på denne knap for at vælge din favorit e-mail-klient. Bemærk venligst at "
-"filen du vælger skal have den kørbare attribut sat for at blive accepteret."
-"<br> Du kan bruge forskellige pladsholdere som vil blive erstattet med de "
-"egentlige værdier når e-mail-klienten kaldes:"
-"<ul> "
-"<li>%t: Modtagers adresse</li> "
-"<li>%s: Emne</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Skabelonens brødtekst</li> "
-"<li>%A: Bilag </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Tryk på denne knap for at vælge din favorit e-mail-klient. Bemærk venligst "
+"at filen du vælger skal have den kørbare attribut sat for at blive "
+"accepteret.<br> Du kan bruge forskellige pladsholdere som vil blive "
+"erstattet med de egentlige værdier når e-mail-klienten kaldes:<ul> <li>%t: "
+"Modtagers adresse</li> <li>%s: Emne</li> <li>%c: Carbon Copy (CC)</li> <li>"
+"%b: Blind Carbon Copy (BCC)</li> <li>%B: Skabelonens brødtekst</li> <li>%A: "
+"Bilag </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Klik her for at lede efter postprogramfilen."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Kør i terminal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Aktivér dette hvis du ønsker at den valgte e-mail-klient skal køres i en "
 "terminal (f.eks. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Brug KMail som foretrukken e-mail-klient"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail er standard-postprogrammet for TDE's desktop."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Brug en anden &e-mail-klient:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Vælg dette hvis du ønsker at bruge et andet postprogram."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Brug et andet &terminalprogram:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Brug Konsole som terminalprogram"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Tryk på denne knap for at vælge din foretrukne terminalklient. Bemærk venligst "
-"at filen du vælger skal have den kørbare attribute sat for at blive accepteret."
-"<br> Bemærk også at nogle programmer der udnytter terminal-emulator ikke vil "
-"virke hvis du tilføjer kommandolinjeargumenter (Eksempel: konsole -ls)."
+"Tryk på denne knap for at vælge din foretrukne terminalklient. Bemærk "
+"venligst at filen du vælger skal have den kørbare attribute sat for at blive "
+"accepteret.<br> Bemærk også at nogle programmer der udnytter terminal-"
+"emulator ikke vil virke hvis du tilføjer kommandolinjeargumenter (Eksempel: "
+"konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Klik her for at lede efter terminalprogram."
diff --git a/tde-i18n-de/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-de/messages/tdebase/kcmcomponentchooser.po
index 9d5172168b8..cd104607ed6 100644
--- a/tde-i18n-de/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-de/messages/tdebase/kcmcomponentchooser.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-29 12:07+0200\n"
 "Last-Translator: Stephan Johach <hunsum@gmx.de>\n"
 "Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
@@ -21,13 +21,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,Thomas Reitelbach"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,11 +51,11 @@ msgstr "Unbekannt"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Sie haben die Standardkomponente geändert. Möchten Sie die neue Einstellung "
-"speichern?</qt>"
+"<qt>Sie haben die Standardkomponente geändert. Möchten Sie die neue "
+"Einstellung speichern?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -63,8 +63,8 @@ msgstr "Keine Beschreibung verfügbar"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Wählen Sie aus der Liste unten die Standardkomponente für den Dienst %1."
 
@@ -80,233 +80,193 @@ msgstr "Komponentenauswahl"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c) 2002, Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr ""
 "<qt>Adressen öffnen, die mit <b>http</b> oder <b>https</b> beginnen</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "in einem Programm, das auf Inhalten der Adresse basiert"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "mit folgendem Browser:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Standard-Komponente"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Hier können Sie das Komponentenprogramm wechseln. \"Komponenten\" sind "
 "Programme, die elementare Aufgaben erledigen, so etwa der Terminal-Emulator, "
 "der Texteditor oder das E-Mail-Programm. TDE-Programme müssen gelegentlich "
-"einen Terminal-Emulator aufrufen, eine E-Mail verschicken oder Text darstellen. "
-"Um die Einheitlichkeit zu wahren, verwenden die Anwendungen dieselben "
-"Standardkomponenten. Hier können Sie die Programme für diese Komponenten "
-"auswählen."
+"einen Terminal-Emulator aufrufen, eine E-Mail verschicken oder Text "
+"darstellen. Um die Einheitlichkeit zu wahren, verwenden die Anwendungen "
+"dieselben Standardkomponenten. Hier können Sie die Programme für diese "
+"Komponenten auswählen."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Beschreibung der Komponente"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Hier können Sie eine kurze Beschreibung der gerade ausgewählten Komponente "
 "lesen. Um zu einer anderen Komponente zu wechseln, klicken Sie auf einen "
 "Eintrag in der Liste auf der linken Seite. Um zu einem anderen "
 "Komponentenprogramm zu gehen, wählen Sie unten eines aus."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>Diese Liste zeigt die einstellbaren Komponententypen an. Klicken Sie auf "
 "einen der Einträge, wenn Sie Festlegungen dazu treffen wollen.</p>\n"
 "<p>In diesem Dialog können Sie zu anderen TDE-Standardkomponenten wechseln. "
-"\"Komponenten\" sind Programme, die elementare Aufgaben erledigen, so etwa der "
-"Terminal-Emulator, der Texteditor oder das E-Mail-Programm. Einige "
-"TDE-Programme müssen gelegentlich einen Terminal-Emulator aufrufen, eine E-Mail "
-"verschicken oder Text darstellen. Um die Einheitlichkeit zu wahren, verwenden "
-"die Anwendungen dieselben Standardkomponenten. Hier können Sie die Programme "
-"für diese Komponenten auswählen.</p>\n"
+"\"Komponenten\" sind Programme, die elementare Aufgaben erledigen, so etwa "
+"der Terminal-Emulator, der Texteditor oder das E-Mail-Programm. Einige TDE-"
+"Programme müssen gelegentlich einen Terminal-Emulator aufrufen, eine E-Mail "
+"verschicken oder Text darstellen. Um die Einheitlichkeit zu wahren, "
+"verwenden die Anwendungen dieselben Standardkomponenten. Hier können Sie die "
+"Programme für diese Komponenten auswählen.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Empfängeradresse</li> "
-"<li>%s: Betreff</li> "
-"<li>%c: Kopie (CC)</li> "
-"<li>%b: Blindkopie (BCC)</li> "
-"<li>%B: Textvorlage</li> "
-"<li>%A: Dateianhang </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Empfängeradresse</li> <li>%s: Betreff</li> <li>%c: Kopie (CC)</"
+"li> <li>%b: Blindkopie (BCC)</li> <li>%B: Textvorlage</li> <li>%A: "
+"Dateianhang </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Klicken Sie auf diesen Knopf, um Ihr bevorzugtes E-Mail-Programm auszuwählen. "
-"Bitte beachten Sie, dass es sich um eine ausführbare Datei handeln muss."
-"<br>Sie können außerdem verschiedene Variablen verwenden, die beim Start des "
-"E-Mail-Programms mit den übergebenen Werten ausgefüllt werden:"
-"<ul> "
-"<li>%t: Empfängeradresse</li> "
-"<li>%s: Betreff</li> "
-"<li>%c: Kopie (CC)</li> "
-"<li>%b: Blindkopie (BCC)</li> "
-"<li>%B: Textvorlage</li> "
-"<li>%A: Dateianhang </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Klicken Sie auf diesen Knopf, um Ihr bevorzugtes E-Mail-Programm "
+"auszuwählen. Bitte beachten Sie, dass es sich um eine ausführbare Datei "
+"handeln muss.<br>Sie können außerdem verschiedene Variablen verwenden, die "
+"beim Start des E-Mail-Programms mit den übergebenen Werten ausgefüllt werden:"
+"<ul> <li>%t: Empfängeradresse</li> <li>%s: Betreff</li> <li>%c: Kopie (CC)</"
+"li> <li>%b: Blindkopie (BCC)</li> <li>%B: Textvorlage</li> <li>%A: "
+"Dateianhang </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr ""
 "Klicken Sie hier, um nach der ausführbaren Datei des E-Mail-Programms zu "
 "suchen."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "In &Terminal starten"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Aktivieren Sie diese Einstellung, wenn Sie möchten, dass das ausgewählte "
-"E-Mail-Programm in einem Befehlsfenster (also einem Terminalprogramm wie <em>"
-"Konsole</em>) ausgeführt wird."
+"Aktivieren Sie diese Einstellung, wenn Sie möchten, dass das ausgewählte E-"
+"Mail-Programm in einem Befehlsfenster (also einem Terminalprogramm wie "
+"<em>Konsole</em>) ausgeführt wird."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&KMail als bevorzugtes E-Mail-Programm festlegen"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail ist das Standard-E-Mail-Programm für TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Anderes E-&Mail-Programm verwenden:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Wählen Sie diese Einstellung, wenn Sie ein anderes E-Mail-Programm verwenden "
 "möchten."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Anderes &Terminalprogramm verwenden:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "K&onsole als Terminalprogramm verwenden"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Drücken Sie diesen Knopf, um Ihr bevorzugtes Terminalprogramm auszuwählen. "
 "Bitte beachten Sie, dass die ausgewählte Datei als ausführbar gekennzeichnet "
-"sein muss, um akzeptiert zu werden. "
-"<br>Beachten Sie außerdem, dass manche Programme, die Terminalemulatoren "
-"verwenden, nicht korrekt funktionieren, wenn Sie Befehlszeilenargumente "
-"übergeben (wie z. B. konsole -ls)."
+"sein muss, um akzeptiert zu werden. <br>Beachten Sie außerdem, dass manche "
+"Programme, die Terminalemulatoren verwenden, nicht korrekt funktionieren, "
+"wenn Sie Befehlszeilenargumente übergeben (wie z. B. konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr ""
diff --git a/tde-i18n-el/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-el/messages/tdebase/kcmcomponentchooser.po
index c9ef2d5477f..600805cfa46 100644
--- a/tde-i18n-el/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-el/messages/tdebase/kcmcomponentchooser.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-09 16:29+0200\n"
 "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -19,13 +19,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"
@@ -50,8 +50,8 @@ msgstr "Άγνωστο"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Αλλάξατε το προκαθορισμένο συστατικό της επιλογής σας, θέλετε να "
 "αποθηκεύσετε αυτή την αλλαγή τώρα;</qt>"
@@ -62,11 +62,11 @@ msgstr "Δεν υπάρχει διαθέσιμη περιγραφή"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Επιλέξτε από τη λίστα παρακάτω ποιο συστατικό πρόκειται να χρησιμοποιηθεί, ως "
-"προκαθορισμένο, από την υπηρεσία %1."
+"Επιλέξτε από τη λίστα παρακάτω ποιο συστατικό πρόκειται να χρησιμοποιηθεί, "
+"ως προκαθορισμένο, από την υπηρεσία %1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -80,228 +80,187 @@ msgstr "Επιλογέας συστατικών"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Άνοιγμα <b>http</b> και <b>https</b> URL</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "σε μία εφαρμογή βασισμένο στα περιεχόμενα του URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "στον ακόλουθο περιηγητή:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Προκαθορισμένο συστατικό"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Εδώ μπορείτε να αλλάξετε την εφαρμογή συστατικού. Τα συστατικά είναι εφαρμογές "
-"που πραγματοποιούν βασικές εργασίες, όπως ο προσομοιωτής τερματικού, ο "
-"επεξεργαστής κειμένου και ο πελάτης αλληλογραφίας. Διάφορες εφαρμογές του TDE "
-"χρειάζεται μερικές φορές να ανοίξουν μία κονσόλα, να στείλουν ένα email ή να "
-"εμφανίσουν κάποιο κείμενο."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"Εδώ μπορείτε να αλλάξετε την εφαρμογή συστατικού. Τα συστατικά είναι "
+"εφαρμογές που πραγματοποιούν βασικές εργασίες, όπως ο προσομοιωτής "
+"τερματικού, ο επεξεργαστής κειμένου και ο πελάτης αλληλογραφίας. Διάφορες "
+"εφαρμογές του TDE χρειάζεται μερικές φορές να ανοίξουν μία κονσόλα, να "
+"στείλουν ένα email ή να εμφανίσουν κάποιο κείμενο."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Περιγραφή συστατικού"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Εδώ μπορείτε να διαβάσετε μία μικρή περιγραφή του επιλεγμένου συστατικού. Για "
-"να αλλάξετε το επιλεγμένο συστατικό, κάντε κλικ στη λίστα στα αριστερά. Για να "
-"αλλάξετε την εφαρμογή συστατικού, παρακαλώ επιλέξτε την παρακάτω."
+"Εδώ μπορείτε να διαβάσετε μία μικρή περιγραφή του επιλεγμένου συστατικού. "
+"Για να αλλάξετε το επιλεγμένο συστατικό, κάντε κλικ στη λίστα στα αριστερά. "
+"Για να αλλάξετε την εφαρμογή συστατικού, παρακαλώ επιλέξτε την παρακάτω."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>Η λίστα αυτή εμφανίζει τους τύπους συστατικών που μπορούν να ρυθμιστούν. "
 "Κάντε κλικ στο συστατικό που επιθυμείτε να ρυθμίσετε.</p>\n"
-"<p>Στο διάλογο αυτό μπορείτε να αλλάξετε τα προεπιλεγμένα συστατικά του TDE. Τα "
-"συστατικά είναι προγράμματα που χειρίζονται βασικές εργασίες, όπως το "
+"<p>Στο διάλογο αυτό μπορείτε να αλλάξετε τα προεπιλεγμένα συστατικά του TDE. "
+"Τα συστατικά είναι προγράμματα που χειρίζονται βασικές εργασίες, όπως το "
 "τερματικό, τον επεξεργαστή κειμένου και τον πελάτη αλληλογραφίας. Διάφορες "
 "εφαρμογές TDE πολλές φορές καλούν ένα τερματικό, στέλνουν email ή εμφανίζουν "
-"κάποιο κείμενο. Για να λειτουργεί αυτό σωστά, αυτές οι εφαρμογές καλούν πάντα "
-"τα ίδια συστατικά. Εδώ μπορείτε να επιλέξετε ποιά προγράμματα αντιστοιχούν σε "
-"κάθε συστατικό.</p>\n"
+"κάποιο κείμενο. Για να λειτουργεί αυτό σωστά, αυτές οι εφαρμογές καλούν "
+"πάντα τα ίδια συστατικά. Εδώ μπορείτε να επιλέξετε ποιά προγράμματα "
+"αντιστοιχούν σε κάθε συστατικό.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Διεύθυνση παραλήπτη</li> "
-"<li>%s: Θέμα</li> "
-"<li>%c: Αντίγραφο (CC)</li> "
-"<li>%b: Κρυφό αντίγραφο (BCC)</li> "
-"<li>%B: Πρότυπο κείμενο σώματος</li> "
-"<li>%A: Επισύναψη </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Διεύθυνση παραλήπτη</li> <li>%s: Θέμα</li> <li>%c: Αντίγραφο "
+"(CC)</li> <li>%b: Κρυφό αντίγραφο (BCC)</li> <li>%B: Πρότυπο κείμενο "
+"σώματος</li> <li>%A: Επισύναψη </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Πιέστε αυτό το κουμπί για επιλογή του πελάτη αλληλογραφίας. Σημειώστε ότι το "
 "αρχείο που επιλέγεται πρέπει να είναι εκτελέσιμο για να μπορεί να γίνει "
-"αποδεκτό."
-"<br> Μπορείτε επίσης να χρησιμοποιήσετε πολλούς διαφορετικούς αντικαταστάτες οι "
-"οποίοι θα αποδώσουν τις πραγματικές τιμές όταν ο πελάτης αλληλογραφίας κληθεί:"
-"<ul> "
-"<li>%t: Διεύθυνση παραλήπτη</li> "
-"<li>%s: Θέμα</li> "
-"<li>%c: Κοινοποίηση (CC)</li> "
-"<li>%b: Ειδική κοινοποίηση (BCC)</li> "
-"<li>%B: Κυρίως κείμενο</li> "
-"<li>%A: Επισύναψη </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"αποδεκτό.<br> Μπορείτε επίσης να χρησιμοποιήσετε πολλούς διαφορετικούς "
+"αντικαταστάτες οι οποίοι θα αποδώσουν τις πραγματικές τιμές όταν ο πελάτης "
+"αλληλογραφίας κληθεί:<ul> <li>%t: Διεύθυνση παραλήπτη</li> <li>%s: Θέμα</li> "
+"<li>%c: Κοινοποίηση (CC)</li> <li>%b: Ειδική κοινοποίηση (BCC)</li> <li>%B: "
+"Κυρίως κείμενο</li> <li>%A: Επισύναψη </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Κάντε κλικ εδώ για να αναζητήσετε το αρχείο του προγράμματος mail."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Εκτέλεση σε τερματικό"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Ενεργοποιήστε αυτή την επιλογή αν θέλετε ο επιλεγμένος πελάτης email να "
 "εκτελείται σε ένα τερματικό (π.χ. στο <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Χρήση του KMail σαν τον προτιμώμενο πελάτη email"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr ""
 "Το Kmail είναι το τυπικό πρόγραμμα mail για την επιφάνεια εργασίας TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Χρήση ενός διαφορετικού πελάτη &email:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Ενεργοποιήστε αυτή την επιλογή αν θέλετε να χρησιμοποιήσετε κάποιο άλλο "
 "πρόγραμμα mail."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Χρήση μιας διαφορετικής εφαρμογής &τερματικού:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Χρήση του Konsole σαν την προτιμώμενη εφαρμογή τερματικού"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Πιέστε αυτό το κουμπί για επιλογή του πελάτη τερματικού. Σημειώστε ότι το "
 "αρχείο που επιλέγεται πρέπει να είναι εκτελέσιμο για να μπορεί να γίνει "
-"αποδεκτό."
-"<br> Προσοχή επίσης καθώς κάποια προγράμματα που χρησιμοποιούν την Εξομοίωση "
-"Τερματικού δε θα λειτουργήσουν αν προσθέσετε παραμέτρους εκτέλεσης. "
-"(Παράδειγμα: konsole -ls)."
+"αποδεκτό.<br> Προσοχή επίσης καθώς κάποια προγράμματα που χρησιμοποιούν την "
+"Εξομοίωση Τερματικού δε θα λειτουργήσουν αν προσθέσετε παραμέτρους "
+"εκτέλεσης. (Παράδειγμα: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr ""
diff --git a/tde-i18n-en_GB/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-en_GB/messages/tdebase/kcmcomponentchooser.po
index ad18d9df9b8..ba058e005de 100644
--- a/tde-i18n-en_GB/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-en_GB/messages/tdebase/kcmcomponentchooser.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-26 02:02+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\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 "Malcolm Hunter"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -46,11 +46,11 @@ msgstr "Unknown"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -58,11 +58,11 @@ msgstr "No description available"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -76,224 +76,183 @@ msgstr "Component Chooser"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "in an application based on the contents of the URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "in the following browser:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Default Component"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Component Description"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialogue you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Press this button to select your favourite email client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Press this button to select your favourite email client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Click here to browse for the mail program file."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Run in terminal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Use KMail as preferred email client"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail is the standard Mail program for the TDE desktop."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Use a different &email client:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Select this option if you want to use any other mail program."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Use a different &terminal program:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Use Konsole as terminal application"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Press this button to select your favourite terminal client. Please note that "
 "the file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilise Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"accepted.<br> Also note that some programs that utilise Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Click here to browse for terminal program."
diff --git a/tde-i18n-eo/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-eo/messages/tdebase/kcmcomponentchooser.po
index 8b2da0daa8d..e49df5c3b73 100644
--- a/tde-i18n-eo/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-eo/messages/tdebase/kcmcomponentchooser.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-01 09:29+0100\n"
 "Last-Translator: Axel Rousseau <axel584@axel584.org>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\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 "Matthias Peick"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -44,11 +44,11 @@ msgstr "Nekonata"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Vi ŝanĝis la normajn komponanton de via elekto. Ĉu vi nun volas konservi la "
-"ŝanĝon?</qt>"
+"<qt>Vi ŝanĝis la normajn komponanton de via elekto. Ĉu vi nun volas konservi "
+"la ŝanĝon?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -56,8 +56,8 @@ msgstr "Neniu priskribo uzebla"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Elektu el la malsupra listo, kiu komponanto norme estu uzata por servo %1."
 
@@ -73,46 +73,41 @@ msgstr "Komponata elektilo"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "©, 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Malfermu <b>http-</b> kaj <b>https-</b>URLojn</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "en aplikaĵo, kiu bazas sur la URLa enhavo"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "en la sekvonta foliumilo:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Norma komponanto"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Ĉi tie vi povas ŝanĝi la komponantan programon. Komponantoj estas programoj, "
 "kiuj faras bazajn taskojn, kiel terminalo, redaktilo, kaj poŝtilo. Kelkaj "
@@ -120,174 +115,139 @@ msgstr ""
 "tekston. Por fari ĝin ĉiam sammaniere tiuj aplikaĵoj ĉiam lanĉas la samajn "
 "komponantojn. Vi povas elekti ĉi tie, kiuj programoj estas tiuj komponantoj."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Komponanta priskribo"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Ĉi tie vi povas legi malgrandan priskribon de la nun elektita komponanto. Por "
-"ŝanĝi la elektitan komponanton, kliku en la maldekstra listo. Por ŝanĝi la "
-"komponantan programon elektu ĝin malsupre."
+"Ĉi tie vi povas legi malgrandan priskribon de la nun elektita komponanto. "
+"Por ŝanĝi la elektitan komponanton, kliku en la maldekstra listo. Por ŝanĝi "
+"la komponantan programon elektu ĝin malsupre."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>La listo montras la agordeblajn komponantotipojn. Kliku la komponanton "
 "agordotan.</p>\n"
-"<p>En tiu dialogo vi povas ŝanĝi la normajn TDE-komponantojn. Komponantoj estas "
-"programoj, kiuj faras bazajn taskojn, kiel terminalo, redaktilo, kaj poŝtilo. "
-"Kelkaj TDE-aplikaĵoj kelkfoje devas lanĉi konzolon, sendi retleteron aŭ vidigi "
-"tekston. Por fari ĝin ĉiam sammaniere tiuj aplikaĵoj ĉiam lanĉas la samajn "
-"komponantojn. Vi povas elekti ĉi tie, kiuj programoj estas tiuj komponantoj.</p>"
-"\n"
+"<p>En tiu dialogo vi povas ŝanĝi la normajn TDE-komponantojn. Komponantoj "
+"estas programoj, kiuj faras bazajn taskojn, kiel terminalo, redaktilo, kaj "
+"poŝtilo. Kelkaj TDE-aplikaĵoj kelkfoje devas lanĉi konzolon, sendi "
+"retleteron aŭ vidigi tekston. Por fari ĝin ĉiam sammaniere tiuj aplikaĵoj "
+"ĉiam lanĉas la samajn komponantojn. Vi povas elekti ĉi tie, kiuj programoj "
+"estas tiuj komponantoj.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Adresato</li> "
-"<li>%s: Temo</li> "
-"<li>%c: Kopio</li> "
-"<li>%b: Nevidebla kopio</li> "
-"<li>%B: Ŝablona teksto</li> "
-"<li>%A: Kunsendaĵo </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Adresato</li> <li>%s: Temo</li> <li>%c: Kopio</li> <li>%b: "
+"Nevidebla kopio</li> <li>%B: Ŝablona teksto</li> <li>%A: Kunsendaĵo </li> </"
+"ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Premu la butonon por elekti vian preferatan poŝtilon. Notu, ke la dosiero "
-"elektita de vi devas havi lanĉeblan atributon por esti elektebla."
-"<br>Vi ankaŭ povas uzi kelkajn anstataŭaĵojn, kiuj estos anstataŭigataj de la "
-"nuna valoroj, kiam poŝtilo estas lanĉata: "
-"<ul> "
-"<li>%t: Adresato</li> "
-"<li>%s: Temo</li> "
-"<li>%c: Kopio</li> "
-"<li>%b: Nevidebla kopio</li> "
-"<li>%B: Ŝablona teksto</li> "
-"<li>%A: Kunsendaĵo </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"elektita de vi devas havi lanĉeblan atributon por esti elektebla.<br>Vi "
+"ankaŭ povas uzi kelkajn anstataŭaĵojn, kiuj estos anstataŭigataj de la nuna "
+"valoroj, kiam poŝtilo estas lanĉata: <ul> <li>%t: Adresato</li> <li>%s: "
+"Temo</li> <li>%c: Kopio</li> <li>%b: Nevidebla kopio</li> <li>%B: Ŝablona "
+"teksto</li> <li>%A: Kunsendaĵo </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Kliku ĉi tie por serĉi la poŝtilan dosieron."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Lanĉu te&rminale"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Aktivigu la opcion, se vi volas, ke la elektita poŝtilo estos lanĉata terminale "
-"(ekz. <em>Konzolo</em>)."
+"Aktivigu la opcion, se vi volas, ke la elektita poŝtilo estos lanĉata "
+"terminale (ekz. <em>Konzolo</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Uzu Poŝtilo kiel preferatan poŝtilon"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Poŝtilo estas la norma poŝtilo de TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Uzu alian &poŝtilon:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Marku la opcion, se vi volas uzi iun alian poŝtilon."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Uzu alian &terminalprogramon:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Uzu Konzolon kiel terminalaplikaĵon"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Premu la butonon por elekti vian preferatan poŝtilon. Notu, ke la dosiero "
-"elektita de vi devas havi lanĉeblan atributon por esti elektebla."
-"<br>Ankaŭ notu, ke kelkaj programoj, kiuj uzas terminalon, ne laboros, se vi "
-"aldonas komandliniajn argumentojn."
+"elektita de vi devas havi lanĉeblan atributon por esti elektebla.<br>Ankaŭ "
+"notu, ke kelkaj programoj, kiuj uzas terminalon, ne laboros, se vi aldonas "
+"komandliniajn argumentojn."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Kliku ĉi tie por serĉi la terminalan programon."
diff --git a/tde-i18n-es/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-es/messages/tdebase/kcmcomponentchooser.po
index dc607a4406b..face43d33ee 100644
--- a/tde-i18n-es/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-es/messages/tdebase/kcmcomponentchooser.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-24 08:24+0100\n"
 "Last-Translator: Pablo de Vicente <pablo.devicente@gmail.com>\n"
 "Language-Team: Spanish <kde-es@kybs.de>\n"
@@ -21,13 +21,13 @@ msgstr ""
 "First-Translator: Pablo de Vicente <vicente@oan.es>\n"
 "X-Generator: KBabel 1.11\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"
@@ -51,11 +51,11 @@ msgstr "Desconocido"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Usted ha cambiado el componente predefinido de su elección. ¿Desea guardar "
-"ese cambio ahora?</qt>"
+"<qt>Usted ha cambiado el componente predefinido de su elección. ¿Desea "
+"guardar ese cambio ahora?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -63,8 +63,8 @@ msgstr "No hay descripción disponible"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Elija de entre la lista de debajo qué componente se debería utilizar por "
 "omisión para el servicio %1."
@@ -81,86 +81,78 @@ msgstr "Selector de componentes"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Abrir URLs <b>http</b> y <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "en una aplicación basándose en el contenido de la URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "en el siguiente navegador"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Componente predefinido"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Aquí puede cambiar el programa componente. Los componentes son programas que se "
-"ocupan tareas básicas, como el emulador de terminal, el editor de texto y el "
-"cliente de correo electrónico. Las diferentes aplicaciones de TDE necesitan, en "
-"ocasiones, utilizar un emulador de consola, enviar correo electrónico o mostrar "
-"algún texto. Para hacerlo de una forma coherente, estas aplicaciones llaman "
-"siempre a los mismos componentes. Usted puede elegir aquí a qué programas hacen "
-"referencia dichos componentes."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"Aquí puede cambiar el programa componente. Los componentes son programas que "
+"se ocupan tareas básicas, como el emulador de terminal, el editor de texto y "
+"el cliente de correo electrónico. Las diferentes aplicaciones de TDE "
+"necesitan, en ocasiones, utilizar un emulador de consola, enviar correo "
+"electrónico o mostrar algún texto. Para hacerlo de una forma coherente, "
+"estas aplicaciones llaman siempre a los mismos componentes. Usted puede "
+"elegir aquí a qué programas hacen referencia dichos componentes."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Descripción del componente"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Aquí puede leer una pequeña descripción del componente seleccionado "
-"actualmente. Para cambiar el componente seleccionado, pinche en la lista de la "
-"izquierda. Para cambiar el programa componente, selecciónelo más abajo."
+"actualmente. Para cambiar el componente seleccionado, pinche en la lista de "
+"la izquierda. Para cambiar el programa componente, selecciónelo más abajo."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
@@ -168,141 +160,109 @@ msgstr ""
 "componente que desee configurar.</p>\n"
 "<p>En este diálogo puede cambiar los componentes predeterminados de TDE. Los "
 "componentes son programas que se ocupan tareas básicas, como el emulador de "
-"terminal, el editor de texto y el cliente de correo electrónico. Las diferentes "
-"aplicaciones de TDE necesitan, en ocasiones, utilizar un emulador de consola, "
-"enviar correo electrónico o mostrar algún texto. Para hacerlo de una forma "
-"coherente, estas aplicaciones llaman siempre a los mismos componentes. Usted "
-"puede elegir aquí a qué programas hacen referencia dichos componentes.</p>\n"
+"terminal, el editor de texto y el cliente de correo electrónico. Las "
+"diferentes aplicaciones de TDE necesitan, en ocasiones, utilizar un emulador "
+"de consola, enviar correo electrónico o mostrar algún texto. Para hacerlo de "
+"una forma coherente, estas aplicaciones llaman siempre a los mismos "
+"componentes. Usted puede elegir aquí a qué programas hacen referencia dichos "
+"componentes.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Dirección de envio</li> "
-"<li>%s: Asunto</li> "
-"<li>%c: Copia carbón (CC)</li> "
-"<li>%b: Copia carbón oculta (BCC)</li> "
-"<li>%B: Patrón del texto del cuerpo</li> "
-"<li>%A: Adjuntos </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Dirección de envio</li> <li>%s: Asunto</li> <li>%c: Copia "
+"carbón (CC)</li> <li>%b: Copia carbón oculta (BCC)</li> <li>%B: Patrón del "
+"texto del cuerpo</li> <li>%A: Adjuntos </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Pulse este botón para seleccionar su cliente de correo favorito. Por favor "
-"advierta que el archivo que seleccione debe tener atributos de ejecución para "
-"poder ser válido."
-"<br> También puede utilizar diferentes variables que se reemplazarán con los "
-"valores presentes cuando se llame al cliente de correo electrónico:"
-"<ul> "
-"<li>%t: Dirección de envio</li> "
-"<li>%s: Asunto</li> "
-"<li>%c: Copia carbón (CC)</li> "
-"<li>%b: Copia carbón oculta (BCC)</li> "
-"<li>%B: Plantilla del cuerpo del mensaje</li> "
-"<li>%A: Adjuntos </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"advierta que el archivo que seleccione debe tener atributos de ejecución "
+"para poder ser válido.<br> También puede utilizar diferentes variables que "
+"se reemplazarán con los valores presentes cuando se llame al cliente de "
+"correo electrónico:<ul> <li>%t: Dirección de envio</li> <li>%s: Asunto</li> "
+"<li>%c: Copia carbón (CC)</li> <li>%b: Copia carbón oculta (BCC)</li> <li>"
+"%B: Plantilla del cuerpo del mensaje</li> <li>%A: Adjuntos </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Pulse aquí para explorar el archivo de programa de correo."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Ejecutar en te&rminal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Active esta opción si desea que el cliente de correo electrónico seleccionado "
-"se ejecute en un terminal (p. ej. <em>Konsole</em>)."
+"Active esta opción si desea que el cliente de correo electrónico "
+"seleccionado se ejecute en un terminal (p. ej. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Usar KMail como cliente de correo favorito"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail es la aplicación de correo estándar del escritorio TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Usar un cliente de corr&eo diferente:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Seleccione esta opción si desea utilizar cualquier otra aplicación de correo."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Usar un programa de &terminal diferente:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Usar Konsole como aplicación de terminal"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Pulse este botón para seleccionar su cliente de terminal favorito. Por favor, "
-"tenga en cuenta que el archivo que seleccione debe tener la marca de ejecutable "
-"para ser aceptado."
-"<br>Tenga también en cuenta que algunos programas que utilizar el emulador de "
-"terminales no funcionan si se añaden argumentos a la línea de órdenes (por "
-"ejemplo: konsole -ls)."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"Pulse este botón para seleccionar su cliente de terminal favorito. Por "
+"favor, tenga en cuenta que el archivo que seleccione debe tener la marca de "
+"ejecutable para ser aceptado.<br>Tenga también en cuenta que algunos "
+"programas que utilizar el emulador de terminales no funcionan si se añaden "
+"argumentos a la línea de órdenes (por ejemplo: konsole -ls)."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Pulse aquí para explorar en busca de un programa de terminal."
diff --git a/tde-i18n-et/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-et/messages/tdebase/kcmcomponentchooser.po
index 7e10062e4d3..437de05d666 100644
--- a/tde-i18n-et/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-et/messages/tdebase/kcmcomponentchooser.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-21 13:05+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Hasso Tepper"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -46,8 +46,8 @@ msgstr "Tundmatu"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Sa oled muutnud vaikekomponendi valikut. Kas soovid selle muudatuse kohe "
 "salvestada?</qt>"
@@ -58,8 +58,8 @@ msgstr "Kirjeldus puudub"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Vali allolevast nimekirjast rakendus, mida soovid vaikimisi kasutada \"%1\" "
 "teenuse puhul."
@@ -76,225 +76,185 @@ msgstr "Komponendi valija"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c) 2002: Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt><b>Http</b> ja <b>https</b> URL-id avatakse</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "rakendusega vastavalt URL-i sisule"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "järgmises lehitsejas:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Vaikekomponent"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Siin saab muuta komponentide rakendusi. Komponentide all mõistetakse siin kõige "
-"põhilisemate ülesannete jaoks kasutatavaid rakendusi, näiteks "
+"Siin saab muuta komponentide rakendusi. Komponentide all mõistetakse siin "
+"kõige põhilisemate ülesannete jaoks kasutatavaid rakendusi, näiteks "
 "terminaliemulaator, tekstiredaktor ja e-posti klient. Mitmed TDE rakendused "
-"tunnevad aeg-ajalt (vastavalt sinu tahtele) pöördumatut vajadust kutsuda välja "
-"terminaliemulaator, saata e-kiri või näidata mingit teksti. Et seda korralikult "
-"ja võimalikult ühtmoodi teha, kutsutakse välja alati üks ja sama komponent. "
-"Siin saabki need valida."
+"tunnevad aeg-ajalt (vastavalt sinu tahtele) pöördumatut vajadust kutsuda "
+"välja terminaliemulaator, saata e-kiri või näidata mingit teksti. Et seda "
+"korralikult ja võimalikult ühtmoodi teha, kutsutakse välja alati üks ja sama "
+"komponent. Siin saabki need valida."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Komponendi kirjeldus"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Siin saab lugeda parajasti valitud komponendi lühikirjeldust. Valitud "
 "komponendi muutmiseks klõpsa vasakul asuvas nimekirjas. Komponendi rakenduse "
 "muutmiseks vali see allpool."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>See nimekiri näitab seadistatavaid komponenditüüpe. Klõpsa komponendil, mida "
-"soovid seadistada.</p>\n"
+"<p>See nimekiri näitab seadistatavaid komponenditüüpe. Klõpsa komponendil, "
+"mida soovid seadistada.</p>\n"
 "<p>Selles dialoogis saab muuta TDE vaikekomponente. Komponentide all "
 "mõistetakse siin kõige põhilisemate ülesannete jaoks kasutatavaid rakendusi, "
 "näiteks terminaliemulaator, tekstiredaktor ja e-posti klient. Mitmed TDE "
 "rakendused tunnevad aeg-ajalt (vastavalt sinu tahtele) pöördumatut vajadust "
 "kutsuda välja terminaliemulaator, saata e-kiri või näidata mingit teksti. Et "
 "seda korralikult ja võimalikult ühtmoodi teha, kutsutakse välja alati üks ja "
-"sama komponent. Siin saabki valida, milline rakendus millise komponendi korral "
-"välja kutsutakse.</p>\n"
+"sama komponent. Siin saabki valida, milline rakendus millise komponendi "
+"korral välja kutsutakse.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Saaja aadress</li> "
-"<li>%s: Subjekt</li> "
-"<li>%c: Koopia (CC)</li> "
-"<li>%b: Pimekoopia (BCC)</li> "
-"<li>%B: Malli tekst</li> "
-"<li>%A: Kaasatud fail </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Saaja aadress</li> <li>%s: Subjekt</li> <li>%c: Koopia (CC)</"
+"li> <li>%b: Pimekoopia (BCC)</li> <li>%B: Malli tekst</li> <li>%A: Kaasatud "
+"fail </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"E-posti kliendi valimiseks klõpsa sellel nupul. Arvesta, et valitav fail peab "
-"olema käivitatav, et seda aktsepteeritaks."
-"<br> Kasutada võid ka kohatäitjaid, mis asendatakse käivitamisel tegelike "
-"väärtustega:"
-"<ul> "
-"<li>%t: Saaja aadress</li> "
-"<li>%s: Subjekt</li> "
-"<li>%c: Koopia (CC)</li> "
-"<li>%b: Pimekoopia (BCC)</li> "
-"<li>%B: Malli tekst</li> "
-"<li>%A: Kaasatud fail </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"E-posti kliendi valimiseks klõpsa sellel nupul. Arvesta, et valitav fail "
+"peab olema käivitatav, et seda aktsepteeritaks.<br> Kasutada võid ka "
+"kohatäitjaid, mis asendatakse käivitamisel tegelike väärtustega:<ul> <li>%t: "
+"Saaja aadress</li> <li>%s: Subjekt</li> <li>%c: Koopia (CC)</li> <li>%b: "
+"Pimekoopia (BCC)</li> <li>%B: Malli tekst</li> <li>%A: Kaasatud fail </li> </"
+"ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Klõpsa siin e-posti rakenduse faili leidmiseks."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Käivitakse te&rminalil"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Aktiveeri see, kui soovid, et e-posti klient käivitataks terminalil (nt. <em>"
-"Konsool</em>)."
+"Aktiveeri see, kui soovid, et e-posti klient käivitataks terminalil (nt. "
+"<em>Konsool</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "E-posti kliendina kas&utatakse KMail'i"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail on TDE töölaua tavapärane e-posti rakendus."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Kasutatakse muud &e-posti klienti:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Vali see, kui soovid kasutada mingit muud e-posti rakendust."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Kasutatakse muud &terminalirakendust:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Terminalirakendusena kas&utatakse Konsooli"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Klõpsa sellele nupule eelistatud terminalikliendi valimiseks. Pane tähele, et "
-"valitav fail peab olema käivitatav fail, muidu seda ei valita."
-"<br> Arvesta ka seda, et mõned terminaliemulaatorit kasutavad programmid ei "
+"Klõpsa sellele nupule eelistatud terminalikliendi valimiseks. Pane tähele, "
+"et valitav fail peab olema käivitatav fail, muidu seda ei valita.<br> "
+"Arvesta ka seda, et mõned terminaliemulaatorit kasutavad programmid ei "
 "pruugi enam töötada, kui lisad käsurea argumente (nt. konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Klõpsa siin terminalirakenduse faili leidmiseks."
diff --git a/tde-i18n-eu/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-eu/messages/tdebase/kcmcomponentchooser.po
index 0313d053aa6..02482d39db9 100644
--- a/tde-i18n-eu/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-eu/messages/tdebase/kcmcomponentchooser.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-18 19:58+0100\n"
 "Last-Translator: marcos <marcos@euskalgnu.org>\n"
 "Language-Team: basque <itzulpena@euskalgnu.org>\n"
@@ -20,13 +20,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 "Alfredo Beaumont, Marcos Goienetxe, Juan Irigoien"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,11 +51,11 @@ msgstr "Ezezaguna"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Zure aukeraren osagai lehenetsia aldatu duzu. Aldaketa hori gorde nahi duzu "
-"orain?<qt>"
+"<qt>Zure aukeraren osagai lehenetsia aldatu duzu. Aldaketa hori gorde nahi "
+"duzu orain?<qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -63,8 +63,8 @@ msgstr "Ez dago deskribapen eskuragarririk"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Aukeratu azpiko zerrendatik %1 zerbitzurako lehentsi gisa erabili beharreko "
 "osagaia."
@@ -81,225 +81,185 @@ msgstr "Osagai aukeratzailea"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Ireki <b>http</b> eta <b>https</b> URLak</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "URLaren edukinetan oinarritutako aplikazio batean"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "honako arakatzailean:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Osagai lehenetsia"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Hemen programa osagaia alda dezakezu. Osagaiak oinarrizko atazak kudeatzen "
 "dituzten programak dira: terminaleko emuladorea, testu editorea eta posta "
-"elektroniko bezeroa, kasurako. Zenbait TDEren aplikaziok, batzuetan, kontsolako "
-"emuladoreari dei egin behar diote, mezua bidali behar dute, edo testuren bat "
-"erakutsi. Hori modu trinkoan egiteko aplikazio hauek beti deitzen diete osagai "
-"berberei. Hemen osagai horiek zein izango diren hautatzeko aukera izanen duzu."
+"elektroniko bezeroa, kasurako. Zenbait TDEren aplikaziok, batzuetan, "
+"kontsolako emuladoreari dei egin behar diote, mezua bidali behar dute, edo "
+"testuren bat erakutsi. Hori modu trinkoan egiteko aplikazio hauek beti "
+"deitzen diete osagai berberei. Hemen osagai horiek zein izango diren "
+"hautatzeko aukera izanen duzu."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Osagaiaren azalpena"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Hemen, hautaturik dagoen osagaiari buruzko deskripzio txiki bat irakur "
 "dezakezu. Aukeratutako osagaia aldatzeko, klik egin ezkerreko zerrendan. "
 "Programa osagaia aldatzeko, hauta ezazu behean."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Zerrenda honek konfiguragarriak diren osagai motak erakusten ditu. Klik egin "
-"konfiguratu nahi duzun  osagaian.</p>\n"
-"<p>Elkarrizketa honen bidez TDEren osagai lehenetsiak alda ditzakezu. Osagaiak "
-"oinarrizko atazak kudeatzen dituzten programak dira: terminaleko emuladorea, "
-"testu editorea eta posta elektroniko bezeroa, kasurako. Zenbait TDEren "
-"aplikaziok, batzuetan, kontsolako emuladoreari dei egin behar diote, mezua "
-"bidali behar dute, edo testuren bat erakutsi. Hori modu trinkoan egiteko "
-"aplikazio hauek beti deitzen diete osagai berberei. Hemen osagai horiek zein "
-"izango diren hautatzeko aukera izanen duzu.</p> </qt>"
-
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+"<p>Zerrenda honek konfiguragarriak diren osagai motak erakusten ditu. Klik "
+"egin konfiguratu nahi duzun  osagaian.</p>\n"
+"<p>Elkarrizketa honen bidez TDEren osagai lehenetsiak alda ditzakezu. "
+"Osagaiak oinarrizko atazak kudeatzen dituzten programak dira: terminaleko "
+"emuladorea, testu editorea eta posta elektroniko bezeroa, kasurako. Zenbait "
+"TDEren aplikaziok, batzuetan, kontsolako emuladoreari dei egin behar diote, "
+"mezua bidali behar dute, edo testuren bat erakutsi. Hori modu trinkoan "
+"egiteko aplikazio hauek beti deitzen diete osagai berberei. Hemen osagai "
+"horiek zein izango diren hautatzeko aukera izanen duzu.</p> </qt>"
+
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Hartzailearen helbidea</li> "
-"<li>%s: Gaia</li> "
-"<li>%c Ikatz kopia (CC)</li> "
-"<li>%b Ikatz kopia izkutua (BCC)</li> "
-"<li>%B: Testu eredua</li> "
-"<li>%A: Eranskina </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Hartzailearen helbidea</li> <li>%s: Gaia</li> <li>%c Ikatz "
+"kopia (CC)</li> <li>%b Ikatz kopia izkutua (BCC)</li> <li>%B: Testu eredua</"
+"li> <li>%A: Eranskina </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Sakatu botoi honi zure posta elektroniko bezero hobetsia aukeratzeko. Kontuan "
-"izan hautatzen duzun fitxategiak exekutagarritasun atributua ezarrita izan "
-"behar duela onartua izateko."
-"<br> Posta elektroniko bezeroa deitzerakoan berezko balioez aldatuko diren "
-"zenbait leku-marka ere erabili dezakezu:"
-"<ul> "
-"<li>%t: Hartzailearen helbidea</li> "
-"<li>%s: Gaia</li> "
-"<li>%c: Ikatz kopia (CC)</li> "
-"<li>%b Ikatz kopia izkutua (BCC)</li> "
-"<li>%B: Testu eredua</li> "
-"<li>%A: Eranskina </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Sakatu botoi honi zure posta elektroniko bezero hobetsia aukeratzeko. "
+"Kontuan izan hautatzen duzun fitxategiak exekutagarritasun atributua "
+"ezarrita izan behar duela onartua izateko.<br> Posta elektroniko bezeroa "
+"deitzerakoan berezko balioez aldatuko diren zenbait leku-marka ere erabili "
+"dezakezu:<ul> <li>%t: Hartzailearen helbidea</li> <li>%s: Gaia</li> <li>%c: "
+"Ikatz kopia (CC)</li> <li>%b Ikatz kopia izkutua (BCC)</li> <li>%B: Testu "
+"eredua</li> <li>%A: Eranskina </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Klik egin hemen posta programaren fitxategia arakatzeko."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Abiarazi terminalean"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Aktibatu aukera hau hautatutako posta elektroniko bezeroa terminal batean "
 "(adib. <em>Konsole</em>n) exekutatua izatea nahi izanez gero."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "Erabili &KMail posta elekroniko bezero hobetsi gisa"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail TDE mahaigainaren posta bezero lehenetsia da."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Erabili beste &posta elekroniko bezero bat:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Hautatu aukera hau beste posta programa bat erabili nahi izanez gero."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Erabili beste &terminal programa bat:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Erabili k&onsole terminal programa gisa"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Sakatu botoi honi zure terminal-berezo hobetsia hautatzeko. Ohar zaitez "
 "hautatzen duzun fitxategiak exekutagarritasun atributua ezarrita izan behar "
-"duela onartua izan dadin. "
-"<br> Gainera, izan ezazu kontuan terminaleko emuladorea darabilten programa "
-"batzuk ez direla ibiliko komando lerroko argumentuak badarabiltzazu (adibidez: "
-"konsole -ls)."
+"duela onartua izan dadin. <br> Gainera, izan ezazu kontuan terminaleko "
+"emuladorea darabilten programa batzuk ez direla ibiliko komando lerroko "
+"argumentuak badarabiltzazu (adibidez: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Klik egin hemen terminal bat bilatzeko."
diff --git a/tde-i18n-fa/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-fa/messages/tdebase/kcmcomponentchooser.po
index de9a9bca32d..a7f0890c2dd 100644
--- a/tde-i18n-fa/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-fa/messages/tdebase/kcmcomponentchooser.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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 15:37+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"
@@ -47,8 +47,8 @@ msgstr "ناشناخته"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>شما مؤلفۀ پیش‌فرض انتخاب خود را تغییر دادید، الان می‌خواهید آن تغییر را "
 "ذخیره کنید؟</qt>"
@@ -59,8 +59,8 @@ msgstr "توصیفی وجود ندارد"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "مؤلفه‌ای را که باید به طور پیش‌فرض برای خدمت %1 استفاده شود را از این فهرست "
 "انتخاب کنید."
@@ -77,46 +77,41 @@ msgstr "انتخاب‌کنندۀ مؤلفه"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr ""
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>باز کردن نشانیهای وب <b>http</b> و <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "در یک کاربرد بر اساس محتوای نشانی وب"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "در مرورگر زیر:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "مؤلفۀ پیش‌فرض"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "در اینجا می‌توانید برنامۀ مؤلفه را تغییر دهید. مؤلفه‌ها برنامه‌هایی هستند که "
 "تکالیف پایه‌ای مانند مقلد پایانه، ویرایشگر متن و کارخواه رایانامه را اداره "
@@ -125,37 +120,34 @@ msgstr ""
 "را فراخوانی می‌کنند. می‌توانید برنامه‌های مربوط به این مؤلفه‌ها را در اینجا "
 "انتخاب کنید."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "توصیف مؤلفه"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "در اینجا می‌توانید شرح مختصری از مؤلفۀ انتخاب‌شدۀ جاری را بخوانید. برای تغییر "
 "این مؤلفۀ برگزیده، بر روی فهرست سمت چپ فشار دهید. برای تغییر برنامۀ مؤلفه، "
 "لطفاً، آن را در زیر انتخاب کنید."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
@@ -164,139 +156,106 @@ msgstr ""
 "<p>در این محاوره می‌توانید مؤلفه‌های پیش‌فرض TDE را تغییر دهید. مؤلفه‌ها "
 "برنامه‌هایی هستند که تکالیف پایه‌ای مانند مقلد پایانه، ویرایشگر متن و کارخواه "
 "رایانامه را می‌گردانند. گاهی کاربردهای مختلف TDE نیاز به درخواست مقلد پیشانه، "
-"ارسال یک نامه یا نمایش متن دارند. برای سازگاری، این کاربردها همیشه مؤلفۀ یکسانی "
-"را فراخوانی می‌کنند. در اینجا می‌توانید برنامه‌های مربوط به این مؤلفه‌ها را "
-"انتخاب نمایید.</p>\n"
+"ارسال یک نامه یا نمایش متن دارند. برای سازگاری، این کاربردها همیشه مؤلفۀ "
+"یکسانی را فراخوانی می‌کنند. در اینجا می‌توانید برنامه‌های مربوط به این مؤلفه‌ها "
+"را انتخاب نمایید.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t:نشانی گیرنده </li> "
-"<li>%s:موضوع </li> "
-"<li>%c: رونوشت )ر.ن(</li> "
-"<li>%b: رونوشت محرمانه )ر.ن.م(</li> "
-"<li>%B: متن بدنۀ قالب</li> "
-"<li>%A:پیوست</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t:نشانی گیرنده </li> <li>%s:موضوع </li> <li>%c: رونوشت )ر.ن(</li> "
+"<li>%b: رونوشت محرمانه )ر.ن.م(</li> <li>%B: متن بدنۀ قالب</li> <li>%A:پیوست</"
+"li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"برای انتخاب کارخواه رایانامۀ مورد علاقۀ خود، این دکمه را فشار دهید. لطفاً، توجه "
-"کنید که پرونده‌ای که انتخاب می‌کنید، باید دارای مجموعه صفات قابل اجرا باشد تا "
-"پذیرفته شود."
-"<br> همچنین، می‌توانید از چندین جاگیرنده که هنگام فراخوانی کارخواه رایانامه با "
-"مقادیر واقعی جایگزین می‌شوند، استفاده کنید:"
-"<ul> "
-"<li>%t:نشانی گیرنده </li> "
-"<li>%s:موضوع </li> "
-"<li>%c: رونوشت )ر.ن(</li> "
-"<li>%b: رونوشت پنهان )ر.ن.م(</li> "
-"<li>%B:متن بدنۀ قالب</li> "
-"<li>%A: پیوست </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"برای انتخاب کارخواه رایانامۀ مورد علاقۀ خود، این دکمه را فشار دهید. لطفاً، "
+"توجه کنید که پرونده‌ای که انتخاب می‌کنید، باید دارای مجموعه صفات قابل اجرا "
+"باشد تا پذیرفته شود.<br> همچنین، می‌توانید از چندین جاگیرنده که هنگام "
+"فراخوانی کارخواه رایانامه با مقادیر واقعی جایگزین می‌شوند، استفاده کنید:<ul> "
+"<li>%t:نشانی گیرنده </li> <li>%s:موضوع </li> <li>%c: رونوشت )ر.ن(</li> <li>"
+"%b: رونوشت پنهان )ر.ن.م(</li> <li>%B:متن بدنۀ قالب</li> <li>%A: پیوست </li> "
+"</ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "برای مرور پروندۀ برنامۀ نامه، اینجا را فشار دهید."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&اجرا در پایانه‌"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "اگر می‌خواهید کارخواه رایانامۀ برگزیده در پایانه اجرا شود، این گزینه را فعال "
 "کنید ) برای مثال <em>Konsole</em>(."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&استفاده از KMail به عنوان کارخواه رایانامۀ ارجح‌"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail برنامۀ استاندارد نامه برای رومیزی TDE می‌باشد."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "استفاده از کارخواه &رایانامۀ متفاوت:‌"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "اگر می‌خواهید از هر برنامۀ نامۀ دیگری استفاده کنید، این گزینه را برگزینید."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "استفاده از برنامۀ &پایانۀ متفاوت:‌"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&استفاده از Konsole به عنوان کاربرد پایانه‌"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "برای برگزیدن کارخواه پایانۀ مورد نظر خود این دکمه را فشار دهید. لطفاً، توجه "
 "کنید پرونده‌ای که انتخاب می‌کنید، باید دارای مجموعه صفات قابل اجرا باشد تا "
-"پذیرفته شود."
-"<br> همچنین توجه داشته باشید که برخی برنامه‌ها که از مقلد پایانه استفاده "
-"می‌کنند، اگر نشانوندهای خط فرمان را اضافه کنید کار نخواهند کرد )مثلاً:  konsole "
-"-ls(."
+"پذیرفته شود.<br> همچنین توجه داشته باشید که برخی برنامه‌ها که از مقلد پایانه "
+"استفاده می‌کنند، اگر نشانوندهای خط فرمان را اضافه کنید کار نخواهند "
+"کرد )مثلاً:  konsole -ls(."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "برای مرور برنامۀ پایانه اینجا را فشار دهید."
diff --git a/tde-i18n-fi/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-fi/messages/tdebase/kcmcomponentchooser.po
index 77960f6bb9c..b2aa09a41c7 100644
--- a/tde-i18n-fi/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-fi/messages/tdebase/kcmcomponentchooser.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-16 21:54+0200\n"
 "Last-Translator: Kim Enkovaara <kim.enkovaara@iki.fi>\n"
 "Language-Team: Finnish <kde-i18n-fi-discussion@lists.sourceforge.net>\n"
@@ -20,13 +20,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 "Tapio Kautto,Teemu Rytilahti, Ilpo Kantonen"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -50,8 +50,8 @@ msgstr "Tuntematon"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Vaihdoit oletuksena käyttämääsi ohjelmakomponenttia. Haluatko tallentaa "
 "muutokset?</qt>"
@@ -62,8 +62,8 @@ msgstr "Kuvausta ei ole saatavilla"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr "Valitse alla olevasta luettelosta oletuskomponentti palvelulle %1."
 
 #: kcm_componentchooser.cpp:34
@@ -78,46 +78,41 @@ msgstr "Komponenttivalitsin"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Avaa <b>http-</b> ja <b>https-</b> osoitteet</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "osoitteen sisällön mukaan valitulla sovelluksella"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "seuraavalla selainohjelmalla:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Oletuskomponentti"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Tästä voit vaihtaa komponenttiohjelmia. Komponentit ovat ohjelmia, jotka "
 "hoitavat perusasioita kuten pääte-emulaattori, tekstieditori sekä "
@@ -126,36 +121,34 @@ msgstr ""
 "koko TDE:ssä, nämä ohjelmat käyttävät aina samoja komponentteja. Tästä voit "
 "valita mitä ohjelmia nämä komponentit ovat."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Komponentin kuvaus"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Tässä näet lyhyen kuvauksen valitusta komponentista. Voit vaihtaa komponenttia "
-"vasemmalta. Vaihtaaksesi ohjelmaa valitse haluamasi ohjelma alapuolelta."
+"Tässä näet lyhyen kuvauksen valitusta komponentista. Voit vaihtaa "
+"komponenttia vasemmalta. Vaihtaaksesi ohjelmaa valitse haluamasi ohjelma "
+"alapuolelta."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
@@ -163,138 +156,107 @@ msgstr ""
 "komponenttia jota haluat muokata.</p>\n"
 "<p>Tässä moduulissa voit vaihtaa TDE:n oletuskomponentteja. Komponentit ovat "
 "ohjelmia, jotka hoitavat perusasioita kuten pääte-emulaattori, tekstieditori "
-"sekä sähköpostiohjelma. Eri TDE-ohjelmien pitää joskus avata pääte-emulaattori, "
-"lähettää sähköpostia tai näyttää jotain tekstiä. Tehdäkseen sen yhtenäisesti "
-"koko TDE:ssä, nämä ohjelmat käyttävät aina samoja komponentteja. Tästä voit "
-"valita mitä ohjelmia nämä komponentit ovat.</p>\n"
+"sekä sähköpostiohjelma. Eri TDE-ohjelmien pitää joskus avata pääte-"
+"emulaattori, lähettää sähköpostia tai näyttää jotain tekstiä. Tehdäkseen sen "
+"yhtenäisesti koko TDE:ssä, nämä ohjelmat käyttävät aina samoja "
+"komponentteja. Tästä voit valita mitä ohjelmia nämä komponentit ovat.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Vastaanottajan osoite</li> "
-"<li>%s: Aihe</li> "
-"<li>%c: Kopio (CC)</li> </li> "
-"<li>%b: Piilokopio (BCC)</li> "
-"<li>%B: Viestin pohja</li> "
-"<li>%A: Liite </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Vastaanottajan osoite</li> <li>%s: Aihe</li> <li>%c: Kopio "
+"(CC)</li> </li> <li>%b: Piilokopio (BCC)</li> <li>%B: Viestin pohja</li> <li>"
+"%A: Liite </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Napsauta tätä painiketta valitaksesi haluamasi sähköpostiohjelman. Huomaa, että "
-"valitsemasi tiedoston täytyy olla sähköpostiohjelman suoritustiedosto."
-"<br> Voit myös määritellä muutamia uuden viestin lähettämistä varten seuraavien "
-"koodien avulla.Seuraavat muuttujat korvataan vastaavilla arvoilla, kun "
-"sähköpostiohjelmaa käynnistetään: "
-"<ul> "
-"<li>%t: Vastaanottajien osoitteet</li>"
-"<li>%s: Otsikko</li> "
-"<li>%c: Kopio (CC)</li> </li> "
-"<li>%b: Piilokopio (BCC)</li> "
-"<li>%B: Viestin pohja</li> "
-"<li>%A: Liite </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Napsauta tätä painiketta valitaksesi haluamasi sähköpostiohjelman. Huomaa, "
+"että valitsemasi tiedoston täytyy olla sähköpostiohjelman suoritustiedosto."
+"<br> Voit myös määritellä muutamia uuden viestin lähettämistä varten "
+"seuraavien koodien avulla.Seuraavat muuttujat korvataan vastaavilla "
+"arvoilla, kun sähköpostiohjelmaa käynnistetään: <ul> <li>%t: Vastaanottajien "
+"osoitteet</li><li>%s: Otsikko</li> <li>%c: Kopio (CC)</li> </li> <li>%b: "
+"Piilokopio (BCC)</li> <li>%B: Viestin pohja</li> <li>%A: Liite </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Napsauta tästä valitaksesi sähköpostiohjelman."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Käynnistä pääteikkunassa"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Valitse tämä kohta, jos haluat että käyttämäsi sähköpostiohjelma käynnistetään "
-"pääteikkunassa (esim. <em>Konsolessa</em>)."
+"Valitse tämä kohta, jos haluat että käyttämäsi sähköpostiohjelma "
+"käynnistetään pääteikkunassa (esim. <em>Konsolessa</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Käytä KMailia sähköpostiohjelmana"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail on TDE-työpöytäympäristön oletussähköpostiohjelma."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Käytä jotain &toista sähköpostiohjelmaa:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
-"Valitse tämä asetus, jos haluat käyttää mitä tahansa muuta sähköpostiohjelmaa."
+"Valitse tämä asetus, jos haluat käyttää mitä tahansa muuta "
+"sähköpostiohjelmaa."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Käytä jotain toista &pääteikkunaohjelmaa:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Käytä Konsolea pääteikkunaohjelmana"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Napsauta tätä painiketta, jos haluat valita pääteohjelmasi. Huomaa, että "
-"valitsemasi tiedoston täytyy olla suoritustiedosto. "
-"<br> Huomaa myös, etteivät kaikki pääte-emulaattorit toimi, jos lisäät "
-"komentoriviparametreja (esim: konsole -ls)."
+"valitsemasi tiedoston täytyy olla suoritustiedosto. <br> Huomaa myös, "
+"etteivät kaikki pääte-emulaattorit toimi, jos lisäät komentoriviparametreja "
+"(esim: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Napsauta tästä valitaksesi pääteohjelman."
diff --git a/tde-i18n-fr/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-fr/messages/tdebase/kcmcomponentchooser.po
index 6e63995b17a..6e479aa1737 100644
--- a/tde-i18n-fr/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-fr/messages/tdebase/kcmcomponentchooser.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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 22:31+0200\n"
 "Last-Translator: Pierre Buard <pierre.buard@gmail.com>\n"
 "Language-Team: Français <kde-francophone@kde.org>\n"
@@ -23,13 +23,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érard Delafond,Charles de Miramon,Nicolas Ternisien"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -54,8 +54,8 @@ msgstr "Inconnu"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Vous avez modifié le composant par défaut de votre choix. Voulez-vous "
 "enregistrer les changements maintenant ?</qt>"
@@ -66,11 +66,11 @@ msgstr "Pas de description disponible"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Choisissez dans la liste ci-dessous quel composant doit être utilisé par défaut "
-"pour le service « %1 »."
+"Choisissez dans la liste ci-dessous quel composant doit être utilisé par "
+"défaut pour le service « %1 »."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -84,229 +84,188 @@ msgstr "Sélecteur de composants"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Ouvrir les adresses <b>http</b> et <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "dans une application en fonction du contenu de l'URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "dans le navigateur suivant :"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Composant par défaut"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Vous pouvez choisir ici un programme pour chaque composant. Un composant est un "
-"programme dédié à une tâche simple par exemple l'émulateur de terminal, "
-"l'éditeur de texte et le client de courriel. Certaines applications de TDE ont "
-"parfois besoin de lancer l'émulateur de terminal, d'envoyer un courrier "
-"électronique ou d'afficher du texte. Pour faire cela de manière uniforme, ces "
-"applications doivent lancer toujours les mêmes composants. Vous pouvez choisir "
-"ici les programmes correspondant à ces composants."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"Vous pouvez choisir ici un programme pour chaque composant. Un composant est "
+"un programme dédié à une tâche simple par exemple l'émulateur de terminal, "
+"l'éditeur de texte et le client de courriel. Certaines applications de TDE "
+"ont parfois besoin de lancer l'émulateur de terminal, d'envoyer un courrier "
+"électronique ou d'afficher du texte. Pour faire cela de manière uniforme, "
+"ces applications doivent lancer toujours les mêmes composants. Vous pouvez "
+"choisir ici les programmes correspondant à ces composants."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Description du composant"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Vous pouvez lire ici une courte description du composant actuellement "
 "sélectionné. Pour changer le composant sélectionné, cliquez sur la liste à "
 "gauche. Pour changer de programme pour le composant, choisissez-le en dessous"
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
-"<qt> "
-"<p> Cette liste montre les types de composants à configurer. Cliquez sur le "
-"composant que vous voulez configurer.</p>\n"
-"<p> Dans cette boîte de dialogue, vous pouvez changer les composants par défaut "
-"de TDE. Un composant est un programme dédié à une tâche simple par exemple "
-"l'émulateur de terminal, l'éditeur de texte et le client de messagerie. "
-"Certaines applications de TDE ont parfois besoin de lancer l'émulateur de "
-"terminal, d'envoyer un courrier électronique ou d'afficher du texte. Pour faire "
-"cela de manière uniforme, ces applications doivent lancer toujours les mêmes "
-"composants. Vous pouvez choisir ici les programmes correspondant à ces "
-"composants.</p>\n"
+"<qt> <p> Cette liste montre les types de composants à configurer. Cliquez "
+"sur le composant que vous voulez configurer.</p>\n"
+"<p> Dans cette boîte de dialogue, vous pouvez changer les composants par "
+"défaut de TDE. Un composant est un programme dédié à une tâche simple par "
+"exemple l'émulateur de terminal, l'éditeur de texte et le client de "
+"messagerie. Certaines applications de TDE ont parfois besoin de lancer "
+"l'émulateur de terminal, d'envoyer un courrier électronique ou d'afficher du "
+"texte. Pour faire cela de manière uniforme, ces applications doivent lancer "
+"toujours les mêmes composants. Vous pouvez choisir ici les programmes "
+"correspondant à ces composants.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t : Adresse du destinataire</li> "
-"<li>%s : Sujet</li> "
-"<li>%c : Copie Carbone (CC)</li> "
-"<li>%b : Copie Carbone cachée (BCC)</li> "
-"<li>%B : Texte du corps du modèle</li> "
-"<li>%A : Pièce jointe </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t : Adresse du destinataire</li> <li>%s : Sujet</li> <li>%c : "
+"Copie Carbone (CC)</li> <li>%b : Copie Carbone cachée (BCC)</li> <li>%B : "
+"Texte du corps du modèle</li> <li>%A : Pièce jointe </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Actionnez ce bouton pour sélectionner votre client de messagerie préféré. "
 "Veuillez noter que le fichier que vous avez sélectionné doit être exécutable "
-"pour être accepté."
-"<br>Vous pouvez aussi utiliser plusieurs mots clés qui seront remplacés par "
-"leurs vraies valeurs lors de l'appel du client de messagerie :"
-"<ul> "
-"<li>%t : Adresse du destinataire</li> "
-"<li>%s : Sujet</li> "
-"<li>%c : Copie Carbone (CC)</li> "
-"<li>%b : Copie Carbone cachée (BCC)</li> "
-"<li>%B : Texte du corps du modèle</li> "
-"<li>%A : Pièce jointe </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"pour être accepté.<br>Vous pouvez aussi utiliser plusieurs mots clés qui "
+"seront remplacés par leurs vraies valeurs lors de l'appel du client de "
+"messagerie :<ul> <li>%t : Adresse du destinataire</li> <li>%s : Sujet</li> "
+"<li>%c : Copie Carbone (CC)</li> <li>%b : Copie Carbone cachée (BCC)</li> "
+"<li>%B : Texte du corps du modèle</li> <li>%A : Pièce jointe </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Cliquez ici pour sélectionner le nom du programme de messagerie."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Lancer dans un terminal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Activez cette option si vous voulez que le client de messagerie soit exécuté "
 "dans un terminal (par exemple <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Utiliser KMail comme client de messagerie préféré"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail est le programme de messagerie par défaut pour le bureau TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Utiliser un au&tre client de messagerie :"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Sélectionnez cette option si vous voulez utiliser un autre programme de "
 "messagerie."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Ut&iliser un autre programme de terminal :"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Utiliser &Konsole comme application de terminal"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Appuyez sur ce bouton pour choisir votre émulateur de terminal préféré. "
 "Veuillez noter que le fichier que vous sélectionnerez doit être exécutable."
-"<br>Sachez aussi que certaines applications utilisant l'émulateur de terminal "
-"peuvent ne pas fonctionner si vous ajoutez des arguments (exemple : « konsole "
-"-ls »)."
+"<br>Sachez aussi que certaines applications utilisant l'émulateur de "
+"terminal peuvent ne pas fonctionner si vous ajoutez des arguments (exemple : "
+"« konsole -ls »)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Cliquez ici pour choisir un émulateur de terminal."
diff --git a/tde-i18n-fy/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-fy/messages/tdebase/kcmcomponentchooser.po
index 2e34f5bf4ac..fd3efc13250 100644
--- a/tde-i18n-fy/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-fy/messages/tdebase/kcmcomponentchooser.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-06-08 14:13+0100\n"
 "Last-Translator: Berend Ytsma <berendy@gmail.com>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Rinse de Vries, Berend Ytsma"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -45,8 +45,8 @@ msgstr "Unbekend"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Jo hawwe in nij standertkomponint útsocht. Wolle jo dy wiziging no  "
 "bewarje?</qt>"
@@ -57,8 +57,8 @@ msgstr "Gjin beskriuwing beskikber"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Kies út de list hjirûnder it komponint dat jo standert brûke wolle foar %1."
 
@@ -74,83 +74,75 @@ msgstr "Komponintenkiezer"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Iepenje <b>http</b>- en <b>https</b>-URL-adressen</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "yn in programma basearre op de ynhâld fan it URL-adres"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "yn dizze blêder:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Standertkomponint"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Hjir kin jo, jo foarkar ynstelle foar wichtige TDE_komponinten. Ferskillende "
-"TDE-tapassingen roppe bytiden in terminalfinster oan, wolle in e-post skriuwe "
-"of wat tekst werjaan. Hjir kinne jo bepale hokker programma's TDE hjirfoar "
-"brûke sil."
+"TDE-tapassingen roppe bytiden in terminalfinster oan, wolle in e-post "
+"skriuwe of wat tekst werjaan. Hjir kinne jo bepale hokker programma's TDE "
+"hjirfoar brûke sil."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Komponint beskriuwing"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Hjir kine jo in lytse beskriuwing lêze fan de selektearre komponint. Om de "
-"selektearre komponint te feroarjen, klik op de lofterlist. Om it programma te "
-"feroarjen, kies dat hjirûnder."
+"selektearre komponint te feroarjen, klik op de lofterlist. Om it programma "
+"te feroarjen, kies dat hjirûnder."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
@@ -158,135 +150,104 @@ msgstr ""
 "ynstelle wolle.</p>\n"
 "<p>Yn dit skerm kin jo jo foarkar ynstelle foar wichtige TDE-komponinten. "
 "Ferskillende TDE-tapassingen roppe bytiden in terminalfinster oan, wolle in "
-"e-post skriuwe of wat tekst werjaan. Hjir kinne jo bepale hokker programma's jo "
-"foar dy tsjinsten brûke wolle.</p>\n"
+"e-post skriuwe of wat tekst werjaan. Hjir kinne jo bepale hokker programma's "
+"jo foar dy tsjinsten brûke wolle.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul>"
-"<li>%t: Adressearre</li> "
-"<li>%s: Underwerp</li> "
-"<li>%c: CC (Karbon Kopy)</li> "
-"<li>%b: BCC (Bline Karbon Kopy)</li> "
-"<li>%B: sjabloantekst</li> "
+"<ul><li>%t: Adressearre</li> <li>%s: Underwerp</li> <li>%c: CC (Karbon "
+"Kopy)</li> <li>%b: BCC (Bline Karbon Kopy)</li> <li>%B: sjabloantekst</li> "
 "<li>%A: taheaksel </li> </ul>"
 
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Druk op dizze knop om jo favorite e-postprogramma te selektearjen. Taljochting: "
-"allinne triemmen mei it skaaimerk 'útfierber' wurde akseptearre."
-"<br>Jo kinne ferskate plakhâlders brûke. Dizzen sille ferfongen wurde troch de "
-"echte wearden as it e-postprogramma oanroppen wurdt: "
-"<ul>"
-"<li>%t: Adressearre</li> "
-"<li>%s: Underwerp</li> "
-"<li>%c: CC (Karbon Kopy)</li> "
-"<li>%b: BCC (Bline Karbon Kopy)</li> "
-"<li>%B: sjabloantekst</li> "
-"<li>%A: taheaksel </li> </ul>"
+"Druk op dizze knop om jo favorite e-postprogramma te selektearjen. "
+"Taljochting: allinne triemmen mei it skaaimerk 'útfierber' wurde akseptearre."
+"<br>Jo kinne ferskate plakhâlders brûke. Dizzen sille ferfongen wurde troch "
+"de echte wearden as it e-postprogramma oanroppen wurdt: <ul><li>%t: "
+"Adressearre</li> <li>%s: Underwerp</li> <li>%c: CC (Karbon Kopy)</li> <li>"
+"%b: BCC (Bline Karbon Kopy)</li> <li>%B: sjabloantekst</li> <li>%A: "
+"taheaksel </li> </ul>"
 
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Klik hjir om nei it e-postprogramma te blêdzjen."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Yn in terminal útfie&re"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Selektearje dizze opsje as jo wolle dat it oantsjutte e-postprogramma útfiert "
-"wurdt yn in terminal (bgl. <em>Konsole</em>)."
+"Selektearje dizze opsje as jo wolle dat it oantsjutte e-postprogramma "
+"útfiert wurdt yn in terminal (bgl. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Brûk KMail as standert e-postprogramma"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail is it standert e-postprogramma foar it TDE-buroblêd"
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Brûk in oar e-postprogramma:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Selektearje dizze opsje as jo in oar e-postprogramma brûke wolle."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Brûk in oar &terminalprogramma:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Konsole as terminalprogramma brûke"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Druk op dizze knop om jo favorite terminalprogramma te selektearjen. Soargje "
 "derfoar dat de triem dy jo selektearje útfierber makke moat wêze. De triem "
-"wurdt oars net akseptearre. "
-"<br>Jou omtinken oan it feit dat der programma's binne hokker terminalemulaasje "
-"brûke net wurkje as jo arguminten meijouwe (bygelyks: konsole -ls)."
+"wurdt oars net akseptearre. <br>Jou omtinken oan it feit dat der programma's "
+"binne hokker terminalemulaasje brûke net wurkje as jo arguminten meijouwe "
+"(bygelyks: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Klik hjir om nei it terminalprogramma te blêdzjen."
diff --git a/tde-i18n-ga/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-ga/messages/tdebase/kcmcomponentchooser.po
index 9b03efbf7ef..4f0ad2d2812 100644
--- a/tde-i18n-ga/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-ga/messages/tdebase/kcmcomponentchooser.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdebase/kcmcomponentchooser.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"
@@ -40,8 +40,8 @@ msgstr "Anaithnid"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 
 #: componentchooser.cpp:412
@@ -50,8 +50,8 @@ msgstr "Níl cur síos ar fáil"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 
 #: kcm_componentchooser.cpp:34
@@ -66,188 +66,153 @@ msgstr "Roghnóir Comhpháirte"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "© 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Oscail URLanna <b>http</b> agus <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "i bhfeidhmchlár de réir an URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "sa bhrabhsálaí seo a leanas:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Comhpháirt Réamhshocraithe"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Cur Síos na Comhpháirte"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Seoladh an fhaighteora</li> "
-"<li>%s: Ábhar</li> "
-"<li>%c: Cóip Charbóin (CC)</li> "
-"<li>%b: Cóip Cheilte (BCC)</li> "
-"<li>%B: Téacs an teimpléid</li> "
-"<li>%A: Iatán </li> </ul>"
+"<ul> <li>%t: Seoladh an fhaighteora</li> <li>%s: Ábhar</li> <li>%c: Cóip "
+"Charbóin (CC)</li> <li>%b: Cóip Cheilte (BCC)</li> <li>%B: Téacs an "
+"teimpléid</li> <li>%A: Iatán </li> </ul>"
 
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Rith i dteirminéal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Úsáid cliant ríomhphoist &eile:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Roghnaigh an rogha seo más mian leat aon chlár eile a úsáid le haghaidh "
 "ríomhphoist."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Úsáid clár &teirminéil eile:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Úsáid Konsole mar fheidhmchlár teirminéil"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr ""
diff --git a/tde-i18n-gl/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-gl/messages/tdebase/kcmcomponentchooser.po
index 6ed9ec8dd74..85a8c28c9ef 100644
--- a/tde-i18n-gl/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-gl/messages/tdebase/kcmcomponentchooser.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-20 20:37+0100\n"
 "Last-Translator: Xabi G. Feal <xabigf@gmx.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -17,13 +17,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 "Xabi García"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -47,8 +47,8 @@ msgstr "Descoñecido"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Cambiou o compoñente por defecto da súa escolla, ¿quere gardar o cambio "
 "agora?</qt>"
@@ -59,8 +59,8 @@ msgstr "Non hai unha descrición dispoñible"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Escolla dende a lista de embaixo qué compoñente se debe empregar por defecto "
 "para o servicio %1."
@@ -77,229 +77,188 @@ msgstr "Escolla de Compoñentes"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Abrir URLs <b>http</b> e <b>https</b> </qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "nunha aplicación baseada nos contidos da URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "no seguinte navegador:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Compoñente por Defecto"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Aquí pode cambia-lo programa compoñente. Os compoñentes son programas que "
-"xestionan tarefas básicas, coma a emulación de terminal, as edicións de textos "
-"e a xestión de correo electrónico. As distintas aplicacións de TDE ás veces "
-"precisan invocar unha terminal, enviar un correo ou amosar algún texto. Para "
-"facer isto con consistencia, estas aplicacións sempre chaman ós mesmos "
-"compoñentes. Pode escoller aquí qué programas funcionarán coma compoñentes "
-"básicos."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"xestionan tarefas básicas, coma a emulación de terminal, as edicións de "
+"textos e a xestión de correo electrónico. As distintas aplicacións de TDE ás "
+"veces precisan invocar unha terminal, enviar un correo ou amosar algún "
+"texto. Para facer isto con consistencia, estas aplicacións sempre chaman ós "
+"mesmos compoñentes. Pode escoller aquí qué programas funcionarán coma "
+"compoñentes básicos."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Descricción do Compoñente"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Aquí pode ler unha pequena descrición do compoñente actualmente escollido. Para "
-"cambiar o compoñente seleccionado, prema na lista da esquerda. Para cambiar o "
-"programa compoñente, por favor, escóllao embaixo."
+"Aquí pode ler unha pequena descrición do compoñente actualmente escollido. "
+"Para cambiar o compoñente seleccionado, prema na lista da esquerda. Para "
+"cambiar o programa compoñente, por favor, escóllao embaixo."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Esta lista amosa os tipos de compoñentes configurables. Prema no compoñente "
-"que queira configurar.</p>\n"
-"<p>Neste diálogo pode cambia-los compoñentes por defecto de TDE.Os compoñentes "
-"son programas que xestionan tarefas básicas, coma a emulación de terminal, as "
-"edicións de textos e a xestión de correo electrónico. As distintas aplicacións "
-"de TDE ás veces precisan invocar unha terminal, enviar un correo ou amosar "
-"algún texto. Para facer isto con consistencia, estas aplicacións sempre chaman "
-"ós mesmos compoñentes. Pode escoller aquí qué programas funcionarán coma "
-"compoñentes básicos.</p>\n"
+"<p>Esta lista amosa os tipos de compoñentes configurables. Prema no "
+"compoñente que queira configurar.</p>\n"
+"<p>Neste diálogo pode cambia-los compoñentes por defecto de TDE.Os "
+"compoñentes son programas que xestionan tarefas básicas, coma a emulación de "
+"terminal, as edicións de textos e a xestión de correo electrónico. As "
+"distintas aplicacións de TDE ás veces precisan invocar unha terminal, enviar "
+"un correo ou amosar algún texto. Para facer isto con consistencia, estas "
+"aplicacións sempre chaman ós mesmos compoñentes. Pode escoller aquí qué "
+"programas funcionarán coma compoñentes básicos.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Enderezo do destinatario </li> "
-"<li>%s: Asunto</li> "
-"<li>%c: CopiaCarbón (CC)</li> "
-"<li>%b: Copia Carbón Blindada (BCC)</li> "
-"<li>%B: Texto do corpo</li> "
-"<li>%A: Adxunto </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Enderezo do destinatario </li> <li>%s: Asunto</li> <li>%c: "
+"CopiaCarbón (CC)</li> <li>%b: Copia Carbón Blindada (BCC)</li> <li>%B: Texto "
+"do corpo</li> <li>%A: Adxunto </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Prema este botón para seleccionar o seu xestor de correo electrónico favorito. "
-"Por favor note que o ficheiro que escolla ten que ter o atributo de executable "
-"de xeito de que se poida aceptar."
-"<br> Pode tamén empregar varios argumentos que se remprazarán cos valores "
-"actuais cando o xestor de correo se chame:"
-"<ul> "
-"<li>%t: Enderezo do destinatario </li> "
-"<li>%s: Asunto</li> "
-"<li>%c: CopiaCarbón (CC)</li> "
-"<li>%b: Copia Carbón Blindada (BCC)</li> "
-"<li>%B: Texto do corpo</li> "
-"<li>%A: Adxunto </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Prema este botón para seleccionar o seu xestor de correo electrónico "
+"favorito. Por favor note que o ficheiro que escolla ten que ter o atributo "
+"de executable de xeito de que se poida aceptar.<br> Pode tamén empregar "
+"varios argumentos que se remprazarán cos valores actuais cando o xestor de "
+"correo se chame:<ul> <li>%t: Enderezo do destinatario </li> <li>%s: Asunto</"
+"li> <li>%c: CopiaCarbón (CC)</li> <li>%b: Copia Carbón Blindada (BCC)</li> "
+"<li>%B: Texto do corpo</li> <li>%A: Adxunto </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr ""
 "Prema aquí para explorar polo ficheiro de programa de correo electrónico."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Exucutar nunha terminal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Active esta opción se quere que se execute o xestor de correo escollido nunha "
-"terminal (p.e. <em>Konsole</em>)."
+"Active esta opción se quere que se execute o xestor de correo escollido "
+"nunha terminal (p.e. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Empregar KMail coma xestor de correo electrónico preferido"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail é o programa estándar para o escritorio de TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Empregar un xestor de correo &electrónico:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Escolla esta opción se quere empregar calquera outro programa de correo."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Empregar un programa de &terminal diferente:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Em&pregar Konsole coma aplicación de terminal"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Prema este botón para seleccionar o seu cliente de terminal favorito. Por "
-"favor, note que o ficheiro que escolla ten que ter atribuído o modo executábel "
-"para poder ser aceptado. "
-"<br> Note tamén que algúns programas que empreguen o emulador de terminal non "
-"funcionarán se non engade argumentos á liña de comandos (Por exemplo: konsole "
-"-ls)."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"favor, note que o ficheiro que escolla ten que ter atribuído o modo "
+"executábel para poder ser aceptado. <br> Note tamén que algúns programas que "
+"empreguen o emulador de terminal non funcionarán se non engade argumentos á "
+"liña de comandos (Por exemplo: konsole -ls)."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Prema aquí para procurar manualmente polo programa de terminal."
diff --git a/tde-i18n-he/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-he/messages/tdebase/kcmcomponentchooser.po
index dd690f07097..38d33396b4c 100644
--- a/tde-i18n-he/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-he/messages/tdebase/kcmcomponentchooser.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-24 19:04+0200\n"
 "Last-Translator: Diego Iastrubni <elcuco@kde.org>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -26,13 +26,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 "דרור לוין"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -56,10 +56,11 @@ msgstr "לא ידוע"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt> שינית את רכיב ברירת המחדל המועדף עליך. האם ברצונך לשמור שינוי זה כעת? </qt>"
+"<qt> שינית את רכיב ברירת המחדל המועדף עליך. האם ברצונך לשמור שינוי זה כעת? </"
+"qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -67,8 +68,8 @@ msgstr "אין תיאור זמין"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr "בחר מתוך הרשימה להלן את הרכיב שישמש כברירת מחדל עבור השירות %1."
 
 #: kcm_componentchooser.cpp:34
@@ -83,82 +84,75 @@ msgstr "בוחר הרכיבים"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>פתח כתובות <b>http</b> i-<b>https</b> </qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "ביישום התלוי בתוכן של הכתובת"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "בדפדפן הבא:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "רכיב ברירת מחדל"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"כאן באפשרותך לשנות את תוכנית הרכיב. רכיבים הם תוכנות שמנהלות מטלות בסיסיות, כמו "
-"מדמה המסוף, עורך הטקסט ולקוח הדוא\"ל. יישומי TDE צריכים לעתים לקרוא למדמה "
-"המסוף, לשלוח דוא\"ל או להציג טקסט. על מנת לעשות זאת באופן עקבי, יישומים אלא "
-"תמיד קוראים לאותו הרכיב. כאן באפשרותך לבחור אילו תוכניות הם רכיבים אלו."
+"כאן באפשרותך לשנות את תוכנית הרכיב. רכיבים הם תוכנות שמנהלות מטלות בסיסיות, "
+"כמו מדמה המסוף, עורך הטקסט ולקוח הדוא\"ל. יישומי TDE צריכים לעתים לקרוא "
+"למדמה המסוף, לשלוח דוא\"ל או להציג טקסט. על מנת לעשות זאת באופן עקבי, "
+"יישומים אלא תמיד קוראים לאותו הרכיב. כאן באפשרותך לבחור אילו תוכניות הם "
+"רכיבים אלו."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "תיאור הרכיב"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"כאן באפשרותך לקרוא תיאור קצר של הרכיב הבחור. על מנת לשנות את הרכיב הבחור, לחץ "
-"על הרשימה מימינך. על מנת לשנות את תוכנית הרכיב, בחר בה למטה."
+"כאן באפשרותך לקרוא תיאור קצר של הרכיב הבחור. על מנת לשנות את הרכיב הבחור, "
+"לחץ על הרשימה מימינך. על מנת לשנות את תוכנית הרכיב, בחר בה למטה."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
@@ -171,130 +165,97 @@ msgstr ""
 "תוכניות הם רכיבים אלו.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: כתובת הנמען</li> "
-"<li>%s: נושא</li> "
-"<li>%c: (CC) עותק</li> "
-"<li>%b: (BCC) עותק סמוי</li> "
-"<li>%B: טקסט גוף ההודעה</li> "
-"<li>%A: קובץ מצורף</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: כתובת הנמען</li> <li>%s: נושא</li> <li>%c: (CC) עותק</li> <li>"
+"%b: (BCC) עותק סמוי</li> <li>%B: טקסט גוף ההודעה</li> <li>%A: קובץ מצורף</"
+"li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "לחץ על כפתור זה כדי לבחור את תוכנית הדוא\"ל המועדפת עליך. שים לב כי על מנת "
-"שהקובץ הנבחר יתקבל, עליו להיות מוגדר עם מאפיין הפעלה."
-"<br> באפשרותך גם להשתמש במספר צירופים אשר יוחלפו על ידי הערכים האמתיים בעת "
-"הפעלת תוכנית הדוא\"ל:"
-"<ul> "
-"<li>%t: כתובת הנמען</li> "
-"<li>%s: נושא</li> "
-"<li>%c: (CC) עותק</li> "
-"<li>%b: (BCC) עותק סמוי</li> "
-"<li>%B: טקסט גוף ההודעה</li> "
-"<li>%A: קובץ מצורף</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"שהקובץ הנבחר יתקבל, עליו להיות מוגדר עם מאפיין הפעלה.<br> באפשרותך גם להשתמש "
+"במספר צירופים אשר יוחלפו על ידי הערכים האמתיים בעת הפעלת תוכנית הדוא\"ל:<ul> "
+"<li>%t: כתובת הנמען</li> <li>%s: נושא</li> <li>%c: (CC) עותק</li> <li>%b: "
+"(BCC) עותק סמוי</li> <li>%B: טקסט גוף ההודעה</li> <li>%A: קובץ מצורף</li> </"
+"ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "לחץ כאן כדי לעיין ולאתר את קובץ תוכנית הדואר."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "הפעל ב&מסוף"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"בחר באפשרות זו אם ברצונך שתוכנית הדואר הנבחרת תופעל במסוף (כמו למשל <em>"
-"Konsole</em>)."
+"בחר באפשרות זו אם ברצונך שתוכנית הדואר הנבחרת תופעל במסוף (כמו למשל "
+"<em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "השתמש ב־KMail כתוכנית ה&דוא\"ל המועדפת"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail היא תוכנית הדואר התקנית לשולחן העבודה TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "השתמש בתוכנית דוא\"&ל אחרת:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "בחר באפשרות זו אם ברצונך להשתמש בתוכנית דואר אחר."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "השתמש בתוכנית מ&סוף אחרת:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "השתמש ב־Konsole כיישום ה&מסוף"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"בחר בכפתור זה בכדי לקבוע את יישום המסוף המועדף עליך. שים לב כי הקובץ שאתה בוחר "
-"חייב להיות בר־הרצה בכדי להתקבל."
-"<br> כמו כן, שים לב שיישומים מסוימים שמשתמשים במסוף המדומה לא יעבוד אם תוסיף "
-"ארגומנטים נוספים (למשל: konsole -ls)."
+"בחר בכפתור זה בכדי לקבוע את יישום המסוף המועדף עליך. שים לב כי הקובץ שאתה "
+"בוחר חייב להיות בר־הרצה בכדי להתקבל.<br> כמו כן, שים לב שיישומים מסוימים "
+"שמשתמשים במסוף המדומה לא יעבוד אם תוסיף ארגומנטים נוספים (למשל: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "לחץ כאן כדי לעיין ולאתר את תוכנית המסוף."
diff --git a/tde-i18n-hi/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-hi/messages/tdebase/kcmcomponentchooser.po
index 04fc060c565..d05c969b22a 100644
--- a/tde-i18n-hi/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-hi/messages/tdebase/kcmcomponentchooser.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-31 13:32+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@gmail.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -15,13 +15,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"
@@ -47,12 +47,11 @@ msgstr "अज्ञात"
 #: componentchooser.cpp:408
 #, fuzzy
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>आपने अपने पसंद के डिफ़ॉल्ट अवयव को बदला है, क्या आप परिवर्तनों को अभी "
-"सहेजना चाहेंगे?<BR><BR><B>नहीं</B>का चुना जाना आपके परिवर्तनों को लागू नहीं "
-"करेगा</qt>"
+"<qt>आपने अपने पसंद के डिफ़ॉल्ट अवयव को बदला है, क्या आप परिवर्तनों को अभी सहेजना चाहेंगे?"
+"<BR><BR><B>नहीं</B>का चुना जाना आपके परिवर्तनों को लागू नहीं करेगा</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -60,11 +59,9 @@ msgstr "कोई वर्णन उपलब्ध नहीं"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
-msgstr ""
-" %1 सेवा के लिए डिफ़ॉल्ट द्वारा उपयोग में आने वाले अवयव को निम्न सूची में से "
-"चुनें."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
+msgstr " %1 सेवा के लिए डिफ़ॉल्ट द्वारा उपयोग में आने वाले अवयव को निम्न सूची में से चुनें."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -78,192 +75,155 @@ msgstr "अवयव चयनक"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 जोसेफ वेननिंगर"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>खोलें <b>एचटीटीपी</b> तथा <b>एचटीटीपीएस</b> यूआरएल्स</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "यूआरएल के अवयवों पर आधारित एक अनुप्रयोग"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "निम्न ब्राउज़र में:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "डिफ़ॉल्ट अवयव"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "अवयव वर्णन"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"यहाँ आप मौज़ूदा में चुने गए अवयव के बारे में छोटा सा वर्णन पढ़ सकते हैं. चुने "
-"गए अवयव को बदलने के लिए, बाएँ दिए सूची पर क्लिक करें. अवयव प्रोग्राम को बदलने "
-"के लिए नीचे दिए में से चुनें."
+"यहाँ आप मौज़ूदा में चुने गए अवयव के बारे में छोटा सा वर्णन पढ़ सकते हैं. चुने गए अवयव को बदलने "
+"के लिए, बाएँ दिए सूची पर क्लिक करें. अवयव प्रोग्राम को बदलने के लिए नीचे दिए में से चुनें."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: पाने वाले का पता</li> "
-"<li>%s: विषय</li> "
-"<li>%c: कार्बन कापी (CC)</li> "
-"<li>%b: ब्लाइंड कार्बन कापी (BCC)</li> "
-"<li>%B: टैम्प्लेट बाडी पाठ</li> "
-"<li>%A: संलग्नक</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: पाने वाले का पता</li> <li>%s: विषय</li> <li>%c: कार्बन कापी (CC)</"
+"li> <li>%b: ब्लाइंड कार्बन कापी (BCC)</li> <li>%B: टैम्प्लेट बाडी पाठ</li> <li>%A: "
+"संलग्नक</li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "डाक प्रोग्राम फ़ाइल को ब्राउज़ करने के लिए यहाँ क्लिक करें."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "टर्मिनल में चलाएँ (&R)"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"इस विकल्प को सक्रिय करें यदि आप चाहते हैं कि चुने गए ई-मेल क्लाएंट टर्मिनल में "
-"चले (जैसे- <em>Konsole</em>)."
+"इस विकल्प को सक्रिय करें यदि आप चाहते हैं कि चुने गए ई-मेल क्लाएंट टर्मिनल में चले (जैसे- "
+"<em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "के-मेल को पसंदीदा डाकिया की तरह इस्तेमाल करें (&U)"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "केडीई डेस्कटॉप के लिए के-मेल एक मानक मेल प्रोग्राम है."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "एक भिन्न डाकिया इस्तेमाल करें: (&e)"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
-msgstr ""
-"यदि आप अन्य मेल प्रोग्राम का उपयोग करना चाहते हैं तो इस विकल्प को चुनें."
+msgstr "यदि आप अन्य मेल प्रोग्राम का उपयोग करना चाहते हैं तो इस विकल्प को चुनें."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "एक भिन्न टर्मिनल अनुप्रयोग इस्तेमाल करें (&t)"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "कंसोल को टर्मिनल अनुप्रयोग की तरह इस्तेमाल करें (&U)"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "टर्मिनल प्रोग्राम को ब्राउज़ करने के लिए यहाँ क्लिक करें."
diff --git a/tde-i18n-hr/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-hr/messages/tdebase/kcmcomponentchooser.po
index 69748b904b5..25273738d57 100644
--- a/tde-i18n-hr/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-hr/messages/tdebase/kcmcomponentchooser.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser 0\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-16 03:51+0100\n"
 "Last-Translator: Renato Pavicic <renato<-at->translator-shop.org>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -12,17 +12,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
 "X-Generator: TransDict server\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"
@@ -46,11 +46,11 @@ msgstr "Nepoznato"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Promijenili ste zadanu komponentu vašeg odabira. Želite li odmah spremiti "
-"izmjene?</qt>"
+"<qt>Promijenili ste zadanu komponentu vašeg odabira. Želite li odmah "
+"spremiti izmjene?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -58,11 +58,11 @@ msgstr "Nema raspoloživog opisa"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"S donjeg popisa odaberite koja će komponenta biti upotrebljavana kao zadana za "
-"uslugu %1."
+"S donjeg popisa odaberite koja će komponenta biti upotrebljavana kao zadana "
+"za uslugu %1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -76,223 +76,184 @@ msgstr "Birač komponenti"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Otvori <b>http</b> i <b>https</b> URL adrese</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "u aplikaciji određenoj sadržajem URL adrese"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "u sljedećem pregledniku:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Zadana komponenta"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Na ovom mjestu možete promijeniti program komponenti. Komponente su programi "
-"poput emulatora terminala, uređivača teksta i klijenta e-pošte, a koji rukuju "
-"osnovnim zadacima. Različite TDE aplikacije ponekad imaju moraju pozvati "
-"emulator terminala, poslati e-poruku ili prikazati neki tekst. Da bi se to "
-"radilo na dosljedan način, sve te aplikacije uvijek pozivaju iste komponente. "
-"Na ovom mjestu možete odabrati koji programi čine te komponente."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"poput emulatora terminala, uređivača teksta i klijenta e-pošte, a koji "
+"rukuju osnovnim zadacima. Različite TDE aplikacije ponekad imaju moraju "
+"pozvati emulator terminala, poslati e-poruku ili prikazati neki tekst. Da bi "
+"se to radilo na dosljedan način, sve te aplikacije uvijek pozivaju iste "
+"komponente. Na ovom mjestu možete odabrati koji programi čine te komponente."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Opis komponente"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Na ovom mjestu možete pročitati kratak opis trenutno odabrane komponente. Za "
-"izmjenu komponente kliknite unutar popisa s lijeve strane. Da biste izmijenili "
-"program komponente, odaberite ga s donjeg popisa."
+"izmjenu komponente kliknite unutar popisa s lijeve strane. Da biste "
+"izmijenili program komponente, odaberite ga s donjeg popisa."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>Ovaj popis prikazuje konfigurabilne vrste komponenti. </p>\n"
-"<p>Na ovom mjestu možete promijeniti program komponenti. Komponente su programi "
-"poput emulatora terminala, uređivača teksta i klijenta e-pošte, a koji rukuju "
-"osnovnim zadacima. Različite TDE aplikacije ponekad imaju moraju pozvati "
-"emulator terminala, poslati e-poruku ili prikazati neki tekst. Da bi se to "
-"radilo na dosljedan način, sve te aplikacije uvijek pozivaju iste komponente. "
-"Na ovom mjestu možete odabrati koji programi čine te komponente.</p>\n"
+"<p>Na ovom mjestu možete promijeniti program komponenti. Komponente su "
+"programi poput emulatora terminala, uređivača teksta i klijenta e-pošte, a "
+"koji rukuju osnovnim zadacima. Različite TDE aplikacije ponekad imaju moraju "
+"pozvati emulator terminala, poslati e-poruku ili prikazati neki tekst. Da bi "
+"se to radilo na dosljedan način, sve te aplikacije uvijek pozivaju iste "
+"komponente. Na ovom mjestu možete odabrati koji programi čine te komponente."
+"</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul>"
-"<li>%t: Primateljeva adresa</li>"
-"<li>%s: Predmet</li>"
-"<li>%c: Kopija (CC)</li>"
-"<li>%b: Skrivena kopija (BCC)</li>"
-"<li>%B: Predložak teksta</li>"
-"<li>%A: Privitak</li></ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul><li>%t: Primateljeva adresa</li><li>%s: Predmet</li><li>%c: Kopija (CC)</"
+"li><li>%b: Skrivena kopija (BCC)</li><li>%B: Predložak teksta</li><li>%A: "
+"Privitak</li></ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Ptitisnite ovaj gumb da biste odabrali svoj omiljeni klijent e-pošte.  Datoteka "
-"koju odaberete mora imati postavljene izvršne atribute da bi mogla biti "
-"prihvaćena."
-"<br>Također možete upotrijebiti nekoliko zamjenskih tekstova koji će biti "
-"nadomješteni stvarnim vrijednostima tijekom pozivanja klijenta e-pošte:"
-"<ul>"
-"<li>%t: Primateljeva adresa</li>"
-"<li>%s: Predmet</li>"
-"<li>%c: Kopija (CC)</li>"
-"<li>%b: Skrivena kopija (BCC)</li>"
-"<li>%B: Predložak teksta</li>"
-"<li>%A: Privitak</li></ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Ptitisnite ovaj gumb da biste odabrali svoj omiljeni klijent e-pošte.  "
+"Datoteka koju odaberete mora imati postavljene izvršne atribute da bi mogla "
+"biti prihvaćena.<br>Također možete upotrijebiti nekoliko zamjenskih tekstova "
+"koji će biti nadomješteni stvarnim vrijednostima tijekom pozivanja klijenta "
+"e-pošte:<ul><li>%t: Primateljeva adresa</li><li>%s: Predmet</li><li>%c: "
+"Kopija (CC)</li><li>%b: Skrivena kopija (BCC)</li><li>%B: Predložak teksta</"
+"li><li>%A: Privitak</li></ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Kliknite za potraživanje datoteke programa e-pošte."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Pok&reni u terminalu"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Aktivirajte ovu opciju ako želite da odabrani klijent e-pošte bude izvršavan u "
-"terminalu (npr. <em>Konsole</em>)."
+"Aktivirajte ovu opciju ako želite da odabrani klijent e-pošte bude izvršavan "
+"u terminalu (npr. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Upotrebljavaj KMail kao klijent e-pošte"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail je standardni program e-pošte u TDE okruženju."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Upotrijebi drugi klijent &e-pošte:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Odaberite ovu opciju ako za e-poštu želite upotrebljavati neki drugi program."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Upotrijebi drugi &terminalni program:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Upotrijebi Konsole kao terminalni program"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Kliknite ovaj gumb za odabir terminalnog porgrama. Napomena: Datoteka koju "
-"odaberete mora imati postavljene izvršne atribute da bi mogla biti prihvaćena. "
-"<br> Također, neki programi koji koriste emulatora terminala neće funkcionirati "
-"ako dodate argumente naredbenog retka (npr: konsole -ls)."
+"odaberete mora imati postavljene izvršne atribute da bi mogla biti "
+"prihvaćena. <br> Također, neki programi koji koriste emulatora terminala "
+"neće funkcionirati ako dodate argumente naredbenog retka (npr: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Kliknite za potraživanje terminalnog programa."
@@ -302,5 +263,7 @@ msgstr "Kliknite za potraživanje terminalnog programa."
 #~ msgstr "Koristi KMail kao email klijent"
 
 #, fuzzy
-#~ msgid "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE desktop."
+#~ msgid ""
+#~ "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE "
+#~ "desktop."
 #~ msgstr "Kmail je standardni program za poštu u TDE okruženju."
diff --git a/tde-i18n-hu/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-hu/messages/tdebase/kcmcomponentchooser.po
index 8914deac77a..4140d9d76d5 100644
--- a/tde-i18n-hu/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-hu/messages/tdebase/kcmcomponentchooser.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-26 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"
@@ -42,8 +42,8 @@ msgstr "Ismeretlen"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Megváltoztatta az alapértelmezett komponensek beállításait, el szeretné "
 "menteni a módosításokat?</qt>"
@@ -54,8 +54,8 @@ msgstr "Nincs leírás"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Válassza ki az alábbi listából a(z) %1 szolgáltatás alapértelmezett "
 "komponensét."
@@ -72,229 +72,189 @@ msgstr "Komponensválasztó"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c) Joseph Wenninger, 2002."
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt><b>HTTP-</b> és <b>HTTPS-</b>címek megnyitása</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "Az URL tartalma alapján kiválasztott alkalmazásban"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "Ebben a böngészőben:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Alapértelmezett komponens"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Itt lehet megváltoztatni a komponens programfájljának nevét. A komponensek "
 "egy-egy alapvető feladat elvégzésére valók, például a parancsértelmező, a "
-"szövegszerkesztő vagy a levelezőprogram szerepét töltik be. A különféle "
-"TDE-alkalmazásoknak gyakran van szükségük arra, hogy elindítsanak egy "
+"szövegszerkesztő vagy a levelezőprogram szerepét töltik be. A különféle TDE-"
+"alkalmazásoknak gyakran van szükségük arra, hogy elindítsanak egy "
 "parancsértelmezőt, elküldjenek egy e-mailt vagy megjelenítsenek egy szöveges "
-"fájlt. Hogy a műveleteket konzisztens módon végezzék el, a felhasználó által a "
-"megadott célra kijelölt komponenst használják fel. Itt lehet beállítani, hogy "
-"az egyes komponensekhez melyik program tartozzon."
+"fájlt. Hogy a műveleteket konzisztens módon végezzék el, a felhasználó által "
+"a megadott célra kijelölt komponenst használják fel. Itt lehet beállítani, "
+"hogy az egyes komponensekhez melyik program tartozzon."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "A komponens leírása"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Itt látható a kiválasztott komponens rövid leírása. A komponens kiválasztásához "
-"kattintson a bal oldali listába. A komponenshez tartozó program kiválasztásához "
-"kattintson alulra."
+"Itt látható a kiválasztott komponens rövid leírása. A komponens "
+"kiválasztásához kattintson a bal oldali listába. A komponenshez tartozó "
+"program kiválasztásához kattintson alulra."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Itt látható, hogy a rendszerben milyen komponenstípusok léteznek. Kattintson "
-"rá a beállítani kívánt komponensre.</p>\n"
+"<p>Itt látható, hogy a rendszerben milyen komponenstípusok léteznek. "
+"Kattintson rá a beállítani kívánt komponensre.</p>\n"
 "<p>Ebben a párbeszédablakban a TDE alapértelmezett komponenseit lehet "
 "megváltoztatni. A komponensek egy-egy alapvető feladat elvégzésére valók, "
-"például a parancsértelmező, a szövegszerkesztő vagy a levelezőprogram szerepét "
-"töltik be. A különféle TDE-alkalmazásoknak gyakran van szükségük arra, hogy "
-"elindítsanak egy parancsértelmezőt, elküldjenek egy e-mailt vagy "
+"például a parancsértelmező, a szövegszerkesztő vagy a levelezőprogram "
+"szerepét töltik be. A különféle TDE-alkalmazásoknak gyakran van szükségük "
+"arra, hogy elindítsanak egy parancsértelmezőt, elküldjenek egy e-mailt vagy "
 "megjelenítsenek egy szöveges fájlt. Hogy a műveleteket konzisztens módon "
 "végezzék el, a felhasználó által a megadott célra kijelölt komponenst "
 "használják fel. Itt lehet beállítani, hogy az egyes komponensekhez melyik "
 "program tartozzon..</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: a címzett e-mail címe</li> "
-"<li>%s: a tárgy</li> "
-"<li>%c: a másolatok (CC) címei</li> "
-"<li>%b: a titkos másolatok (BCC) címei</li> "
-"<li>%B: az üzenetszöveg sablonja</li> "
-"<li>%A: csatolás </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: a címzett e-mail címe</li> <li>%s: a tárgy</li> <li>%c: a "
+"másolatok (CC) címei</li> <li>%b: a titkos másolatok (BCC) címei</li> <li>"
+"%B: az üzenetszöveg sablonja</li> <li>%A: csatolás </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Ezzzel a gombbal lehet kiválasztani az alapértelmezett e-mail-klienst. A "
-"kiválasztott fájlt csak akkor fogadja el a program, ha Önnek végrehajthatósági "
-"jogosultsága van hozzá."
-"<br> Többféle változó is felhasználható - ezek értékei az üzenetre vonatkozó "
-"konkrét értékek lesznek:"
-"<ul> "
-"<li>%t: a címzett e-mail címe</li> "
-"<li>%s: a tárgy</li> "
-"<li>%c: a másolatok (CC) címei</li> "
-"<li>%b: a titkos másolatok (BCC) címei</li> "
-"<li>%B: az üzenetszöveg sablonja</li> "
-"<li>%A: csatolás </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"kiválasztott fájlt csak akkor fogadja el a program, ha Önnek "
+"végrehajthatósági jogosultsága van hozzá.<br> Többféle változó is "
+"felhasználható - ezek értékei az üzenetre vonatkozó konkrét értékek lesznek:"
+"<ul> <li>%t: a címzett e-mail címe</li> <li>%s: a tárgy</li> <li>%c: a "
+"másolatok (CC) címei</li> <li>%b: a titkos másolatok (BCC) címei</li> <li>"
+"%B: az üzenetszöveg sablonja</li> <li>%A: csatolás </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Kattintson ide a levélküldő program kiválasztásához."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "F&uttatás parancsértelmezőben"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Ezt akkor kell bejelölni, ha a kiválasztott e-mail-kliens karakteres módú (azaz "
-"parancsértelmezőben kell futtani, pl. a <em>Konsole</em>-ban)."
+"Ezt akkor kell bejelölni, ha a kiválasztott e-mail-kliens karakteres módú "
+"(azaz parancsértelmezőben kell futtani, pl. a <em>Konsole</em>-ban)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "A &KMail legyen az alapértelmezett levelezőprogram"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "A KMail a TDE alapértelmezett levelezőprogramja."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Más &program:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Ezt kell választani, ha más programot szeretne használni (nem a KMailt)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Más pro&gram:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "A K&onsole legyen az alapértelmezett parancsértelmező"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Nyomja meg ezt a gombot a parancsértelmező kiválasztásához. A fájlt csak akkor "
-"fogadja el a program, ha be van jelölve nála a végrehajtható attribútum."
-"<br> Néhány parancsértelmező nem működik parancssori argumentumokkal (például: "
-"konsole -ls)."
+"Nyomja meg ezt a gombot a parancsértelmező kiválasztásához. A fájlt csak "
+"akkor fogadja el a program, ha be van jelölve nála a végrehajtható "
+"attribútum.<br> Néhány parancsértelmező nem működik parancssori "
+"argumentumokkal (például: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Kattintson ide a parancsértelmező kiválasztásához."
diff --git a/tde-i18n-is/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-is/messages/tdebase/kcmcomponentchooser.po
index dd343933478..d881f15a65a 100644
--- a/tde-i18n-is/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-is/messages/tdebase/kcmcomponentchooser.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-21 22:29+0100\n"
 "Last-Translator: Arnar Leosson <leosson@frisurf.no>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -18,13 +18,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 "Pjetur G. Hjaltason, Stígur Snæsson, Richard Allen"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -48,8 +48,8 @@ msgstr "Óþekkt"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Þú breyttir sjálfgefinni einingu, viltu vista þær breytingar núna ?</qt>"
 
@@ -59,11 +59,11 @@ msgstr "Engin lýsing tiltæk"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Veldu af listanum hér að neðan hvaða eining ætti að vera notuð sjálfkrafa fyrir "
-"þjónustuna %1."
+"Veldu af listanum hér að neðan hvaða eining ætti að vera notuð sjálfkrafa "
+"fyrir þjónustuna %1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -77,89 +77,81 @@ msgstr "Einingaval"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Opna <b>http</b> og <b>https</b> slóðir</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "í forriti sem styður það sem slóðin vísar í"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "í eftirfarandi vafra:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Sjálfgefin eining"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Hér er hægt að gera breytingar á einingavali. Einingar eru forrit sem sjá um "
 "grundvallaratriði, t.d. skjáhermir, textaritill og tölvupóstforrit. Ýmis "
-"TDEforrit þurfa stundum að ræsa skjáhermi, senda tölvupóst eða sýna texta. Til "
-"að samræmi sé með þessum aðgerðum, nota þessi forrit alltaf sömu einingarnar. "
-"Hér geturðu valið hvaða forrit sjá um hverja einingu."
+"TDEforrit þurfa stundum að ræsa skjáhermi, senda tölvupóst eða sýna texta. "
+"Til að samræmi sé með þessum aðgerðum, nota þessi forrit alltaf sömu "
+"einingarnar. Hér geturðu valið hvaða forrit sjá um hverja einingu."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Lýsing einingar"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Hér er hægt að lesa stutta lýsingu á þeirri einingu se er valin. Til að breyta "
-"vali á einingu er smellt í listann vinstra megin. Veldu einingaforrit fyrir "
-"neðan."
+"Hér er hægt að lesa stutta lýsingu á þeirri einingu se er valin. Til að "
+"breyta vali á einingu er smellt í listann vinstra megin. Veldu einingaforrit "
+"fyrir neðan."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Þessi listi sýnir stillanlegar tegundir eininga. Smelltu á eininguna sem þú "
-"vilt stilla.</p>\n"
+"<p>Þessi listi sýnir stillanlegar tegundir eininga. Smelltu á eininguna sem "
+"þú vilt stilla.</p>\n"
 "<p>Í þessum glugga er hægt að breyta sjálfgefnum TDE einingum. Einingar eru "
 "forrit sem sjá um grundvallaratriði, t.d. skjáhermir, textaritill og "
 "tölvupóstforrit. Ýmis TDEforrit þurfa stundum að ræsa skjáhermi, senda "
@@ -168,131 +160,99 @@ msgstr ""
 "einingu.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Netfang nóttakanda</li> "
-"<li>%s: Viðfangsefni</li> "
-"<li>%c: Afrit (CC)</li> "
-"<li>%b: Leynd afrit (BCC)</li> "
-"<li>%B: Forsnið af skeyti</li> "
-"<li>%A: Viðhengi </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Netfang nóttakanda</li> <li>%s: Viðfangsefni</li> <li>%c: Afrit "
+"(CC)</li> <li>%b: Leynd afrit (BCC)</li> <li>%B: Forsnið af skeyti</li> <li>"
+"%A: Viðhengi </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Smelltu á þennan hnapp til að velja uppáhalds tölvupóstsforritið þitt. Hafðu í "
-"huga að skráin sem þú velur verður að vera með keyrslueiginleikan settan til að "
-"verða samþykkt. "
-"<br>Þú getur gefið upp viðföng sem verður skipt út með raunverulegum gildum "
-"þegar kallað er á póstforritið:"
-"<ul> "
-"<li>%t: Netfang nóttakanda</li> "
-"<li>%s: Viðfangsefni</li> "
-"<li>%c: Afrit (CC)</li> "
-"<li>%b: Leynd afrit (BCC)</li> "
-"<li>%B: Forsnið af skeyti</li> "
-"<li>%A: Viðhengi </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Smelltu á þennan hnapp til að velja uppáhalds tölvupóstsforritið þitt. Hafðu "
+"í huga að skráin sem þú velur verður að vera með keyrslueiginleikan settan "
+"til að verða samþykkt. <br>Þú getur gefið upp viðföng sem verður skipt út "
+"með raunverulegum gildum þegar kallað er á póstforritið:<ul> <li>%t: Netfang "
+"nóttakanda</li> <li>%s: Viðfangsefni</li> <li>%c: Afrit (CC)</li> <li>%b: "
+"Leynd afrit (BCC)</li> <li>%B: Forsnið af skeyti</li> <li>%A: Viðhengi </li> "
+"</ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Smelltu hér til að fletta upp tölvupóstforriti."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Keyra í &skjáhermi"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Virkjaðu þetta ef þú vilt að valið póstforrit keyri í skjáhermi (þ.e. <em>"
-"Konsole</em>)."
+"Virkjaðu þetta ef þú vilt að valið póstforrit keyri í skjáhermi (þ.e. "
+"<em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Nota KMail sem sjálfgefið póstforrit"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail er staðlaða tölvupóstforritið í TDE"
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Nota &annað póstforrit:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Veldu þennan kost ef þú vilt nota annað tölvupóstforrit."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Nota annan s&kjáhermi:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Nota Konsole sem skjáhermi"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Smelltu hér til að velja uppáhalds skjáherminn þinn. Vinsamlegast athugaðu að "
-"skráin sem þú velur verður að vera keyranleg svo hún verði tekin gild."
-"<br> Einnig má benda á að forrit sem nota skjáhermi munu ekki virka ef þú gefur "
-"upp einhver viðföng (eins og til dæmis: konsole -ls)."
+"Smelltu hér til að velja uppáhalds skjáherminn þinn. Vinsamlegast athugaðu "
+"að skráin sem þú velur verður að vera keyranleg svo hún verði tekin gild."
+"<br> Einnig má benda á að forrit sem nota skjáhermi munu ekki virka ef þú "
+"gefur upp einhver viðföng (eins og til dæmis: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Smelltu hér til að fletta upp skjáhermisforriti."
diff --git a/tde-i18n-it/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-it/messages/tdebase/kcmcomponentchooser.po
index 6d8bb0f10db..d0d27569488 100644
--- a/tde-i18n-it/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-it/messages/tdebase/kcmcomponentchooser.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-14 18:23+0100\n"
 "Last-Translator: Giovanni Venturi <jumpyj@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Andrea Rizzi"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -49,8 +49,8 @@ msgstr "Sconosciuto"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt> Hai cambiato il componente predefinito, vuoi salvare le modifiche "
 "adesso?</qt>"
@@ -61,8 +61,8 @@ msgstr "Nessuna descrizione disponibile"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Scegli dalla lista qui sotto quale componente deve essere utilizzato per il "
 "servizio %1."
@@ -79,46 +79,41 @@ msgstr "Scelta componenti"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Apre gli URL <b>http</b> e <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "in un'applicazione in base al contenuto dell'URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "nel seguente browser:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Componente predefinito"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Qui puoi cambiare i componenti. I componenti sono programmi che gestiscono "
 "compiti di base come l'emulatore di terminale o l'editor di testi e il "
@@ -128,37 +123,34 @@ msgstr ""
 "applicazioni chiamano sempre gli stessi componenti. Qui puoi scegliere i "
 "programmi da usare come componenti."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Descrizione componente"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Qui puoi leggere una breve descrizione del componente selezionato. Per cambiare "
-"il componente selezionato fa clic sulla lista a sinistra. Per cambiare il "
-"programma da usare scegli nella casella qui sotto."
+"Qui puoi leggere una breve descrizione del componente selezionato. Per "
+"cambiare il componente selezionato fa clic sulla lista a sinistra. Per "
+"cambiare il programma da usare scegli nella casella qui sotto."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
@@ -166,142 +158,110 @@ msgstr ""
 "componente che vuoi configurare.</p>\n"
 "<p> In questa finestra puoi cambiare i componenti predefiniti di TDE. I "
 "componenti sono programmi che gestiscono compiti di base come l'emulatore di "
-"terminale o l'editor di testi e il programma di posta elettronica. Applicazioni "
-"di TDE diverse a volte hanno bisogno di avviare un emulatore di terminale o "
-"mandare un messaggio di posta elettronica o mostrare del testo. Per fare questo "
-"in modo coerente queste applicazioni chiamano sempre gli stessi componenti. Qui "
-"puoi scegliere i programmi da usare come componenti.</p>\n"
+"terminale o l'editor di testi e il programma di posta elettronica. "
+"Applicazioni di TDE diverse a volte hanno bisogno di avviare un emulatore di "
+"terminale o mandare un messaggio di posta elettronica o mostrare del testo. "
+"Per fare questo in modo coerente queste applicazioni chiamano sempre gli "
+"stessi componenti. Qui puoi scegliere i programmi da usare come componenti.</"
+"p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Indirizzo destinatari</li> "
-"<li>%s: Oggetto</li> "
-"<li>%c: Copia Carbone(CC)</li> "
-"<li>%b: Copia Carbone nascosta (BCC)</li> "
-"<li>%B: Corpo del messaggio</li> "
-"<li>%A: Allegato </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Indirizzo destinatari</li> <li>%s: Oggetto</li> <li>%c: Copia "
+"Carbone(CC)</li> <li>%b: Copia Carbone nascosta (BCC)</li> <li>%B: Corpo del "
+"messaggio</li> <li>%A: Allegato </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Premi questo pulsante per scegliere il tuo programma di posta elettronica "
-"preferito. Nota che il file che scegli deve essere eseguibile per poter essere "
-"accettato."
-"<br>Puoi utilizzare vari segnaposto che saranno sostituiti con gli opportuni "
-"valori quando sarà eseguito il comando:"
-"<ul> "
-"<li>%t: Indirizzo destinatari</li> "
-"<li>%s: Oggetto</li> "
-"<li>%c: Copia Carbone(CC)</li> "
-"<li>%b: Copia Carbone nascosta (BCC)</li> "
-"<li>%B: Corpo del messaggio</li> "
-"<li>%A: Allegato </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"preferito. Nota che il file che scegli deve essere eseguibile per poter "
+"essere accettato.<br>Puoi utilizzare vari segnaposto che saranno sostituiti "
+"con gli opportuni valori quando sarà eseguito il comando:<ul> <li>%t: "
+"Indirizzo destinatari</li> <li>%s: Oggetto</li> <li>%c: Copia Carbone(CC)</"
+"li> <li>%b: Copia Carbone nascosta (BCC)</li> <li>%B: Corpo del messaggio</"
+"li> <li>%A: Allegato </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr ""
 "Fa clic per sfogliare e cercare il file del programma di posta elettronica."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Esegui in un &terminale"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Attiva questa opzione se vuoi che il client di posta elettronica sia eseguito "
-"in un terminale (es. <em>Konsole</em>)"
+"Attiva questa opzione se vuoi che il client di posta elettronica sia "
+"eseguito in un terminale (es. <em>Konsole</em>)"
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Utilizza KMail come programma di posta preferito"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail è il programma di posta standard per il desktop TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Utilizza un programma di posta &differente:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Scegli questa opzione se vuoi usare un qualunque altro programma di posta."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Utilizza un programma di &emulazione terminale differente:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Utilizza Konsole come programma di emulazione terminale"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Premi questo pulsante per selezionare il tuo programma di emulazione terminale "
-"preferito. Nota che il file che selezioni deve avere l'attributo di eseguibile "
-"impostato per essere accettato."
-"<br> Nota anche che alcuni programmi che utilizzano l'emulatore di terminale "
-"non funzionano se aggiungi argomenti della linea di comando (Esempio: konsole "
-"-ls)."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"Premi questo pulsante per selezionare il tuo programma di emulazione "
+"terminale preferito. Nota che il file che selezioni deve avere l'attributo "
+"di eseguibile impostato per essere accettato.<br> Nota anche che alcuni "
+"programmi che utilizzano l'emulatore di terminale non funzionano se aggiungi "
+"argomenti della linea di comando (Esempio: konsole -ls)."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr ""
diff --git a/tde-i18n-ja/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-ja/messages/tdebase/kcmcomponentchooser.po
index a514d09427d..86b16f1f115 100644
--- a/tde-i18n-ja/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-ja/messages/tdebase/kcmcomponentchooser.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-07 22:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -21,13 +21,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 "Noboru Sinohara,Kurose Shushi,Shinichi Tsunoda"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,8 +51,8 @@ msgstr "不明"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr "<qt>標準コンポーネントが変更されました。変更を保存しますか？</qt>"
 
 #: componentchooser.cpp:412
@@ -61,9 +61,10 @@ msgstr "説明はありません"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
-msgstr "%1 サービスに標準で使用するコンポーネントを下のリストから選択してください。"
+"Choose from the list below which component should be used by default for the "
+"%1 service."
+msgstr ""
+"%1 サービスに標準で使用するコンポーネントを下のリストから選択してください。"
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -77,214 +78,186 @@ msgstr "コンポーネント選択"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt><b>http</b> や <b>https</b> の URL を開く</qt>"
 
 # ACCELERATOR added by translator
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "URL の内容に基づいたアプリケーションで(&U)"
 
 # ACCELERATOR added by translator
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "以下のブラウザで(&I):"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "標準のコンポーネント"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"ここでコンポーネントプログラムを変更することができます。コンポーネントとは、ターミナルエミュレータ、テキストエディタ、メールクライアントといった、基本的な作業を"
-"扱うプログラムです。異なる TDE "
-"アプリケーションがコンソールエミュレータを起動したり、メールを送信したり、あるいはテキストをエディタに表示するときに、一貫性を持たせるために、これらのアプリケー"
-"ションは常に同じコンポーネントを呼び出します。ここでこれらのコンポーネントとなるプログラムを選択します。"
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"ここでコンポーネントプログラムを変更することができます。コンポーネントとは、"
+"ターミナルエミュレータ、テキストエディタ、メールクライアントといった、基本的"
+"な作業を扱うプログラムです。異なる TDE アプリケーションがコンソールエミュレー"
+"タを起動したり、メールを送信したり、あるいはテキストをエディタに表示するとき"
+"に、一貫性を持たせるために、これらのアプリケーションは常に同じコンポーネント"
+"を呼び出します。ここでこれらのコンポーネントとなるプログラムを選択します。"
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "コンポーネントの説明"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"現在選択されているコンポーネントの説明です。表示するコンポーネントを変更するには、左のリストをクリックしてください。各コンポーネントのプログラムを変更する場合は"
-"、下で選択してください。"
+"現在選択されているコンポーネントの説明です。表示するコンポーネントを変更する"
+"には、左のリストをクリックしてください。各コンポーネントのプログラムを変更す"
+"る場合は、下で選択してください。"
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>設定可能なコンポーネントのリストです。設定するコンポーネントをクリックしてください。</p>\n"
-"<p>このダイアログで TDE "
-"の標準コンポーネントを変更することができます。コンポーネントとは、ターミナルエミュレータ、テキストエディタ、メールクライアントといった、基本的な作業を扱うプログ"
-"ラムです。異なる TDE "
-"アプリケーションがコンソールエミュレータを起動したり、メールを送信したり、あるいはテキストをエディタに表示するときに、一貫性を持たせるために、これらのアプリケー"
-"ションは常に同じコンポーネントを呼び出します。ここでこれらのコンポーネントとなるプログラムを選択します。</p>\n"
+"<p>設定可能なコンポーネントのリストです。設定するコンポーネントをクリックして"
+"ください。</p>\n"
+"<p>このダイアログで TDE の標準コンポーネントを変更することができます。コン"
+"ポーネントとは、ターミナルエミュレータ、テキストエディタ、メールクライアント"
+"といった、基本的な作業を扱うプログラムです。異なる TDE アプリケーションがコン"
+"ソールエミュレータを起動したり、メールを送信したり、あるいはテキストをエディ"
+"タに表示するときに、一貫性を持たせるために、これらのアプリケーションは常に同"
+"じコンポーネントを呼び出します。ここでこれらのコンポーネントとなるプログラム"
+"を選択します。</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: 受取人のアドレス</li> "
-"<li>%s: 件名 (Subject)</li> "
-"<li>%c: カーボンコピー (CC)</li> "
-"<li>%b: ブラインドカーボンコピー (BCC)</li> "
-"<li>%B: テンプレートの本体テキスト</li> "
-"<li>%A: 添付物</li></ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: 受取人のアドレス</li> <li>%s: 件名 (Subject)</li> <li>%c: カーボ"
+"ンコピー (CC)</li> <li>%b: ブラインドカーボンコピー (BCC)</li> <li>%B: テンプ"
+"レートの本体テキスト</li> <li>%A: 添付物</li></ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"右のボタンを押してお気に入りのメールクライアントを選択してください。選択するファイルは実行可能属性が設定されているものでなければなりません。"
-"<br> また、以下の変数も使用できます。これらはメールクライアントを呼び出したときに実際の値に置き換わります。"
-"<ul> "
-"<li>%t: 受取人のアドレス</li> "
-"<li>%s: 件名 (Subject)</li> "
-"<li>%c: カーボンコピー (CC)</li> "
-"<li>%b: ブラインドカーボンコピー (BCC)</li> "
-"<li>%B: テンプレートの本体テキスト</li> "
-"<li>%A: 添付物</li></ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"右のボタンを押してお気に入りのメールクライアントを選択してください。選択する"
+"ファイルは実行可能属性が設定されているものでなければなりません。<br> また、以"
+"下の変数も使用できます。これらはメールクライアントを呼び出したときに実際の値"
+"に置き換わります。<ul> <li>%t: 受取人のアドレス</li> <li>%s: 件名 (Subject)</"
+"li> <li>%c: カーボンコピー (CC)</li> <li>%b: ブラインドカーボンコピー (BCC)</"
+"li> <li>%B: テンプレートの本体テキスト</li> <li>%A: 添付物</li></ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "メールプログラムファイルを参照するにはここをクリックしてください。"
 
 # ACCELERATOR changed by translator
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "ターミナルで実行する(&N)"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
-msgstr "Konsole のようなターミナル内で実行するメールクライアントを指定した場合は、このオプションを有効にしてください。"
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
+msgstr ""
+"Konsole のようなターミナル内で実行するメールクライアントを指定した場合は、こ"
+"のオプションを有効にしてください。"
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "KMail を標準メールクライアントにする(&U)"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail は TDE デスクトップの標準メールプログラムです。"
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "他のメールクライアントを使う(&E):"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "他のメールプログラムを使う場合、このオプションを選んでください。"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "他のターミナルプログラムを使う(&T):"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Konsole をターミナルアプリケーションに使う(&U)"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"右のボタンを押してお好みのターミナルクライアントを選択してください。選択するファイルは実行可能属性が設定されているものでなければなりません。"
-"<p>注意: ターミナルエミュレータを利用するいくつかのプログラムは、コマンドライン引数を付けると (例: konsole -ls) 動作しなくなります。"
+"右のボタンを押してお好みのターミナルクライアントを選択してください。選択する"
+"ファイルは実行可能属性が設定されているものでなければなりません。<p>注意: ター"
+"ミナルエミュレータを利用するいくつかのプログラムは、コマンドライン引数を付け"
+"ると (例: konsole -ls) 動作しなくなります。"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "ターミナルプログラムを参照するにはここをクリックしてください。"
diff --git a/tde-i18n-kk/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-kk/messages/tdebase/kcmcomponentchooser.po
index 4339f64e924..580fadbe209 100644
--- a/tde-i18n-kk/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-kk/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-20 02:25+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"
@@ -46,8 +46,8 @@ msgstr "Беймәлім"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Әдеттегі болатын компонентті өзгерттіңіз. Өзгерісті сақтау керек пе?</qt>"
 
@@ -57,8 +57,8 @@ msgstr "Сипаттамасы жоқ"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Төмендегі тізбеден %1 қызметіне әдетте қолданылатын компонентті таңдаңыз."
 
@@ -74,223 +74,184 @@ msgstr "Компоненттерді таңдау"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt><b>http</b> және <b>https</b> URL адрестерін ашу үшін</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "URL мазмұнына лайық қолданбада пайдалансын"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "келесі шолғыш пайдалансын:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Әдеттегі компонент"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Бұл диалогта компонент бағдарламалады таңдап өзгертуіңізге болады. Компононттер "
-"деп негізгі тапсырмаларды орындайтын бағдарламаларды атайды, мысалы, терминал "
-"эмуляторы, мәтін редакторы және пошта клиенті. Түрлі TDE қолданбаларына "
-"кейбірде консоль эмуляторын шақыру, поштаны жіберу не мәтінді өңдеу қажет "
-"болады. Сонда бұл қолданба осы компоненттерді жұмсайды. Осында сол компонент "
-"ретінде қолданылатын бағдарламаларын таңдай аласыз."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"Бұл диалогта компонент бағдарламалады таңдап өзгертуіңізге болады. "
+"Компононттер деп негізгі тапсырмаларды орындайтын бағдарламаларды атайды, "
+"мысалы, терминал эмуляторы, мәтін редакторы және пошта клиенті. Түрлі TDE "
+"қолданбаларына кейбірде консоль эмуляторын шақыру, поштаны жіберу не мәтінді "
+"өңдеу қажет болады. Сонда бұл қолданба осы компоненттерді жұмсайды. Осында "
+"сол компонент ретінде қолданылатын бағдарламаларын таңдай аласыз."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Компоненттің сипаттамасы"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Мұнда таңдалған компоненттің қысқа сипаттамасын оқуға болады. Басқа компонентті "
-"сол жақтағы тізімнен таңдаңыз. Компонент бағдарламасын төменде келтіріңіз."
+"Мұнда таңдалған компоненттің қысқа сипаттамасын оқуға болады. Басқа "
+"компонентті сол жақтағы тізімнен таңдаңыз. Компонент бағдарламасын төменде "
+"келтіріңіз."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Бұл тізім бапталатын компоненттердің түрін көрсетеді. Баптайтын компонентті "
-"таңдаңыз.</p>\n"
+"<p>Бұл тізім бапталатын компоненттердің түрін көрсетеді. Баптайтын "
+"компонентті таңдаңыз.</p>\n"
 "<p>Бұл диалогта компонент бағдарламалады таңдап өзгертуіңізге болады. "
 "Компононттер деп негізгі тапсырмаларды орындайтын бағдарламаларды атайды, "
 "мысалы, терминал эмуляторы, мәтін редакторы және пошта клиенті. Түрлі TDE "
 "қолданбаларына кейбірде консоль эмуляторын шақыру, поштаны жіберу не мәтінді "
-"өңдеу қажет болады. Сонда бұл қолданба осы компоненттерді жұмсайды. Осында сол "
-"компонент ретінде қолданылатын бағдарламаларын таңдай аласыз.</p>\n"
+"өңдеу қажет болады. Сонда бұл қолданба осы компоненттерді жұмсайды. Осында "
+"сол компонент ретінде қолданылатын бағдарламаларын таңдай аласыз.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Адресі</li> "
-"<li>%s: Тақырыбы</li> "
-"<li>%c: Көшірмесі (CC)</li>  "
-"<li>%b: Жасырын көшірмесі (BCC)</li> "
-"<li>%B: Негізгі мәтін үлгісі</li> "
-"<li>%A: Тіркемесі </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Адресі</li> <li>%s: Тақырыбы</li> <li>%c: Көшірмесі (CC)</li>  "
+"<li>%b: Жасырын көшірмесі (BCC)</li> <li>%B: Негізгі мәтін үлгісі</li> <li>"
+"%A: Тіркемесі </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Қолданатын эл. пошта клиентін таңдау үшін осы батырманы басыңыз. Таңдауңыз "
-"қабылдану үшін бағдарлама файлында орындалатын файл атрибуты болуы тиіс."
-"<br> Сонымен қатар, пошта клиентті шақырғанда нақты деректермен ауыстырылатын "
-"орынбасар жазуларды қолдана аласыз: "
-"<ul> "
-"<li>%t: Адресі</li> "
-"<li>%s: Тақырыбы</li> "
-"<li>%c: Көшірмесі (CC)</li>  "
-"<li>%b: Жасырын көшірмесі (BCC)</li> "
-"<li>%B: Негізгі мәтін үлгісі</li> "
-"<li>%A: Тіркемесі </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"қабылдану үшін бағдарлама файлында орындалатын файл атрибуты болуы тиіс.<br> "
+"Сонымен қатар, пошта клиентті шақырғанда нақты деректермен ауыстырылатын "
+"орынбасар жазуларды қолдана аласыз: <ul> <li>%t: Адресі</li> <li>%s: "
+"Тақырыбы</li> <li>%c: Көшірмесі (CC)</li>  <li>%b: Жасырын көшірмесі (BCC)</"
+"li> <li>%B: Негізгі мәтін үлгісі</li> <li>%A: Тіркемесі </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Пошта бағдарламасының файлын іздеу үшін осында басыңыз."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Терминалда о&рындалсын"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Пошта клиентіңіз (<em>Konsole</em> секілді) терминалда орындалатын болса, осы "
-"құсбелгіні қойыңыз."
+"Пошта клиентіңіз (<em>Konsole</em> секілді) терминалда орындалатын болса, "
+"осы құсбелгіні қойыңыз."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Эл. поштаның негізгі клиенті ретінде KMail қолданылсын"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail деген- TDE жүйесінің стандартты пошта бағдарламасы."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Басқа &эл. поштаның клиенті қолданылсын:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Басқа пошталық бағдарламаны қолданғыңыз келсе осы көзді белгілеп қойыңыз."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "&Басқа терминалдық бағдарлама қолданылсын:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Терминал ретінде Konsole қолданбасы &пайдалансын"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Қолданатын терминал клиентін таңдау үшін осы батырманы басыңыз. Таңдауыңыз "
-"қабылдану үшін бағдарлама файлында орындалатын файл атрибуты болуы тиіс."
-"<br> Есіңізде болсын, егер командалық жолдың аргументін қосатын болсаңыз "
-"(мысалы, былай: konsole -ls) кейбір терминал эмуляторын қолданатын "
-"бағдарламалар істемейді."
+"қабылдану үшін бағдарлама файлында орындалатын файл атрибуты болуы тиіс.<br> "
+"Есіңізде болсын, егер командалық жолдың аргументін қосатын болсаңыз (мысалы, "
+"былай: konsole -ls) кейбір терминал эмуляторын қолданатын бағдарламалар "
+"істемейді."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Терминал бағдарламаны іздеу үшін осында басыңыз."
diff --git a/tde-i18n-km/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-km/messages/tdebase/kcmcomponentchooser.po
index 79590bbd175..3a6130c9cfc 100644
--- a/tde-i18n-km/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-km/messages/tdebase/kcmcomponentchooser.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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:51+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"
 
 #: componentchooser.cpp:165
 msgid "Select preferred email client:"
@@ -46,11 +46,11 @@ msgstr "មិន​ស្គាល់"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>អ្នក​បាន​ផ្លាស់​ប្តូរ​សមាសភាគ​លំនាំដើមនៃ​ជម្រើស​របស់​អ្នក "
-"តើ​អ្នក​ចង់​រក្សាទុក​ការ​ផ្លាស់ប្តូរ​នោះឥឡូវ​ឬ​ទេ ?</qt>"
+"<qt>អ្នក​បាន​ផ្លាស់​ប្តូរ​សមាសភាគ​លំនាំដើមនៃ​ជម្រើស​របស់​អ្នក តើ​អ្នក​ចង់​រក្សាទុក​ការ​ផ្លាស់ប្តូរ​នោះឥឡូវ​ឬ​"
+"ទេ ?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -58,11 +58,9 @@ msgstr "មិន​មានការពិពណ៌នា"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
-msgstr ""
-"ជ្រើស​ពី​បញ្ជី​ខាងក្រោមនូវ​សមាសភាគ​ដែល​គួរ​ត្រូវ​ប្រើ​ជា​លំនាំដើម​សម្រាប់សេវា "
-"%1 ។"
+"Choose from the list below which component should be used by default for the "
+"%1 service."
+msgstr "ជ្រើស​ពី​បញ្ជី​ខាងក្រោមនូវ​សមាសភាគ​ដែល​គួរ​ត្រូវ​ប្រើ​ជា​លំនាំដើម​សម្រាប់សេវា %1 ។"
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -77,247 +75,196 @@ msgid "(c), 2002 Joseph Wenninger"
 msgstr "រក្សាសិទ្ធិ​ឆ្នាំ ២០០២ ដោយ Joseph Wenninger"
 
 #  i18n: file browserconfig_ui.ui line 49
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>បើក URLs របស់<b>http</b> និង <b>https</b></qt>"
 
 #  i18n: file browserconfig_ui.ui line 57
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "ក្នុង​កម្មវិធី​មួយ​ដែល​ផ្អែក​លើ​មាតិកា​របស់ URL"
 
 #  i18n: file browserconfig_ui.ui line 68
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "ក្នុង​កម្មវិធី​រុករក​ខាង​ក្រោម ៖"
 
 #  i18n: file browserconfig_ui.ui line 120
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
 #  i18n: file componentchooser_ui.ui line 43
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "សមាភាគ​លំនាំដើម"
 
 #  i18n: file componentchooser_ui.ui line 46
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"នៅទីនេះ អ្នក​អាចផ្លាស់​ប្តូរ​កម្មវិធី​របស់សមាសភាគ ។ "
-"សមាសភាគជា​កម្មវិធី​ដែល​គ្រប់គ្រង​ភារកិច្ច​មូលដ្ឋាន ដូចជា​កម្មវិធី​ស្ថានីយ "
-"កម្មវិធី​និពន្ធ​អត្ថបទ និង​កម្មវិធី​អ៊ីមែល ។ ចួនកាល កម្មវិធី TDE ផ្សេងៗគ្នា "
-"ត្រូវការហៅ​កម្មវិធីកុងសូល ដើម្បី​ផ្ញើ​សំបុត្រ ឬ បង្ហាញ​អត្ថបទ​ខ្លះ ។ "
-"ដើម្បី​ធ្វើ​ដូច្នេះ​បាន​យ៉ាងប្រាកដ កម្មវិធី​ទាំងនេះ​តែងតែ​ហៅ​សមាសភាគ​ដូចគ្នា ។ "
-"នៅទីនេះ អ្នក​អាច​ជ្រើស​កម្មវិធីដែល​ប្រើ​សមាសភាគ​ទាំងនេះ ។"
+"នៅទីនេះ អ្នក​អាចផ្លាស់​ប្តូរ​កម្មវិធី​របស់សមាសភាគ ។ សមាសភាគជា​កម្មវិធី​ដែល​គ្រប់គ្រង​ភារកិច្ច​មូលដ្ឋាន "
+"ដូចជា​កម្មវិធី​ស្ថានីយ កម្មវិធី​និពន្ធ​អត្ថបទ និង​កម្មវិធី​អ៊ីមែល ។ ចួនកាល កម្មវិធី TDE ផ្សេងៗគ្នា ត្រូវការហៅ​"
+"កម្មវិធីកុងសូល ដើម្បី​ផ្ញើ​សំបុត្រ ឬ បង្ហាញ​អត្ថបទ​ខ្លះ ។ ដើម្បី​ធ្វើ​ដូច្នេះ​បាន​យ៉ាងប្រាកដ កម្មវិធី​ទាំងនេះ​"
+"តែងតែ​ហៅ​សមាសភាគ​ដូចគ្នា ។ នៅទីនេះ អ្នក​អាច​ជ្រើស​កម្មវិធីដែល​ប្រើ​សមាសភាគ​ទាំងនេះ ។"
 
 #  i18n: file componentchooser_ui.ui line 75
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "ការ​ពិពណ៌នា​អំពីសមាសភាគ"
 
 #  i18n: file componentchooser_ui.ui line 78
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"នៅទីនេះ "
-"អ្នក​អាច​អាន​ការ​ពិពណ៌នា​ខ្លីមួយ​អំពី​សមាសភាគ​ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន ។ "
-"ដើម្បីផ្លាស់​ប្តូរ​សមាសភាគ​ដែល​បាន​ជ្រើស ចុច​លើ​បញ្ជី​ខាង​ឆ្វេង ។ "
-"ដើម្បីផ្លាស់​ប្តូរ​កម្មវិធី​សមាសភាគ សូម​ជ្រើស​វា​ខាង​ក្រោម ។"
+"នៅទីនេះ អ្នក​អាច​អាន​ការ​ពិពណ៌នា​ខ្លីមួយ​អំពី​សមាសភាគ​ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន ។ ដើម្បីផ្លាស់​ប្តូរ​សមាសភាគ​"
+"ដែល​បាន​ជ្រើស ចុច​លើ​បញ្ជី​ខាង​ឆ្វេង ។ ដើម្បីផ្លាស់​ប្តូរ​កម្មវិធី​សមាសភាគ សូម​ជ្រើស​វា​ខាង​ក្រោម ។"
 
 #  i18n: file componentchooser_ui.ui line 119
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>បញ្ជី​នេះ​បង្ហាញ​ប្រភេទ​សមាសភាគ​ដែល​អាច​កំណត់​រចនាសម្ព័ន្ធ ។ "
-"ចុច​លើ​សមាសភាគ​ដែល​អ្នក​ចង់​កំណត់​រចនាសម្ព័ន្ធ ។</p>\n"
-"<p>ក្នុង​ប្រអប់​នេះ អ្នក​អាចផ្លាស់​ប្តូរ​សមាសភាគ​លំនាំដើម TDE ។ "
-"សមាសភាគគឺ​ជា​កម្មវិធី​ដែល​គ្រប់គ្រង​ភារកិច្ច​មួលដ្ឋាន ដូចជា កម្មវិធី​ស្ថានីយ "
-"កម្មវិធី​និពន្ធ​អត្ថបទ និងកម្មវិធី​អ៊ីមែល ។ ចួនកាលកម្មវិធី TDE ផ្សេងៗ "
-"ត្រូវការ​ហៅ​កម្មវិធី​កុងសូល ដើម្បី​ផ្ញើសំបុត្រ ឬ បង្ហាញ​អត្ថបទ​ខ្លះ ។ "
-"ដើម្បី​ធ្វើ​ដូច្នេះ​បាន​យ៉ាងប្រាកដ កម្មវិធី​ទាំងនេះ​តែងតែ​ហៅ​សមាសភាគ​ដូចគ្នា ។ "
-"នៅ​ទីនេះ អ្នក​ជ្រើស​កម្មវិធី​ដែល​ប្រើ​សមាសភាគ​ទាំងនេះ ។</p>\n"
+"<p>បញ្ជី​នេះ​បង្ហាញ​ប្រភេទ​សមាសភាគ​ដែល​អាច​កំណត់​រចនាសម្ព័ន្ធ ។ ចុច​លើ​សមាសភាគ​ដែល​អ្នក​ចង់​កំណត់​"
+"រចនាសម្ព័ន្ធ ។</p>\n"
+"<p>ក្នុង​ប្រអប់​នេះ អ្នក​អាចផ្លាស់​ប្តូរ​សមាសភាគ​លំនាំដើម TDE ។ សមាសភាគគឺ​ជា​កម្មវិធី​ដែល​គ្រប់គ្រង​ភារកិច្ច​"
+"មួលដ្ឋាន ដូចជា កម្មវិធី​ស្ថានីយ កម្មវិធី​និពន្ធ​អត្ថបទ និងកម្មវិធី​អ៊ីមែល ។ ចួនកាលកម្មវិធី TDE ផ្សេងៗ "
+"ត្រូវការ​ហៅ​កម្មវិធី​កុងសូល ដើម្បី​ផ្ញើសំបុត្រ ឬ បង្ហាញ​អត្ថបទ​ខ្លះ ។ ដើម្បី​ធ្វើ​ដូច្នេះ​បាន​យ៉ាងប្រាកដ កម្មវិធី​"
+"ទាំងនេះ​តែងតែ​ហៅ​សមាសភាគ​ដូចគ្នា ។ នៅ​ទីនេះ អ្នក​ជ្រើស​កម្មវិធី​ដែល​ប្រើ​សមាសភាគ​ទាំងនេះ ។</p>\n"
 "</qt>"
 
 #  i18n: file emailclientconfig_ui.ui line 83
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t ៖ អាសយដ្ឋាន​អ្នក​ទទួល</li> "
-"<li>%s ៖ ប្រធានបទ</li> "
-"<li>%c ៖ ចម្លង</li> "
-"<li>%b ៖ លាក់</li> "
-"<li>%B ៖ អត្តបទ​តួ​របស់​ពុម្ព</li> "
-"<li>%A ៖ ឯកសារ​ភ្ជាប់ </li> </ul>"
+"<ul> <li>%t ៖ អាសយដ្ឋាន​អ្នក​ទទួល</li> <li>%s ៖ ប្រធានបទ</li> <li>%c ៖ ចម្លង</li> "
+"<li>%b ៖ លាក់</li> <li>%B ៖ អត្តបទ​តួ​របស់​ពុម្ព</li> <li>%A ៖ ឯកសារ​ភ្ជាប់ </li> </ul>"
 
 #  i18n: file emailclientconfig_ui.ui line 86
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"ចុច​ប៊ូតុង​នេះ ដើម្បី​ជ្រើស​កម្មវិធី​អ៊ីមែល​ដែល​អ្នក​ពេញ​ចិត្ត ។ សូម​ចំណាំ​ថា "
-"ដើម្បី​អាច​ទទួល​យក​បាន "
-"ឯកសារ​ដែល​អ្នក​បាន​ជ្រើស​ត្រូវ​មាន​ការ​កំណត់​គុណលក្ខណៈ​អាច​ប្រតិបត្តិ ។"
-"<br> អ្នក​អាច​ប្រើ​កន្លែង​ដាក់​ជាច្រើន​ផងដែរ "
-"ដែល​វា​នឹង​ជំនួស​ដោយ​តម្លៃ​ពិតប្រាកដ ពេល​កម្មវិធី​អ៊ីមែល​ត្រូវ​បាន​ហៅ ៖ "
-"<ul> "
-"<li>%t​ ៖ អាសយដ្ឋាន​របស់​អ្នក​ទទួល</li> "
-"<li>%s ៖ ប្រធានបទ</li> "
-"<li>%c ៖ ចម្លង (CC)</li> "
-"<li>%b ៖ លាក់ (BCC)</li> "
-"<li>%B ៖ អត្ថបទ​តួ​របស់​ពុម្ព</li> "
-"<li>%A ៖ ឯកសារភ្ជាប់ </li> </ul>"
+"ចុច​ប៊ូតុង​នេះ ដើម្បី​ជ្រើស​កម្មវិធី​អ៊ីមែល​ដែល​អ្នក​ពេញ​ចិត្ត ។ សូម​ចំណាំ​ថា ដើម្បី​អាច​ទទួល​យក​បាន ឯកសារ​ដែល​អ្នក​"
+"បាន​ជ្រើស​ត្រូវ​មាន​ការ​កំណត់​គុណលក្ខណៈ​អាច​ប្រតិបត្តិ ។<br> អ្នក​អាច​ប្រើ​កន្លែង​ដាក់​ជាច្រើន​ផងដែរ ដែល​វា​"
+"នឹង​ជំនួស​ដោយ​តម្លៃ​ពិតប្រាកដ ពេល​កម្មវិធី​អ៊ីមែល​ត្រូវ​បាន​ហៅ ៖ <ul> <li>%t​ ៖ អាសយដ្ឋាន​របស់​អ្នក​ទទួល</"
+"li> <li>%s ៖ ប្រធានបទ</li> <li>%c ៖ ចម្លង (CC)</li> <li>%b ៖ លាក់ (BCC)</li> "
+"<li>%B ៖ អត្ថបទ​តួ​របស់​ពុម្ព</li> <li>%A ៖ ឯកសារភ្ជាប់ </li> </ul>"
 
 #  i18n: file emailclientconfig_ui.ui line 100
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "ចុច​ទីនេះ ដើម្បី​រក​មើល​ឯកសាររបស់កម្មវិធីអ៊ីមែល ។"
 
 #  i18n: file emailclientconfig_ui.ui line 113
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "រត់​ក្នុង​ស្ថានីយ"
 
 #  i18n: file emailclientconfig_ui.ui line 116
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"ធ្វើ​ឲ្យ​ជម្រើស​នេះ​សកម្ម ប្រសិនបើអ្នក​ចង់​ឲ្យ​កម្មវិធី​អ៊ីមែល​ដែល​បាន​ជ្រើស "
-"​ប្រតិបត្តិ​ក្នុង​ស្ថានីយ​មួយ (ឧទាហរណ៍.<em>Konsole</em>) ។"
+"ធ្វើ​ឲ្យ​ជម្រើស​នេះ​សកម្ម ប្រសិនបើអ្នក​ចង់​ឲ្យ​កម្មវិធី​អ៊ីមែល​ដែល​បាន​ជ្រើស ​ប្រតិបត្តិ​ក្នុង​ស្ថានីយ​មួយ (ឧទាហរណ៍."
+"<em>Konsole</em>) ។"
 
 #  i18n: file emailclientconfig_ui.ui line 141
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "ប្រើ KMail ជាកម្មវិធី​អ៊ីមែល​ដែល​ចូលចិត្ត ៖ "
 
 #  i18n: file emailclientconfig_ui.ui line 144
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail ជា​កម្មវិធី​អ៊ីមែល​ខ្នាត​គំរូ​សម្រាប់​ផ្ទៃតុ TDE ។"
 
 #  i18n: file emailclientconfig_ui.ui line 152
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "ប្រើ​កម្មវិធី​អ៊ីមែលផ្សេង​ ៖ "
 
 #  i18n: file emailclientconfig_ui.ui line 155
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "ជ្រើស​ជម្រើស​នេះ ប្រសិនបើ​អ្នក​ចង់​ប្រើ​កម្មវិធី​អ៊ីមែល​ផ្សេង ។"
 
 #  i18n: file terminalemulatorconfig_ui.ui line 72
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "ប្រើ​កម្មវិធី​ស្ថានីយ​៍​ផ្សេង ៖ "
 
 #  i18n: file terminalemulatorconfig_ui.ui line 97
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "ប្រើ Konsole ជា​កម្មវិធី​ស្ថានីយ"
 
 #  i18n: file terminalemulatorconfig_ui.ui line 130
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"ចុច​ប៊ូតុង​នេះ ដើម្បី​ជ្រើសកម្មវិធីស្ថានីយ​ដែលអ្នកចូលចិត្ត ។ សូម​ចំណាំថា "
-"ដើម្បី​អាច​ទទួល​យក​បាន ឯកសារ​ដែល​អ្នក​បានជ្រើស "
-"ត្រូវ​មាន​ការ​កំណត់​គុណលក្ខណៈ​ដែល​អាច​ប្រតិបត្តិ ។ "
-"<br> សូម​ចំណាំ​ផង​ដែរ​ថា កម្មវិធី​ខ្លះដែល​ប្រើ កម្មវិធី​ស្ថានីយ "
-"នឹង​មិនធ្វើការ​ឡើយ ប្រសិនបើ​អ្នក​បន្ថែម​អាគុយម៉ង់របស់​បន្ទាត់​បញ្ជា (ឧទាហរណ៍ ៖ "
-"konsole -ls) ។"
+"ចុច​ប៊ូតុង​នេះ ដើម្បី​ជ្រើសកម្មវិធីស្ថានីយ​ដែលអ្នកចូលចិត្ត ។ សូម​ចំណាំថា ដើម្បី​អាច​ទទួល​យក​បាន ឯកសារ​ដែល​អ្នក​"
+"បានជ្រើស ត្រូវ​មាន​ការ​កំណត់​គុណលក្ខណៈ​ដែល​អាច​ប្រតិបត្តិ ។ <br> សូម​ចំណាំ​ផង​ដែរ​ថា កម្មវិធី​ខ្លះដែល​ប្រើ "
+"កម្មវិធី​ស្ថានីយ នឹង​មិនធ្វើការ​ឡើយ ប្រសិនបើ​អ្នក​បន្ថែម​អាគុយម៉ង់របស់​បន្ទាត់​បញ្ជា (ឧទាហរណ៍ ៖ konsole -"
+"ls) ។"
 
 #  i18n: file terminalemulatorconfig_ui.ui line 152
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "ចុច​ទីនេះ ដើម្បី​រក​មើលកម្មវិធី​ស្ថានីយ ។"
diff --git a/tde-i18n-ko/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-ko/messages/tdebase/kcmcomponentchooser.po
index 5a28dd0dc3c..6ccabdfd05c 100644
--- a/tde-i18n-ko/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-ko/messages/tdebase/kcmcomponentchooser.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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:33+0900\n"
 "Last-Translator: Park Shinjo <peremen@gmail.com>\n"
 "Language-Team: Korean <cho.sungjae@gmail.com>\n"
@@ -23,13 +23,13 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\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"
@@ -53,8 +53,8 @@ msgstr "알 수 없음"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr "<qt>기본 구성 요소 설정을 변경했습니다. 저장하시겠습니까?</qt>"
 
 #: componentchooser.cpp:412
@@ -63,8 +63,8 @@ msgstr "설명 없음"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr "%1 서비스에서 사용할 기본 구성 요소를 선택하십시오."
 
 #: kcm_componentchooser.cpp:34
@@ -79,208 +79,179 @@ msgstr "구성 요소 선택기"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt><b>http</b>와 <b>https</b> URL을 열 때</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "URL의 내용을 기반으로 한 프로그램 사용하기"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "다음 브라우저 사용하기:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "기본 구성 요소"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"이 곳에서 구성 요소 프로그램을 변경할 수 있습니다. 구성 요소들은 터미널 에뮬레이터나 텍스트 편집기 등 기본적인 작업을 수행하는 "
-"프로그램입니다. 여러 TDE 프로그램들은 콘솔 에뮬레이터를 불러오거나 전자 우편을 보내거나, 텍스트를 표시할 수 있습니다. 이 작업을 "
-"일관성있게 하기 위해서 이들 프로그램에서는 항상 같은 구성 요소를 불러옵니다. 이 곳에서 사용할 구성 요소를 선택할 수 있습니다."
+"이 곳에서 구성 요소 프로그램을 변경할 수 있습니다. 구성 요소들은 터미널 에뮬"
+"레이터나 텍스트 편집기 등 기본적인 작업을 수행하는 프로그램입니다. 여러 TDE "
+"프로그램들은 콘솔 에뮬레이터를 불러오거나 전자 우편을 보내거나, 텍스트를 표시"
+"할 수 있습니다. 이 작업을 일관성있게 하기 위해서 이들 프로그램에서는 항상 같"
+"은 구성 요소를 불러옵니다. 이 곳에서 사용할 구성 요소를 선택할 수 있습니다."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "구성 요소 설명"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"이 곳에서 현재 선택한 구성 요소의 간단한 설명을 볼 수 있습니다. 선택한 구성 요소를 변경하려면 왼쪽에 있는 목록에서 선택하십시오. 구성 "
-"요소 프로그램을 변경하려면 아래쪽에서 선택하십시오."
+"이 곳에서 현재 선택한 구성 요소의 간단한 설명을 볼 수 있습니다. 선택한 구성 "
+"요소를 변경하려면 왼쪽에 있는 목록에서 선택하십시오. 구성 요소 프로그램을 변"
+"경하려면 아래쪽에서 선택하십시오."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>이 목록은 설정할 수 있는 구성 요소의 종류를 보여 줍니다. 설정하고 싶은 구성 요소를 선택하십시오.</p>\n"
-"<p>이 대화 상자에서 구성 요소 프로그램을 변경할 수 있습니다. 구성 요소들은 터미널 에뮬레이터나 텍스트 편집기 등 기본적인 작업을 수행하는 "
-"프로그램입니다. 여러 TDE 프로그램들은 콘솔 에뮬레이터를 불러오거나 전자 우편을 보내거나, 텍스트를 표시할 수 있습니다. 이 작업을 "
-"일관성있게 하기 위해서 이들 프로그램에서는 항상 같은 구성 요소를 불러옵니다. 이 곳에서 사용할 구성 요소를 선택할 수 있습니다.</p>\n"
+"<p>이 목록은 설정할 수 있는 구성 요소의 종류를 보여 줍니다. 설정하고 싶은 구"
+"성 요소를 선택하십시오.</p>\n"
+"<p>이 대화 상자에서 구성 요소 프로그램을 변경할 수 있습니다. 구성 요소들은 터"
+"미널 에뮬레이터나 텍스트 편집기 등 기본적인 작업을 수행하는 프로그램입니다. "
+"여러 TDE 프로그램들은 콘솔 에뮬레이터를 불러오거나 전자 우편을 보내거나, 텍스"
+"트를 표시할 수 있습니다. 이 작업을 일관성있게 하기 위해서 이들 프로그램에서"
+"는 항상 같은 구성 요소를 불러옵니다. 이 곳에서 사용할 구성 요소를 선택할 수 "
+"있습니다.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: 받는 사람 주소</li> "
-"<li>%s: 제목</li> "
-"<li>%c: 참조 주소(CC)</li> "
-"<li>%b: 숨은 참조 주소(BCC)</li> "
-"<li>%B: 편지 본문</li> "
-"<li>%A: 첨부 파일</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: 받는 사람 주소</li> <li>%s: 제목</li> <li>%c: 참조 주소(CC)</"
+"li> <li>%b: 숨은 참조 주소(BCC)</li> <li>%B: 편지 본문</li> <li>%A: 첨부 파일"
+"</li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"이 단추를 눌러서 좋아하는 전자 우편 클라이언트를 선택하십시오. 이것은 실행 가능한 파일이어야 합니다."
-"<br>몇몇 자리 비움 문자열을 사용하면 전자 우편 클라이언트를 실행할 때 실제 값으로 대체됩니다. "
-"<ul> "
-"<li>%t: 받는 사람 주소</li> "
-"<li>%s: 제목</li> "
-"<li>%c: 참조 주소(CC)</li> "
-"<li>%b: 숨은 참조 주소(BCC)</li> "
-"<li>%B: 편지 본문</li> "
-"<li>%A: 첨부할 파일</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"이 단추를 눌러서 좋아하는 전자 우편 클라이언트를 선택하십시오. 이것은 실행 가"
+"능한 파일이어야 합니다.<br>몇몇 자리 비움 문자열을 사용하면 전자 우편 클라이"
+"언트를 실행할 때 실제 값으로 대체됩니다. <ul> <li>%t: 받는 사람 주소</li> "
+"<li>%s: 제목</li> <li>%c: 참조 주소(CC)</li> <li>%b: 숨은 참조 주소(BCC)</"
+"li> <li>%B: 편지 본문</li> <li>%A: 첨부할 파일</li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "전자 우편 프로그램 파일을 찾아 보시려면 여기를 누르십시오."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "터미널에서 실행(&R)"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
-msgstr "이 설정을 사용하면 전자 우편 클라이언트를 터미널에서 실행시합니다. (예: <em>Konsole</em>)"
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
+msgstr ""
+"이 설정을 사용하면 전자 우편 클라이언트를 터미널에서 실행시합니다. (예: "
+"<em>Konsole</em>)"
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "KMail을 전자 우편 클라이언트로 사용하기(&U)"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail은 TDE 데스크톱의 기본 전자 우편 프로그램입니다."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "다른 전자 우편 클라이언트 사용하기(&E):"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "다른 전자 우편 프로그램을 사용하시려면 이 설정을 사용하십시오."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "다른 터미널 프로그램 사용하기(&T):"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Konsole을 터미널 프로그램으로 사용하기(&U)"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"이 단추를 눌러서 좋아하는 터미널 클라이언트를 선택하십시오. 이것은 실행 가능한 파일이어야 합니다."
-"<br>터미널 에뮬레이터를 사용하는 일부 프로그램들은 명령행 인자가 추가되었을 때 실행되지 않을 수 있습니다. (예: konsole -ls)"
+"이 단추를 눌러서 좋아하는 터미널 클라이언트를 선택하십시오. 이것은 실행 가능"
+"한 파일이어야 합니다.<br>터미널 에뮬레이터를 사용하는 일부 프로그램들은 명령"
+"행 인자가 추가되었을 때 실행되지 않을 수 있습니다. (예: konsole -ls)"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "터미널 프로그램을 찾으려면 누르십시오."
diff --git a/tde-i18n-lt/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-lt/messages/tdebase/kcmcomponentchooser.po
index af4d14c7a97..60f008d36b9 100644
--- a/tde-i18n-lt/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-lt/messages/tdebase/kcmcomponentchooser.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-23 08:32+0200\n"
 "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -13,19 +13,19 @@ 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%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"
 "(n%100<10 || n%100>=20) ? 1 : 2);\n"
 "(n%100<10 || n%100>=20) ? 1 : 2);\n"
 "(n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Ričardas Čepas,Donatas Glodenis"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -49,8 +49,8 @@ msgstr "Nežinoma"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Jūs pakeitėte numatyto komponento pasirinkim. Ar norite išsaugoti "
 "pakeitimą?</qt>"
@@ -61,8 +61,8 @@ msgstr "Nėra aprašymo"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Pasirinkite iš sąrašo žemiau, kuris komponentas turėtų būti naudojamas kaip "
 "numatytas %1 tarnybai."
@@ -79,225 +79,185 @@ msgstr "Komponento parinkėjas"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "©, 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Atverti <b>http</b> ir <b>https</b> URL</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "programoje atsižvelgiant į URL turinį"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "šioje naršyklėje:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Numatytas komponentas"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Čia galite pakeisti komponentų programą. Komponentai yra programos, kurios "
 "atlieka pagrindines užduotis,  tokios, kaip terminalo emuliatorius, teksto "
 "redaktorius ir e. pašto klientas. Skirtingos TDE programos kartais naudoja "
-"konsolės emuliatorių, siunčia paštą ar rodo kokį nors tekstą.iekiant išlaikyti "
-"nuoseklumą, šios programos visuomet iškviečia tuos pačius komponentus. Čia "
-"galite nurodyti, kokios programos atlieka šių komponentų funkcijas."
+"konsolės emuliatorių, siunčia paštą ar rodo kokį nors tekstą.iekiant "
+"išlaikyti nuoseklumą, šios programos visuomet iškviečia tuos pačius "
+"komponentus. Čia galite nurodyti, kokios programos atlieka šių komponentų "
+"funkcijas."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Komponento aprašymas"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Čia galite perskaityti trumpą pažymėto komponento apibūdinimą. Norėdami "
 "pasirinkti kitą komponentą, spragtelėkite sąraše kairiau. Norėdami pakeisti "
 "komponento programą, pasirinkite ją žemiau."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>Šiame sąraše matote konfigūruojamus komponentų tipus.</p>\n"
-"<p>Šiame dialoge galite pakeisti standartinius TDE komponentus. Komponentai yra "
-"programos, kurios atlieka pagrindines užduotis, tokias, kaip terminalo "
-"emuliatorius, teksto redaktorius ir e. pašto klientas. Skirtingos TDE programos "
-"kartais naudoja konsolės emuliatorių, siunčia paštą ar rodo kokį nors tekstą. "
-"Siekiant išlaikyti nuoseklumą, šios programos visuomet iškviečia tuos pačius "
-"komponentus. Čia galite nurodyti, kokios programos atlieka šių komponentų "
-"funkcijas.</p>\n"
+"<p>Šiame dialoge galite pakeisti standartinius TDE komponentus. Komponentai "
+"yra programos, kurios atlieka pagrindines užduotis, tokias, kaip terminalo "
+"emuliatorius, teksto redaktorius ir e. pašto klientas. Skirtingos TDE "
+"programos kartais naudoja konsolės emuliatorių, siunčia paštą ar rodo kokį "
+"nors tekstą. Siekiant išlaikyti nuoseklumą, šios programos visuomet "
+"iškviečia tuos pačius komponentus. Čia galite nurodyti, kokios programos "
+"atlieka šių komponentų funkcijas.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Gavėjo adresas</li> "
-"<li>%s: Tema</li> "
-"<li>%c:  Kopija (CC)</li> "
-"<li>%b: Slapta kopija (BCC)</li> "
-"<li>%B: Šablono laiško tekstas</li> "
-"<li>%A: Priesaga </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Gavėjo adresas</li> <li>%s: Tema</li> <li>%c:  Kopija (CC)</li> "
+"<li>%b: Slapta kopija (BCC)</li> <li>%B: Šablono laiško tekstas</li> <li>%A: "
+"Priesaga </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Paspauskite šį mygtuką pageidautino e. pašto kliento pasirinkimui.  Atkreipkite "
-"dėmesį, kad pasirinkta byla turi turėti nustatytus vykdymo atributus, kad būtų "
-"priimta."
-"<br> Jūs taip pat galite naudoti keletą pamainymų, kurie bus pakeisti "
-"konkrečiomis reikšmėmis iškviečiant pašto klientą: "
-"<ul> "
-"<li>%t: Gavėjo adresas</li> "
-"<li>%s: Tema</li> "
-"<li>%c:  Kopija (CC)</li> "
-"<li>%b: Slapta kopija (BCC)</li> "
-"<li>%B: Šablono laiško tekstas</li> "
-"<li>%A: Priesaga </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Paspauskite šį mygtuką pageidautino e. pašto kliento pasirinkimui.  "
+"Atkreipkite dėmesį, kad pasirinkta byla turi turėti nustatytus vykdymo "
+"atributus, kad būtų priimta.<br> Jūs taip pat galite naudoti keletą "
+"pamainymų, kurie bus pakeisti konkrečiomis reikšmėmis iškviečiant pašto "
+"klientą: <ul> <li>%t: Gavėjo adresas</li> <li>%s: Tema</li> <li>%c:  Kopija "
+"(CC)</li> <li>%b: Slapta kopija (BCC)</li> <li>%B: Šablono laiško tekstas</"
+"li> <li>%A: Priesaga </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Spragtelėkite čia norėdami naršydami surasti pašto programos bylą."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Leisti terminale"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Įjunkite šią parinktį, jei norite, kad pasirinktas pašto klientas būtų "
 "paleidžiamas terminale (pvz. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Naudoti KMail kaip pageidautiną pašto klientą"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail yra standartinė TDE darbastalio pašto programa."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Naudoti &kitą pašto klientą:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Pažymėkite šią parinktį jei norite naudoti kitą pašto programą."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Naudoti kitą &terminalo programą:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Naudoti &Konsole kaip terminalo programą"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Spustelėkite šį mygtuką norėdami nurodyti savo mėgstamiausią terminalo klientą. "
-"Prašome atkreipti dėmesį, kad byla, kurią pažymėsite, turi būti vykdoma, "
-"antraip jos pasirinkti nebus leista. "
-"<br> Taip pat atkreipkite dėmesį, kad kai kurios programos, naudojančios "
-"Terminalo emuliatorių neveiks, jei nurodysite komandų eilutės argumentus (pvz., "
-"konsole -ls)."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"Spustelėkite šį mygtuką norėdami nurodyti savo mėgstamiausią terminalo "
+"klientą. Prašome atkreipti dėmesį, kad byla, kurią pažymėsite, turi būti "
+"vykdoma, antraip jos pasirinkti nebus leista. <br> Taip pat atkreipkite "
+"dėmesį, kad kai kurios programos, naudojančios Terminalo emuliatorių "
+"neveiks, jei nurodysite komandų eilutės argumentus (pvz., konsole -ls)."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Spragtelėkite čia norėdami naršydami surasti terminalo programą."
diff --git a/tde-i18n-mk/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-mk/messages/tdebase/kcmcomponentchooser.po
index 89b6af06f84..5810ac77f71 100644
--- a/tde-i18n-mk/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-mk/messages/tdebase/kcmcomponentchooser.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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 11:53+0100\n"
 "Last-Translator: Bozidar Proevski <bobibobi@freemail.com.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -17,13 +17,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"
@@ -47,11 +47,11 @@ msgstr "Непозната"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Ја променивте вашата почетна избрана компонента. Дали сакате да ја зачувате "
-"оваа промена?</qt>"
+"<qt>Ја променивте вашата почетна избрана компонента. Дали сакате да ја "
+"зачувате оваа промена?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -59,11 +59,11 @@ msgstr "Нема достапен опис"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Изберете од листата подолу која компонента треба да се користи како стандардна "
-"за сервисот %1."
+"Изберете од листата подолу која компонента треба да се користи како "
+"стандардна за сервисот %1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -77,228 +77,188 @@ msgstr "Избирач на компоненти"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Отвори <b>http</b> и <b>https</b> URL</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "во апликација базирана на содржината на URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "во следниот прелистувач:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Стандардна компонента"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Тука може да ја измените програмата - компонента. Компонентите се програми кои "
-"ракуваат со основни задачи, како што е терминалниот емулатор, уредувачот на "
-"текст и клиентот за е-пошта. Различни TDE апликации понекогаш треба да повикаат "
-"емулатор на конзола, да испратат пошта или да прикажат некој текст. За да го "
-"прават ова конзистентно, овие апликации треба секогаш да ги повикуваат истите "
-"компоненти. Тука може да изберете кои програми ќе бидат тие компоненти."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"Тука може да ја измените програмата - компонента. Компонентите се програми "
+"кои ракуваат со основни задачи, како што е терминалниот емулатор, уредувачот "
+"на текст и клиентот за е-пошта. Различни TDE апликации понекогаш треба да "
+"повикаат емулатор на конзола, да испратат пошта или да прикажат некој текст. "
+"За да го прават ова конзистентно, овие апликации треба секогаш да ги "
+"повикуваат истите компоненти. Тука може да изберете кои програми ќе бидат "
+"тие компоненти."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Опис на компонентата"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Тука може да прочитате мал опис на тековно избраната компонента. За да ја "
 "смените избраната компонента, кликнете на листата одлево. За да ја смените "
 "програмата - компонента, изберете ја подолу."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>Оваа листа ги покажува типовите на конфигурабилни компоненти. Кликнете на "
 "компонентата која сакате да ја конфигурирате.</p>\n"
-"<p>Во овој дијалог може да ги смените почетните TDE компоненти. Компонентите се "
-"програми кои ракуваат со основни задачи, како што е терминалниот емулатор, "
-"уредувачот на текст и клиентот за е-пошта. Различни TDE апликации понекогаш "
-"треба да повикаат емулатор на конзола, да испратат пошта или да прикажат некој "
-"текст. За да го прават ова конзистентно, овие апликации треба секогаш да ги "
-"повикуваат истите компоненти. Тука може да изберете кои програми ќе бидат тие "
-"компоненти.</p>\n"
+"<p>Во овој дијалог може да ги смените почетните TDE компоненти. Компонентите "
+"се програми кои ракуваат со основни задачи, како што е терминалниот "
+"емулатор, уредувачот на текст и клиентот за е-пошта. Различни TDE апликации "
+"понекогаш треба да повикаат емулатор на конзола, да испратат пошта или да "
+"прикажат некој текст. За да го прават ова конзистентно, овие апликации треба "
+"секогаш да ги повикуваат истите компоненти. Тука може да изберете кои "
+"програми ќе бидат тие компоненти.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Адреса на примачот</li> "
-"<li>%s: Тема</li> "
-"<li>%c: Идентична копија (CC)</li> "
-"<li>%b: Слепа идентична копија (BCC)</li> "
-"<li>%B: Шаблон за текст</li> "
-"<li>%A: Додаток </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Адреса на примачот</li> <li>%s: Тема</li> <li>%c: Идентична "
+"копија (CC)</li> <li>%b: Слепа идентична копија (BCC)</li> <li>%B: Шаблон за "
+"текст</li> <li>%A: Додаток </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Притиснете на ова копче за да го изберете вашиот омилен клиент за е-пошта. "
-"Забележете дека дека датотеката што ќе ја изберете мора да има извршен атрибут "
-"за да биде прифатена."
-"<br>Исто така може да користите неколку вредности кои ќе бидат заменети со "
-"актуените вредности кога ќе се повика клиентот за е-пошта:"
-"<ul> "
-"<li>%t: Адреса на примачот</li> "
-"<li>%s: Тема</li> "
-"<li>%c: Идентична копија (CC)</li> "
-"<li>%b: Слепа идентична копија (BCC)</li> "
-"<li>%B: Шаблон за текст</li> "
-"<li>%A: Додаток </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Забележете дека дека датотеката што ќе ја изберете мора да има извршен "
+"атрибут за да биде прифатена.<br>Исто така може да користите неколку "
+"вредности кои ќе бидат заменети со актуените вредности кога ќе се повика "
+"клиентот за е-пошта:<ul> <li>%t: Адреса на примачот</li> <li>%s: Тема</li> "
+"<li>%c: Идентична копија (CC)</li> <li>%b: Слепа идентична копија (BCC)</li> "
+"<li>%B: Шаблон за текст</li> <li>%A: Додаток </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Кликнете тука за да прелистате за програмската датотеката за е-пошта."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Изв&рши во терминал"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Изберете ја оваа опција ако сакате вашиот клиент за е-пошта да се извршува во "
-"терминал (на пр. <em>Конзола</em>)."
+"Изберете ја оваа опција ако сакате вашиот клиент за е-пошта да се извршува "
+"во терминал (на пр. <em>Конзола</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Користи го KMail како претпочитан клиент за е-пошта"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail е стандардната е-поштенска програма за работната околина TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Користи друг клиент за &е-пошта:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Изберете ја оваа опција ако сакате да користите некоја друга е-поштенска "
 "програма."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Користи друга &терминалска програма:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Користи ја Конзолата како терминалска апликација"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Притиснете го ова копче за да го изберете вашиот омилен терминалски клиент. "
-"Забележете дека дека датотеката што ќе ја изберете мора да има извршен атрибут "
-"за да биде прифатена."
-"<br> Изто така забележете дека некои програми кои го користат терминалниот "
-"емулатор нема да работат ако додатете аргументи на командната линија (на "
-"пример: konsole -ls)."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"Забележете дека дека датотеката што ќе ја изберете мора да има извршен "
+"атрибут за да биде прифатена.<br> Изто така забележете дека некои програми "
+"кои го користат терминалниот емулатор нема да работат ако додатете аргументи "
+"на командната линија (на пример: konsole -ls)."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Кликнете тука за да прелистате за терминалска програма."
diff --git a/tde-i18n-mn/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-mn/messages/tdebase/kcmcomponentchooser.po
index d4b826c5b08..f55ae2bda23 100644
--- a/tde-i18n-mn/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-mn/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2003-07-01 23:44+0200\n"
 "Last-Translator: Sanlig Badral <badral@users.sf.net>\n"
 "Language-Team: Mongolian <openmn-kdemn@lists.sourceforge.net>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.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"
@@ -47,8 +47,8 @@ msgstr "Тодорхойгүй"
 #: componentchooser.cpp:408
 #, fuzzy
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Та стандарт бүрэлдхүүн өөрчилжээ. Та шинэ тохируулгаа хадгалахыг хүсэж "
 "байна уу?<BR><BR>Хэрвээ та <B>Үгүй</B> сонговол, өөрийн өөрчилөлтийг үл "
@@ -60,8 +60,8 @@ msgstr "Ямар ч тодохойлолт алга"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Доод жигсаалтаас та %1 даалгаварын хувьд стандарт бүрэлдхүүнийг сонгоно уу."
 
@@ -77,199 +77,159 @@ msgstr "Бүрэлдхүүн Сонголт"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c) 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr ""
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr ""
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr ""
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Стандарт Бүрэлдхүүн"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Бүрэлдхүүний тодорхойлолт"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Хүлээн авагчийн хаяг</li> "
-"<li>%s: Сэдэв</li> "
-"<li>%c: Хуулбар (CC)</li> "
-"<li>%b: Сохор хуулбар (BCC)</li> "
-"<li>%B: Текст загвар</li> "
-"<li>%A: Хавсаргалт </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Хүлээн авагчийн хаяг</li> <li>%s: Сэдэв</li> <li>%c: Хуулбар "
+"(CC)</li> <li>%b: Сохор хуулбар (BCC)</li> <li>%B: Текст загвар</li> <li>%A: "
+"Хавсаргалт </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Та өөрийн эрхэмлэсэн захиа-програм сонгохдоо энэ товчин дээр дарна уу. Та "
-"ажилуулж болох файлыг авч үзэх ёстойг анхаарна уу."
-"<br>Та үүнээс гадна захиа-програм эхлэнгүүт идэвхитэй утгаар бөглөгдөх "
-"янзбүрийн өнгө хэрэглэж болно:"
-"<ul>"
-"<li>%t: Хүлээн авагчийн хаяг</li> "
-"<li>%s: Сэдэв</li> "
-"<li>%c: Хуулбар (CC)</li> "
-"<li>%b: Сохор хуулбар (BCC)</li> "
-"<li>%B: Текст загвар</li> "
-"<li>%A: Хавсаргалт </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"ажилуулж болох файлыг авч үзэх ёстойг анхаарна уу.<br>Та үүнээс гадна захиа-"
+"програм эхлэнгүүт идэвхитэй утгаар бөглөгдөх янзбүрийн өнгө хэрэглэж болно:"
+"<ul><li>%t: Хүлээн авагчийн хаяг</li> <li>%s: Сэдэв</li> <li>%c: Хуулбар "
+"(CC)</li> <li>%b: Сохор хуулбар (BCC)</li> <li>%B: Текст загвар</li> <li>%A: "
+"Хавсаргалт </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Терминалд ажиллуулах"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Хэрвээ та сонгосон захиа-програмыг тушаалын цонхонд (<em>Консол</em> "
-"шиг терминал програмууд) ажилуулахыг хүсвэл энэ тохируулгыг идэвхижүүлнэ үү."
+"Хэрвээ та сонгосон захиа-програмыг тушаалын цонхонд (<em>Консол</em> шиг "
+"терминал програмууд) ажилуулахыг хүсвэл энэ тохируулгыг идэвхижүүлнэ үү."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&KMail-г эрхэмлэсэн захиа-програмаар авах"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Өөр &Захиа-програм хэрэглэх:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Өөр &Терминал-програм хэрэглэх:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "К&онсолыг терминал програмаар хэрэглэх"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr ""
diff --git a/tde-i18n-ms/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-ms/messages/tdebase/kcmcomponentchooser.po
index 1184c36089c..a3821bc4364 100644
--- a/tde-i18n-ms/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-ms/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-11 22:23+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -15,13 +15,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"
@@ -45,11 +45,11 @@ msgstr "Tidak Diketahui"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Anda telah mengubah komponen piawai menurut pilihan anda. Adakah anda ingin "
-"simpan perubahan itu sekarang?</qt>"
+"<qt>Anda telah mengubah komponen piawai menurut pilihan anda. Adakah anda "
+"ingin simpan perubahan itu sekarang?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -57,11 +57,11 @@ msgstr "Tidak keterangan didapati"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Pilih dari senarai di bawah komponen mana yang patut dijadikan sebagai default "
-"untuk servis %1."
+"Pilih dari senarai di bawah komponen mana yang patut dijadikan sebagai "
+"default untuk servis %1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -75,85 +75,77 @@ msgstr "Pemilih Komponen"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Buka URL <b>http</b> dan <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "dalam aplikasi berdasarkan kandungan URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "dalam pelayar berikut:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Komponen Default"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Disini anda boleh menukar program komponen. Komponen adalah program yang "
 "mengendali tugas asas, seperti emulator terminal, penyunting teks dan klien "
-"emel. Aplikasi TDE berlainan kadangkala perlu untuk memulakan emulator konsol, "
-"menghantar emel atau memaparkan beberapa teks. Untuk melakukannya dengan "
-"konsisten, aplikasi ini sentiasa memanggil komponen yang sama. Anda boleh "
-"memilih disini program yang mana adalah komponen tersebut."
+"emel. Aplikasi TDE berlainan kadangkala perlu untuk memulakan emulator "
+"konsol, menghantar emel atau memaparkan beberapa teks. Untuk melakukannya "
+"dengan konsisten, aplikasi ini sentiasa memanggil komponen yang sama. Anda "
+"boleh memilih disini program yang mana adalah komponen tersebut."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Huraian Komponen"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Disini anda boleh membaca penerangan ringkas bagi komponen yang sedang dipilih. "
-"Untuk menukar komponen dipilih, klik pada senarai disebelah kiri. Untuk menukar "
-"program komponen, sila pilih dibawah."
+"Disini anda boleh membaca penerangan ringkas bagi komponen yang sedang "
+"dipilih. Untuk menukar komponen dipilih, klik pada senarai disebelah kiri. "
+"Untuk menukar program komponen, sila pilih dibawah."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
@@ -167,133 +159,101 @@ msgstr ""
 "program mana yang membentuk komponen ini.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Alamat penerima</li> "
-"<li>%s: Subjek</li> "
-"<li>%c: Salinan Karbon (CC)</li> "
-"<li>%b: Salinan Karbon Blind (BCC)</li> "
-"<li>%B: Teks Templat Badan </li> "
-"<li>%A: Lampiran </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Alamat penerima</li> <li>%s: Subjek</li> <li>%c: Salinan Karbon "
+"(CC)</li> <li>%b: Salinan Karbon Blind (BCC)</li> <li>%B: Teks Templat Badan "
+"</li> <li>%A: Lampiran </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Tekan butang ini untuk memilih klien emel kesukaan anda. SIla ambil perhatian "
-"bahawa fail yang anda pilih hendaklah mempunyai set atribut boleh laksana "
-"sebelum diterima. "
-"<br> Anda boleh gunakan beberapa cara yang membolehkan gantian dengan nilai "
-"sebenar apabila klien emel dipanggil:"
-"<ul> "
-"<li>%t: Alamat penerima </li> "
-"<li>%s: Subjek</li> "
-"<li>%c: Salinan Karbon (CC)</li> "
-"<li>%b: Salinan Karbon Blind (BCC)</li> "
-"<li>%B: Teks Templat Badan</li> "
-"<li>%A: Lampiran </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Tekan butang ini untuk memilih klien emel kesukaan anda. SIla ambil "
+"perhatian bahawa fail yang anda pilih hendaklah mempunyai set atribut boleh "
+"laksana sebelum diterima. <br> Anda boleh gunakan beberapa cara yang "
+"membolehkan gantian dengan nilai sebenar apabila klien emel dipanggil:<ul> "
+"<li>%t: Alamat penerima </li> <li>%s: Subjek</li> <li>%c: Salinan Karbon "
+"(CC)</li> <li>%b: Salinan Karbon Blind (BCC)</li> <li>%B: Teks Templat "
+"Badan</li> <li>%A: Lampiran </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Klik disini untuk melayari untuk fail program mel."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Laksana pada te&rminal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Aktifkan pilihan ini jika anda mahu klien emel dipilih untuk dilaksanakan di "
 "terminal (spt. <em> Konsole</em> )."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "G&una KMail sebagai klien emel utama"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail adalah program Mel standard untuk desktop TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Guna kli&en email berlainan:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Pilih pilihan ini jika anda mahu menggunakan sebarang program mel lain."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Guna program &terminal berlainan:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "G&una Konsole sebagai aplikasi terminal"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Tekan butang ini untuk memilih klien terminal kegemaran anda. Perhatikan bahawa "
-"fail yang anda pilih perlu ada set atribut boleh laksana agar diterima."
-"<br> Perhatikan juga bahawa sesetengah program yang menggunakan Pelagak "
-"Terminal tidak akan berfungsi jika anda tambah argumen baris arahan (Contoh: "
-"konsole -Is)."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"Tekan butang ini untuk memilih klien terminal kegemaran anda. Perhatikan "
+"bahawa fail yang anda pilih perlu ada set atribut boleh laksana agar "
+"diterima.<br> Perhatikan juga bahawa sesetengah program yang menggunakan "
+"Pelagak Terminal tidak akan berfungsi jika anda tambah argumen baris arahan "
+"(Contoh: konsole -Is)."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Klik disini untuk melayari program terminal."
diff --git a/tde-i18n-nb/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-nb/messages/tdebase/kcmcomponentchooser.po
index 533b785ff3f..15e8a026138 100644
--- a/tde-i18n-nb/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-nb/messages/tdebase/kcmcomponentchooser.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-25 22:02+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\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 "Knut Yrvin"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -49,8 +49,8 @@ msgstr "Ukjent"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Standardkomponenten du valgte er endret. Skal endringa lagres nå?</qt>"
 
@@ -60,8 +60,8 @@ msgstr "Ingen beskrivelse er tilgjengelig"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Velg fra lista nedenfor hvilke komponenter som skal brukes som standard for "
 "tjenesten %1."
@@ -78,222 +78,182 @@ msgstr "Komponentvelger"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Åpne <b>http</b> og <b>https</b> nettadresser</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "med et program basert på innholdet i nettadressen"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "i følgende nettleser:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr " …"
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Standardkomponent"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Her kan du endre komponentprogrammet. Komponenter er programmer som håndterer "
-"grunnleggende oppgaver, slik som terminalprogram, skriveprogram og "
+"Her kan du endre komponentprogrammet. Komponenter er programmer som "
+"håndterer grunnleggende oppgaver, slik som terminalprogram, skriveprogram og "
 "e-postprogram. Forskjellige TDE-programmer trenger noen ganger å starte et "
-"konsoll, sende en e-post eller vise noe tekst. For å gjøre det på samme måte, "
-"vil disse programmene alltid hente fram de samme komponentene. Du kan velge her "
-"hvilke programmer disse komponentene er."
+"konsoll, sende en e-post eller vise noe tekst. For å gjøre det på samme "
+"måte, vil disse programmene alltid hente fram de samme komponentene. Du kan "
+"velge her hvilke programmer disse komponentene er."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Komponentbeskrivelse"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Her kan du lese en liten beskrivelse av den valgte komponenten. Trykk på lista "
-"til venstre for å endre den valgte komponenten. Velg komponentprogrammet "
-"nedenfor for å endre det."
+"Her kan du lese en liten beskrivelse av den valgte komponenten. Trykk på "
+"lista til venstre for å endre den valgte komponenten. Velg "
+"komponentprogrammet nedenfor for å endre det."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p> Denne lista viser komponenttypene som kan tilpasses. Trykk på komponentene "
-"du vil tilpasse.</p>\n"
+"<p> Denne lista viser komponenttypene som kan tilpasses. Trykk på "
+"komponentene du vil tilpasse.</p>\n"
 "<p>I dette dialogvinduet kan du endre hva som er standardkomponenter i TDE. "
 "Komponenter er programmer som håndterer grunnleggende oppgaver, slik som "
 "terminalprogram, skriveprogram og e-postprogram. Noen TDE-programmer trenger "
-"noen ganger å starte et konsoll, sende en e-post eller vise litt tekst. For å "
-"gjøre det på samme måte, vil disse programmene alltid bruke de samme "
+"noen ganger å starte et konsoll, sende en e-post eller vise litt tekst. For "
+"å gjøre det på samme måte, vil disse programmene alltid bruke de samme "
 "komponentene. Du kan velge her hvilke programmer disse komponentene er.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Mottakeradresse</li> "
-"<li>%s: Emne</li> "
-"<li>%c: Kopi (CC)</li> "
-"<li>%b: Blindkopi (BCC)</li> "
-"<li>%B: Meldingstekst </li> "
-"<li>%A: Vedlegg </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Mottakeradresse</li> <li>%s: Emne</li> <li>%c: Kopi (CC)</li> "
+"<li>%b: Blindkopi (BCC)</li> <li>%B: Meldingstekst </li> <li>%A: Vedlegg </"
+"li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Trykk denne knappen for å velge hvilket e-postprogram du foretrekker. Merk at "
-"fila du velger må være kjørbar for å bli godtatt."
-"<br>Du kan også bruke ulike plassholdere som erstattes av følgende verdier når "
-"e-postprogrammet blir startet:"
-"<ul> "
-"<li>%t: Mottakeradresse</li> "
-"<li>%s: Emne</li> "
-"<li>%c: Kopi (CC)</li> "
-"<li>%b: Blindkopi (BCC)</li> "
-"<li>%B: Meldingstekst </li> "
-"<li>%A: Vedlegg </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Trykk denne knappen for å velge hvilket e-postprogram du foretrekker. Merk "
+"at fila du velger må være kjørbar for å bli godtatt.<br>Du kan også bruke "
+"ulike plassholdere som erstattes av følgende verdier når e-postprogrammet "
+"blir startet:<ul> <li>%t: Mottakeradresse</li> <li>%s: Emne</li> <li>%c: "
+"Kopi (CC)</li> <li>%b: Blindkopi (BCC)</li> <li>%B: Meldingstekst </li> <li>"
+"%A: Vedlegg </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Trykk her for å lete etter e-postprogrammet."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Kjør i terminal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Bruk dette valget om du vil at e-postprogrammet skal kjøres i et skall (f eks "
-"<em>Konsole</em>)."
+"Bruk dette valget om du vil at e-postprogrammet skal kjøres i et skall (f "
+"eks <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Bruk KMail som ønsket e-postprogram"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail er standardprogrammet for e-post i TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Bruk et annet &e-postprogram:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Velg dette alternativet hvis du vil bruke et annet e-postprogram."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Bruk et annet &skall:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Bruk Konsoll som skall"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Bruk denne knappen for å velge det skallet du vil bruke. Merk at den fila du "
-"velger må være kjørbar for å bli godtatt. "
-"<br>Merk også at noen programmer som bruker et skall ikke virker dersom du "
-"legger til argumenter på kommandolinja (f eks «konsole -ls»)."
+"velger må være kjørbar for å bli godtatt. <br>Merk også at noen programmer "
+"som bruker et skall ikke virker dersom du legger til argumenter på "
+"kommandolinja (f eks «konsole -ls»)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Trykk her for å lete etter skall-programmet."
diff --git a/tde-i18n-nds/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-nds/messages/tdebase/kcmcomponentchooser.po
index 1dc0a56bb6a..b434473eb85 100644
--- a/tde-i18n-nds/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-nds/messages/tdebase/kcmcomponentchooser.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-26 11:59+0100\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\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 "Sönke Dibbern"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -46,10 +46,11 @@ msgstr "Nich bekannt"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Du hest Dien Standardkomponent ännert. Wullt Du disse Ännern nu sekern?</qt>"
+"<qt>Du hest Dien Standardkomponent ännert. Wullt Du disse Ännern nu sekern?</"
+"qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -57,8 +58,8 @@ msgstr "Keen Beschrieven verföögbor"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Söök ut de List ut, welk Komponent standardwies för den Deenst \"%1\" bruukt "
 "warrt."
@@ -75,223 +76,184 @@ msgstr "Komponent utsöken"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Maak <b>http</b>- un <b>htpps</b>-Adressen (URLs) op</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "mit en Programm, dat na de Inhollen vun de Adress utwählt warrt"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "mit dissen Nettkieker:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Standardkomponent"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Hier kannst Du de Komponenten fastleggen. Komponenten sünd Programmen, de faken "
-"bruukte Opgaven övernehmt, as de Terminalemulator, de Texteditor un dat "
-"Nettpostprogramm. En Reeg TDE-Programmen mööt af un an maal en Terminalemulator "
-"opropen, en Nettbreef sennen oder en beten Text dorstellen. Dormit dat eenfach "
-"blifft, schöölt se jümmers de sülven Programmen bruken. Du kannst hier disse "
-"Komponentprogrammen utsöken."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"Hier kannst Du de Komponenten fastleggen. Komponenten sünd Programmen, de "
+"faken bruukte Opgaven övernehmt, as de Terminalemulator, de Texteditor un "
+"dat Nettpostprogramm. En Reeg TDE-Programmen mööt af un an maal en "
+"Terminalemulator opropen, en Nettbreef sennen oder en beten Text dorstellen. "
+"Dormit dat eenfach blifft, schöölt se jümmers de sülven Programmen bruken. "
+"Du kannst hier disse Komponentprogrammen utsöken."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Komponentbeschrieven"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Hier kannst Du en korte Beschrieven för de aktuell utsöchte Komponent lesen. "
 "Wenn Du en anner Komponent utsöken wullt, klick linkerhand op en Listindrag. "
 "Wenn Du dat bruukte Programm ännern wullt, söök dat nerrn ut."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>Disse List wiest de Komponenten, de instellt warrn köönt. Klick op de "
 "Komponent, de Du ännern wullt.</p>\n"
-"<p>Mit dissen Dialoog kannst Du de TDE-Standardkomponenten ännern. Komponenten "
-"sünd Programmen, de faken bruukte Opgaven övernehmt, as de Terminalemulator, "
-"dat Nettpostprogramm un de Texteditor. En Reeg TDE-Programmen mööt af un an "
-"maal en Terminalemulator opropen, en Nettbreef sennen oder en beten Text "
-"dorstellen. Dormit dat eenfach blifft, schöölt se jümmers de sülven Programmen "
-"bruken. Du kannst hier disse Komponentprogrammen utsöken.</p>\n"
+"<p>Mit dissen Dialoog kannst Du de TDE-Standardkomponenten ännern. "
+"Komponenten sünd Programmen, de faken bruukte Opgaven övernehmt, as de "
+"Terminalemulator, dat Nettpostprogramm un de Texteditor. En Reeg TDE-"
+"Programmen mööt af un an maal en Terminalemulator opropen, en Nettbreef "
+"sennen oder en beten Text dorstellen. Dormit dat eenfach blifft, schöölt se "
+"jümmers de sülven Programmen bruken. Du kannst hier disse "
+"Komponentprogrammen utsöken.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Adressaat</li> "
-"<li>%s: Bedröppt</li> "
-"<li>%c: Kopie (CC)</li> "
-"<li>%b: Blindkopie (BCC)</li> "
-"<li>%B: Textvörlaag</li> "
-"<li>%A: Bilaag </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Adressaat</li> <li>%s: Bedröppt</li> <li>%c: Kopie (CC)</li> "
+"<li>%b: Blindkopie (BCC)</li> <li>%B: Textvörlaag</li> <li>%A: Bilaag </li> "
+"</ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Drück op dissen Knoop, wenn Du Dien vörtrocken Nettpostprogramm fastleggen "
 "wullt. Bitte beacht, dat de utsöchte Datei de Utföhrbor-Mark hebben mutt."
 "<br> Du kannst en Reeg Platzhollers bruken, för de bi't Opropen vun dat "
-"Nettpostprogramm Weerten inföögt warrt:"
-"<ul> "
-"<li>%t: Adressaat</li> "
-"<li>%s: Bedröppt</li> "
-"<li>%c: Kopie (CC)</li> "
-"<li>%b: Blindkopie (BCC)</li> "
-"<li>%B: Textvörlaag</li> "
-"<li>%A: Bilaag </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Nettpostprogramm Weerten inföögt warrt:<ul> <li>%t: Adressaat</li> <li>%s: "
+"Bedröppt</li> <li>%c: Kopie (CC)</li> <li>%b: Blindkopie (BCC)</li> <li>%B: "
+"Textvörlaag</li> <li>%A: Bilaag </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr ""
 "Klick hier, wenn Du in't Dateisysteem na de utföhrbore Datei kieken wullt."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "In en &Terminal starten"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Aktiveer dit, wenn dat utsöchte Nettpostprogramm op en Terminal (t.B. <em>"
-"Konsole</em>) utföhrt warrn schall."
+"Aktiveer dit, wenn dat utsöchte Nettpostprogramm op en Terminal (t.B. "
+"<em>Konsole</em>) utföhrt warrn schall."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "KMail as vörtrocken Nettpostprogramm br&uken"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail is dat Standard-Nettpostprogramm vun TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "En anner N&ettpostprogramm bruken:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Aktiveer dit, wenn Du jichtenseen anner Nettpostprogramm bruken wullt."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "En anner &Terminalprogramm bruken:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Konsole as vörtrocken Terminalprogramm br&uken"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Drück op dissen Knoop, wenn Du Dien vörtrockenTerminalprogramm fastleggen "
 "wullt. Bitte beacht, dat de utsöchte Datei de Utföhrbor-Mark hebben mutt."
 "<br> Beacht ok, dat en poor Programmen, de en Terminalemulator bruukt, nich "
 "funkscheneert, wenn Du Befehlsreegoptschonen angiffst (t.B. \"konsole -ls\")."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr ""
diff --git a/tde-i18n-nl/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-nl/messages/tdebase/kcmcomponentchooser.po
index ef7ad7cbdff..74d07a15fa5 100644
--- a/tde-i18n-nl/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-nl/messages/tdebase/kcmcomponentchooser.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-22 09:38+0100\n"
 "Last-Translator: Bram Schoenmakers <bramschoenmakers@kde.nl>\n"
 "Language-Team: Nederlands <kde-i18n-nl@kde.org>\n"
@@ -26,13 +26,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 "Rinse de Vries"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -56,8 +56,8 @@ msgstr "Onbekend"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>U hebt een nieuw standaardcomponent uitgezocht. Wilt u nu uw wijziging "
 "opslaan?</qt>"
@@ -68,11 +68,11 @@ msgstr "Geen beschrijving beschikbaar"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Kies uit de lijst hieronder het component dat u standaard wilt gebruiken voor "
-"%1."
+"Kies uit de lijst hieronder het component dat u standaard wilt gebruiken "
+"voor %1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -86,219 +86,180 @@ msgstr "Componentenkiezer"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Open <b>http</b>- en <b>https</b>-URL-adressen</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "in een programma gebaseerd op de inhoud van het URL-adres"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "in deze browser:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Standaardcomponent"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Hier kunt u uw voorkeuren instellen voor belangrijke TDE-componenten. "
-"Verschillende TDE-toepassingen roepen soms een terminalvenster aan, willen een "
-"e-mail opstellen of wat tekst weergeven. Hier kunt u bepalen welke programma's "
-"TDE hiervoor zal gebruiken."
+"Verschillende TDE-toepassingen roepen soms een terminalvenster aan, willen "
+"een e-mail opstellen of wat tekst weergeven. Hier kunt u bepalen welke "
+"programma's TDE hiervoor zal gebruiken."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Beschrijving van component"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Hier kunt u een korte omschrijving zien van de geselecteerde component. Om de "
-"geselecteerde component te veranderen, klik op de lijst links. Om het programma "
-"te veranderen, kies dat hieronder."
+"Hier kunt u een korte omschrijving zien van de geselecteerde component. Om "
+"de geselecteerde component te veranderen, klik op de lijst links. Om het "
+"programma te veranderen, kies dat hieronder."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Deze lijst toont de beschikbare componenten. Klik op de component die u wilt "
-"instellen.</p>\n"
-"<p>In dit scherm kunt u uw voorkeuren instellen voor belangrijke "
-"TDE-componenten. Verschillende TDE-toepassingen kunnen soms een terminalvenster "
+"<p>Deze lijst toont de beschikbare componenten. Klik op de component die u "
+"wilt instellen.</p>\n"
+"<p>In dit scherm kunt u uw voorkeuren instellen voor belangrijke TDE-"
+"componenten. Verschillende TDE-toepassingen kunnen soms een terminalvenster "
 "openen, een e-mail opstellen of wat tekst weergeven. Hier kunt u instellen "
 "welke programma's u voor die diensten wilt gebruiken.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul>"
-"<li>%t: geadresseerde</li> "
-"<li>%s: onderwerp</li> "
-"<li>%c: CC (Carbon Copy) kopie</li> "
-"<li>%b: BCC (Blind Carbon Copy) blinde kopie</li> "
-"<li>%B: sjabloontekst</li> "
-"<li>%A: bijlage </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul><li>%t: geadresseerde</li> <li>%s: onderwerp</li> <li>%c: CC (Carbon "
+"Copy) kopie</li> <li>%b: BCC (Blind Carbon Copy) blinde kopie</li> <li>%B: "
+"sjabloontekst</li> <li>%A: bijlage </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Druk op deze knop om uw favoriete e-mailprogramma te selecteren. Opmerking: "
-"alleen bestanden met het attribuut 'executable' worden geaccepteerd."
-"<br>U kunt diverse plaatshouders gebruiken. Deze zullen worden vervangen door "
-"de werkelijke waardes als het e-mailprogramma wordt aangeroepen: "
-"<ul>"
-"<li>%t: geadresseerde</li> "
-"<li>%s: onderwerp</li> "
-"<li>%c: CC (Carbon Copy) kopie</li> "
-"<li>%b: BCC (Blind Carbon Copy) blinde kopie</li> "
-"<li>%B: sjabloontekst</li> "
-"<li>%A: bijlage </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"alleen bestanden met het attribuut 'executable' worden geaccepteerd.<br>U "
+"kunt diverse plaatshouders gebruiken. Deze zullen worden vervangen door de "
+"werkelijke waardes als het e-mailprogramma wordt aangeroepen: <ul><li>%t: "
+"geadresseerde</li> <li>%s: onderwerp</li> <li>%c: CC (Carbon Copy) kopie</"
+"li> <li>%b: BCC (Blind Carbon Copy) blinde kopie</li> <li>%B: sjabloontekst</"
+"li> <li>%A: bijlage </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Klik hier om te bladeren naar het e-mailprogramma."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "In een terminal uitvoe&ren"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Selecteer deze optie als u wilt dat het opgegeven e-mailprogramma wordt "
 "uitgevoerd in een terminal (bijv. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "KMail als standaard e-mailprogramma gebr&uiken"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail is het standaard e-mailprogramma voor de TDE-desktop."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Ander e-&mailprogramma gebruiken:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Selecteer deze optie als u een ander e-mailprogramma wilt gebruiken."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Ander &terminalprogramma gebruiken:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Konsole als terminalprogramma gebr&uiken"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Druk op deze knop om uw favoriete terminalprogramma te selecteren. Zorg er voor "
-"dat het bestand dat u selecteert uitvoerbaar gemaakt moet zijn. Het bestand "
-"wordt anders niet geaccepteerd. "
-"<br>Let er ook op dat sommige programma's die terminalemulatie gebruiken niet "
-"zullen werken als u argumenten mee geeft (Bijvoorbeeld: konsole -ls)."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"Druk op deze knop om uw favoriete terminalprogramma te selecteren. Zorg er "
+"voor dat het bestand dat u selecteert uitvoerbaar gemaakt moet zijn. Het "
+"bestand wordt anders niet geaccepteerd. <br>Let er ook op dat sommige "
+"programma's die terminalemulatie gebruiken niet zullen werken als u "
+"argumenten mee geeft (Bijvoorbeeld: konsole -ls)."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Klik hier om te bladeren naar het terminalprogramma."
diff --git a/tde-i18n-nn/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-nn/messages/tdebase/kcmcomponentchooser.po
index a89766fbf4c..4f929973e3e 100644
--- a/tde-i18n-nn/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-nn/messages/tdebase/kcmcomponentchooser.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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:27+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -18,13 +18,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"
@@ -48,8 +48,8 @@ msgstr "Ukjend"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr "<qt>Du har endra standardkomponenten. Vil du lagra endringa no?</qt>"
 
 #: componentchooser.cpp:412
@@ -58,8 +58,8 @@ msgstr "Inga skildring tilgjengeleg"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Vel dei komponenta som skal brukast som standard for tenesta %1 frå lista "
 "nedanfor ."
@@ -76,221 +76,182 @@ msgstr "Komponentveljar"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "© 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Opna <b>http</b>- og <b>https</b>-URL-ar</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "med eit program basert på innhaldet i URL-en"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "i følgjande nettlesar:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr " …"
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Standardkomponent"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Her kan du endra komponentprogrammet. Komponentar er program som handterer "
-"grunnleggjande oppgåver, som til dømes terminalprogram, skriveprogram og "
-"e-postklient. Ulike TDE-program treng av og til å starta ein konsoll, senda ein "
-"e-post eller visa noko tekst. For å gjera det på same måten, vil desse programa "
-"alltid bruka dei same komponentane. Her kan du velja kva for program som skal "
-"brukast for dei ulike komponentane."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"grunnleggjande oppgåver, som til dømes terminalprogram, skriveprogram og e-"
+"postklient. Ulike TDE-program treng av og til å starta ein konsoll, senda "
+"ein e-post eller visa noko tekst. For å gjera det på same måten, vil desse "
+"programa alltid bruka dei same komponentane. Her kan du velja kva for "
+"program som skal brukast for dei ulike komponentane."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Komponentskildring"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Her kan du lesa ei lita skildring av den valde komponenten. I lista til venstre "
-"kan du velja andre komponentar. Nedanfor kan du endra komponentprogrammet."
+"Her kan du lesa ei lita skildring av den valde komponenten. I lista til "
+"venstre kan du velja andre komponentar. Nedanfor kan du endra "
+"komponentprogrammet."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p> Denne lista viser komponenttypane som kan tilpassast. Trykk på komponentane "
-"du vil tilpassa.</p>\n"
+"<p> Denne lista viser komponenttypane som kan tilpassast. Trykk på "
+"komponentane du vil tilpassa.</p>\n"
 "<p>I denne dialogen kan du endra standardkomponenta i TDE. Komponentar er "
-"program som handterer grunnleggjande oppgåver, som til dømes terminalprogram, "
-"skriveprogram og e-postklient. Ulike TDE-program treng av og til å starta ein "
-"konsoll, senda ein e-post eller visa noko tekst. For å gjera det på same måten, "
-"vil desse programa alltid bruka dei same komponentane. Her kan du velja kva for "
-"program som skal brukast for dei ulike komponentane.</p>\n"
+"program som handterer grunnleggjande oppgåver, som til dømes "
+"terminalprogram, skriveprogram og e-postklient. Ulike TDE-program treng av "
+"og til å starta ein konsoll, senda ein e-post eller visa noko tekst. For å "
+"gjera det på same måten, vil desse programa alltid bruka dei same "
+"komponentane. Her kan du velja kva for program som skal brukast for dei "
+"ulike komponentane.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Mottakaradresse</li>"
-"<li>%s: Emne</li>"
-"<li>%c: Kopi til (CC)</li>"
-"<li>%b: Blindkopi til (BCC)</li>"
-"<li>%B: Meldingsmal</li>"
-"<li>%A: Vedlegg</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Mottakaradresse</li><li>%s: Emne</li><li>%c: Kopi til (CC)</"
+"li><li>%b: Blindkopi til (BCC)</li><li>%B: Meldingsmal</li><li>%A: Vedlegg</"
+"li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Trykk denne knappen for å velja e-postklienten du føretrekk. Fila du vel må "
-"vera ei køyrbar programfil."
-"<br>Du kan òg bruka plasshaldarar som vert bytt ut med følgjande verdiar når "
-"e-postprogrammet vert starta:"
-"<ul>"
-"<li>%t: Mottakaradresse</li>"
-"<li>%s: Emne</li>"
-"<li>%c: Kopi til (CC)</li>"
-"<li>%b: Blind kopi til (BCC)</li>"
-"<li>%B: Meldingsmal</li>"
-"<li>%A: Vedlegg</li></ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"vera ei køyrbar programfil.<br>Du kan òg bruka plasshaldarar som vert bytt "
+"ut med følgjande verdiar når e-postprogrammet vert starta:<ul><li>%t: "
+"Mottakaradresse</li><li>%s: Emne</li><li>%c: Kopi til (CC)</li><li>%b: Blind "
+"kopi til (BCC)</li><li>%B: Meldingsmal</li><li>%A: Vedlegg</li></ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Trykk her for å leita etter e-postprogrammet."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Kø&yr i terminal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Bruk dette valet om du vil at e-postklienten skal køyrast i eit "
 "terminalvindauge (t.d. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "Br&uk KMail som føretrekt e-postprogram"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail er standardprogrammet for e-post i TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Bruk eit anna &e-postprogram:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Vel dette alternativet dersom du vil bruka eit anna e-postprogram."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Bruk eit anna &terminalprogram:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Bruk &Konsole som terminalprogram"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Bruk denne knappen til å velja den terminalklienten du vil bruka. Legg merke "
-"til at den fila du vel må vera køyrbar for å kunna brukast. "
-"<br>Legg òg merke til at enkelte program som brukar terminalemulatoren ikkje "
-"vil verka dersom du legg til argument på kommandolinja (t.d. «konsole -ls»)."
+"til at den fila du vel må vera køyrbar for å kunna brukast. <br>Legg òg "
+"merke til at enkelte program som brukar terminalemulatoren ikkje vil verka "
+"dersom du legg til argument på kommandolinja (t.d. «konsole -ls»)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Trykk her for å leita etter terminalprogrammet."
diff --git a/tde-i18n-pa/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-pa/messages/tdebase/kcmcomponentchooser.po
index 5a7e8164d8c..8590e01f8fb 100644
--- a/tde-i18n-pa/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-pa/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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:22+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"
@@ -47,11 +47,11 @@ msgstr "ਅਣਜਾਣ"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>ਤੁਸੀਂ ਆਪਣੀ ਚੋਣ ਮੁਤਾਬਕ ਮੂਲ ਭਾਗ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਨੂੰ ਹੁਣ "
-"ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?</qt>"
+"<qt>ਤੁਸੀਂ ਆਪਣੀ ਚੋਣ ਮੁਤਾਬਕ ਮੂਲ ਭਾਗ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਨੂੰ ਹੁਣ ਸੰਭਾਲਣਾ "
+"ਚਾਹੁੰਦੇ ਹੋ?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -59,10 +59,9 @@ msgstr "ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
-msgstr ""
-"ਹੇਠ ਦਿੱਤੀ ਸੂਚੀ ਵਿੱਚੋਂ ਸੇਵਾ %1 ਲਈ ਮੂਲ ਰੂਪ ਵਿੱਚ ਵਰਤੇ ਜਾਣ ਵਾਲੇ ਭਾਗ ਦੀ ਚੋਣ ਕਰੋ।"
+"Choose from the list below which component should be used by default for the "
+"%1 service."
+msgstr "ਹੇਠ ਦਿੱਤੀ ਸੂਚੀ ਵਿੱਚੋਂ ਸੇਵਾ %1 ਲਈ ਮੂਲ ਰੂਪ ਵਿੱਚ ਵਰਤੇ ਜਾਣ ਵਾਲੇ ਭਾਗ ਦੀ ਚੋਣ ਕਰੋ।"
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -76,188 +75,152 @@ msgstr "ਭਾਗ ਚੋਣਕਾਰ"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), ੨੦੦੨, ਜੋਸਫ ਵੀਨੀਗੀਰ"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt><b>http</b> ਅਤੇ <b>https</b> URLs</qt> ਖੋਲੋ"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "URL ਦੇ ਭਾਗ 'ਤੇ ਅਧਾਰਿਤ ਇੱਕ ਕਾਰਜ ਵਿੱਚ"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "ਇਹ ਝਲਕਾਰਾ:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "ਮੂਲ ਭਾਗ"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "ਭਾਗ ਵੇਰਵਾ"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: ਪ੍ਰਾਪਤਕਰਤਾ ਦਾ ਸਿਰਨਾਵਾਂ</li> "
-"<li>%s: ਵਿਸ਼ਾ</li> "
-"<li>%c: ਨਕਲ (CC)</li> "
-"<li>%b: ਲੁਕਵੀਂ ਨਕਲ (BCC)</li> "
-"<li>%B: ਨਮੂਨਾ ਪਾਠ</li> "
-"<li>%A: ਨੱਥੀ </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: ਪ੍ਰਾਪਤਕਰਤਾ ਦਾ ਸਿਰਨਾਵਾਂ</li> <li>%s: ਵਿਸ਼ਾ</li> <li>%c: ਨਕਲ (CC)</"
+"li> <li>%b: ਲੁਕਵੀਂ ਨਕਲ (BCC)</li> <li>%B: ਨਮੂਨਾ ਪਾਠ</li> <li>%A: ਨੱਥੀ </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "ਪੱਤਰ ਕਾਰਜ ਫਾਇਲ ਦੀ ਝਲਕ ਵੇਖਣ ਲਈ ਦਬਾਉ।"
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "ਟਰਮੀਨਲ ਵਿੱਚ ਚਲਾਓ(&R)"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "ਇਹ ਚੋਣ ਤਾਂ ਹੀ ਸਰਗਰਮ ਕਰੋ, ਜੇਕਰ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ ਕਿ ਈ-ਮੇਲ ਕਲਾਂਇਟ ਟਰਮੀਨਲ (ਜਿਵੇਂ ਕਿ "
 "<em>Konsole</em>) ਵਿੱਚ ਚੱਲੇ।"
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "ਈ-ਪੱਤਰ ਕਲਾਂਇਟ ਦੇ ਤੌਰ ਤੇ ਕੇ-ਮੇਲ ਵਰਤੋਂ(&U)"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "ਕੇ-ਮੇਲ ਕੇਡੀਈ(TDE) ਵਿਹੜੇ ਲਈ ਮੂਲ ਤੇ ਮਿਆਰੀ ਈ-ਮੇਲ ਕਾਰਜ ਹੈ।"
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "ਵੱਖਰਾ ਈ-ਮੇਲ ਕਲਾਂਇਟ ਵਰਤੋਂ(&e):"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ ਹੋਰ ਪੱਤਰ ਪਰੋਗਰਾਮ ਦੀ ਵਰਤੋਂ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਇਹ ਚੋਣ ਕਰੋ।"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "ਵੱਖਰਾ ਟਰਮੀਨਲ ਕਾਰਜ ਵਰਤੋਂ(&t):"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "ਕੇਨਸੋਲ ਨੂੰ ਟਰਮੀਨਲ ਕਾਰਜ ਦੇ ਤੌਰ ਤੇ ਵਰਤੋਂ(&U)"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "ਟਰਮੀਨਲ ਪਰੋਗਰਾਮ ਦੀ ਝਲਕ ਵੇਖਣ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
diff --git a/tde-i18n-pl/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-pl/messages/tdebase/kcmcomponentchooser.po
index b2257200c83..7565c49041b 100644
--- a/tde-i18n-pl/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-pl/messages/tdebase/kcmcomponentchooser.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-04 20:37+0100\n"
 "Last-Translator: Michal Rudolf <mrudolf@kdewebdev.org>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -18,16 +18,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==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"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 "Michał Rudolf (aktualny tłumacz), Wojciech Milewski"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,8 +51,8 @@ msgstr "Nieznany"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Zmieniony został domyślny komponent. Czy chcesz zachować te zmiany?</qt>"
 
@@ -62,8 +62,8 @@ msgstr "Brak opisu"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr "Proszę wybrać z poniższej listy domyślny komponent dla usługi %1."
 
 #: kcm_componentchooser.cpp:34
@@ -78,222 +78,181 @@ msgstr "Wybór komponentów"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Otwórz adresy <b>http</b> i <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "w programie określonym na podstawie zawartości URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "w następującej przeglądarce:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Domyślny komponent"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "W module tym można skonfigurować komponenty TDE. Komponenty to programy "
-"wykonujące podstawowe zadania, takie jak emulacja terminala, edytor tekstu czy "
-"klient poczty. Różne programy TDE wymagają czasem uruchomienia terminala, "
-"wysłania listu lub edycji jakiegoś tekstu. Żeby ułatwić pracę, programy te mogą "
-"zawsze korzystać z takich samych komponentów - komponenty te można wybrać "
-"tutaj."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"wykonujące podstawowe zadania, takie jak emulacja terminala, edytor tekstu "
+"czy klient poczty. Różne programy TDE wymagają czasem uruchomienia "
+"terminala, wysłania listu lub edycji jakiegoś tekstu. Żeby ułatwić pracę, "
+"programy te mogą zawsze korzystać z takich samych komponentów - komponenty "
+"te można wybrać tutaj."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Opis komponentu"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Tu można przeczytać krótki opis aktualnie wybranego komponentu. Żeby zmienić "
 "wybierany komponent, należy kliknąć na liście po lewej. Program dla danego "
 "komponentu można wybrać poniżej."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p> Ta lista zawiera konfigurowalne komponenty. Kliknięcie na komponencie "
 "umożliwi jego skonfigurować.</p>\n"
 "<p>W tym oknie można skonfigurować komponenty TDE. Komponenty to programy "
-"wykonujące podstawowe zadania, takie jak emulacja terminala, edytor tekstu czy "
-"klient poczty. Różne programy TDE wymagają czasem uruchomienia terminala, "
-"wysłania listu lub edycji jakiegoś tekstu. Żeby ułatwić pracę, programy te mogą "
-"zawsze korzystać z takich samych komponentów - komponenty te można wybrać "
-"tutaj.</p>\n"
+"wykonujące podstawowe zadania, takie jak emulacja terminala, edytor tekstu "
+"czy klient poczty. Różne programy TDE wymagają czasem uruchomienia "
+"terminala, wysłania listu lub edycji jakiegoś tekstu. Żeby ułatwić pracę, "
+"programy te mogą zawsze korzystać z takich samych komponentów - komponenty "
+"te można wybrać tutaj.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Adres odbiorcy</li> "
-"<li>%s: Temat</li> "
-"<li>%c: Do wiadomości (DW)</li> "
-"<li>%b: Ukryte do wiadomości (UDW)</li> "
-"<li>%B: Wzorzec wiadomości tekstowej</li> "
-"<li>%A: Załącznik </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Adres odbiorcy</li> <li>%s: Temat</li> <li>%c: Do wiadomości "
+"(DW)</li> <li>%b: Ukryte do wiadomości (UDW)</li> <li>%B: Wzorzec wiadomości "
+"tekstowej</li> <li>%A: Załącznik </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Wciśnij ten przycisk, by wybrać klienta poczty. Wybrany plik musi być "
-"wykonywalny."
-"<br> Można tu również wybrać podstawowe ustawienia używane przez klienta "
-"poczty:"
-"<ul> "
-"<li>%t: Adres odbiorcy</li> "
-"<li>%s: Temat</li> "
-"<li>%c: Do wiadomości (DW)</li> "
-"<li>%b: Ukryte do wiadomości (UDW)</li> "
-"<li>%B: Wzorzec wiadomości tekstowej</li> "
-"<li>%A: Załącznik </li> </ul> "
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"wykonywalny.<br> Można tu również wybrać podstawowe ustawienia używane przez "
+"klienta poczty:<ul> <li>%t: Adres odbiorcy</li> <li>%s: Temat</li> <li>%c: "
+"Do wiadomości (DW)</li> <li>%b: Ukryte do wiadomości (UDW)</li> <li>%B: "
+"Wzorzec wiadomości tekstowej</li> <li>%A: Załącznik </li> </ul> "
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Kliknij, by wybrać plik klienta poczty."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Uruchom w terminalu"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Uaktywnij tę opcję, jeśli klient pocztowy ma być uruchamiany w terminalu (np. "
-"<em>Konsola</em>)."
+"Uaktywnij tę opcję, jeśli klient pocztowy ma być uruchamiany w terminalu "
+"(np. <em>Konsola</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Użyj KMail jako klienta poczty"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail jest standardowym klientem poczty TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Użyj innego &klienta poczty:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Wybierz tę opcję, jeśli chcesz użyć innego programu."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Użyj innego &terminala:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Użyj programu Konsola jako terminala"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Wciśnij ten przycisk, by wybrać preferowany terminal. Plik, który wybierzesz, "
-"musi być wykonywalny. "
-"<br>Niektóre programy, korzystające z emulatora terminala mogą nie działać, "
-"jeśli podasz tu dodatkowe parametry (np. 'konsole -ls')."
+"Wciśnij ten przycisk, by wybrać preferowany terminal. Plik, który "
+"wybierzesz, musi być wykonywalny. <br>Niektóre programy, korzystające z "
+"emulatora terminala mogą nie działać, jeśli podasz tu dodatkowe parametry "
+"(np. 'konsole -ls')."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Kliknij, by wybrać terminal."
diff --git a/tde-i18n-pt/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-pt/messages/tdebase/kcmcomponentchooser.po
index 24ad3e23d4e..ac67ddadf04 100644
--- a/tde-i18n-pt/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-pt/messages/tdebase/kcmcomponentchooser.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-21 11:40+0000\n"
 "Last-Translator: José Nuno Pires <jncp@netcabo.pt>\n"
 "Language-Team: pt <kde-i18n-pt@kde.org>\n"
@@ -12,13 +12,13 @@ msgstr ""
 "X-POFile-SpellExtra: Wenninger KMail Konsole https kcmcomponentchooser\n"
 "X-POFile-SpellExtra: konsole Blind CC BCC ls Carbon Copy\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "José Nuno Pires"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -42,8 +42,8 @@ msgstr "Desconhecido"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Alterou o componente por omissão da sua escolha; deseja gravar essa "
 "alteração agora?</qt>"
@@ -54,11 +54,11 @@ msgstr "A descrição não está disponível"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Escolha na lista em baixo qual o componente que deve ser usado por omissão para "
-"o serviço %1."
+"Escolha na lista em baixo qual o componente que deve ser usado por omissão "
+"para o serviço %1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -72,227 +72,188 @@ msgstr "Selector de Componentes"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Abrir URLs <b>http</b> e <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "numa aplicação baseada no conteúdo da URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "no seguinte navegador:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Componente por Omissão"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Você poderá alterar aqui o programa do componente. Os componentes são programas "
-"que tratam de tarefas básicas, como o emulador de terminal, o editor de texto e "
-"o cliente de e-mail. As várias aplicações do TDE precisam algumas vezes de "
-"invocar uma emulação de terminal, enviar uma mensagem de e-mail ou de mostrar "
-"algum texto. Para o fazer de forma consistente, estas aplicações chamam sempre "
-"os mesmos componentes. Você poderá escolher aqui quais são os programas para "
-"estes componentes."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"Você poderá alterar aqui o programa do componente. Os componentes são "
+"programas que tratam de tarefas básicas, como o emulador de terminal, o "
+"editor de texto e o cliente de e-mail. As várias aplicações do TDE precisam "
+"algumas vezes de invocar uma emulação de terminal, enviar uma mensagem de e-"
+"mail ou de mostrar algum texto. Para o fazer de forma consistente, estas "
+"aplicações chamam sempre os mesmos componentes. Você poderá escolher aqui "
+"quais são os programas para estes componentes."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Descrição do Componente"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Aqui você poderá ler uma pequena descrição do componente seleccionado no "
-"momento. Para alterar o componente seleccionado, carregue na lista à esquerda. "
-"Para alterar o programa do componente, escolha-o em baixo, por favor."
+"momento. Para alterar o componente seleccionado, carregue na lista à "
+"esquerda. Para alterar o programa do componente, escolha-o em baixo, por "
+"favor."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>Esta lista mostra os tipos de componentes configuráveis. Carregue no "
 "componente que deseja configurar.</p>\n"
 "<p>Nesta janela você poderá alterar os componentes predefinidos do TDE. Você "
-"poderá alterar aqui o programa do componente. Os componentes são programas que "
-"tratam de tarefas básicas, como o emulador de terminal, o editor de texto e o "
-"cliente de e-mail. As várias aplicações do TDE precisam algumas vezes de "
-"invocar uma emulação de terminal, enviar uma mensagem de e-mail ou de mostrar "
-"algum texto. Para o fazer de forma consistente, estas aplicações chamam sempre "
-"os mesmos componentes. Você poderá escolher aqui quais são os programas para "
-"estes componentes.</p>\n"
+"poderá alterar aqui o programa do componente. Os componentes são programas "
+"que tratam de tarefas básicas, como o emulador de terminal, o editor de "
+"texto e o cliente de e-mail. As várias aplicações do TDE precisam algumas "
+"vezes de invocar uma emulação de terminal, enviar uma mensagem de e-mail ou "
+"de mostrar algum texto. Para o fazer de forma consistente, estas aplicações "
+"chamam sempre os mesmos componentes. Você poderá escolher aqui quais são os "
+"programas para estes componentes.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Endereço do destinatário</li> "
-"<li>%s: Assunto</li> "
-"<li>%c: 'Carbon Copy' (CC)</li> "
-"<li>%b: 'Blind Carbon Copy' (BCC)</li> "
-"<li>%B: Texto do modelo do conteúdo</li> "
-"<li>%A: Anexo </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Endereço do destinatário</li> <li>%s: Assunto</li> <li>%c: "
+"'Carbon Copy' (CC)</li> <li>%b: 'Blind Carbon Copy' (BCC)</li> <li>%B: Texto "
+"do modelo do conteúdo</li> <li>%A: Anexo </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Carregue neste botão para seleccionar o seu cliente de e-mail preferido. "
-"Lembre-se que o ficheiro que seleccionar tem de ter as permissões de execução "
-"para poder ser aceite."
-"<br> Também pode usar várias substituições que são trocadas pelos verdadeiros "
-"valores quando for chamado o cliente de e-mail:"
-"<ul> "
-"<li>%t: Endereço do destinatário</li> "
-"<li>%s: Assunto</li> "
-"<li>%c: 'Carbon Copy' (CC)</li> "
-"<li>%b: 'Blind Carbon Copy' (BCC)</li> "
-"<li>%B: Texto do modelo do conteúdo</li> "
-"<li>%A: Anexo </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Lembre-se que o ficheiro que seleccionar tem de ter as permissões de "
+"execução para poder ser aceite.<br> Também pode usar várias substituições "
+"que são trocadas pelos verdadeiros valores quando for chamado o cliente de e-"
+"mail:<ul> <li>%t: Endereço do destinatário</li> <li>%s: Assunto</li> <li>%c: "
+"'Carbon Copy' (CC)</li> <li>%b: 'Blind Carbon Copy' (BCC)</li> <li>%B: Texto "
+"do modelo do conteúdo</li> <li>%A: Anexo </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Carregue aqui para escolher qual o programa de e-mail a utilizar."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Co&rrer num terminal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Active esta opção se quiser que o cliente de e-mail seleccionado seja executado "
-"num terminal (p.ex., o <em>Konsole</em>)."
+"Active esta opção se quiser que o cliente de e-mail seleccionado seja "
+"executado num terminal (p.ex., o <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Usar o KMail como o cliente de e-mail preferido "
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "O KMail é o programa de e-mail do TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Usar um cliente de &e-mail diferente:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Seleccione esta opção se deseja utilizar outra programa de e-mail."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Usar um programa de &terminal diferente:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Usar o Konsole como a aplicação de terminal"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Carregue neste botão para seleccionar o seu cliente de terminal preferido. "
-"Lembre-se que o ficheiro que seleccionar tem de ter as permissões de execução "
-"para poder ser aceite."
-"<br> Repare também que alguns programas que utilizam o Emulador de Terminal não "
-"funcionam se adicionar argumentos de linha de comandos (Exemplo: konsole -ls)."
+"Lembre-se que o ficheiro que seleccionar tem de ter as permissões de "
+"execução para poder ser aceite.<br> Repare também que alguns programas que "
+"utilizam o Emulador de Terminal não funcionam se adicionar argumentos de "
+"linha de comandos (Exemplo: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Carregue aqui para escolher o programa de terminal."
diff --git a/tde-i18n-pt_BR/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-pt_BR/messages/tdebase/kcmcomponentchooser.po
index b1d9ab59d46..6861fbc19bd 100644
--- a/tde-i18n-pt_BR/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-pt_BR/messages/tdebase/kcmcomponentchooser.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-29 23:14-0300\n"
 "Last-Translator: Diniz Bortolotto <diniz.bb@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -22,13 +22,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 "Diniz Bortolotto, Lisiane Sztoltz Teixeira"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -52,8 +52,8 @@ msgstr "Desconhecido"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Você mudou o componente padrão da sua escolha. Você quer salvar esta "
 "mudança agora?</qt>"
@@ -64,8 +64,8 @@ msgstr "Nenhuma descrição disponível"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Escolha, da lista abaixo, qual componente deve ser usado por padrão para o "
 "serviço %1."
@@ -82,225 +82,186 @@ msgstr "Seletor de Componentes"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Abre URLs <b>http</b> e <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "em um aplicativo baseado nos conteúdos da URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "no seguinte navegador:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Componente Padrão"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Aqui você pode modificar o programa do componente. Componentes são programas "
-"que manipulam tarefas básicas, como o emulador de terminal, o editor de textos "
-"e o cliente de e-mail. Diferentes aplicativos do TDE precisam, algumas vezes, "
-"invocar um emulador de console, enviar um e-mail ou exibir algum texto. Para "
-"fazer algo consistentemente, estes aplicativos sempre chamam os mesmos "
-"componentes. Você pode escolher aqui quais programas que são estes componentes."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"que manipulam tarefas básicas, como o emulador de terminal, o editor de "
+"textos e o cliente de e-mail. Diferentes aplicativos do TDE precisam, "
+"algumas vezes, invocar um emulador de console, enviar um e-mail ou exibir "
+"algum texto. Para fazer algo consistentemente, estes aplicativos sempre "
+"chamam os mesmos componentes. Você pode escolher aqui quais programas que "
+"são estes componentes."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Descrição do Componente"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Aqui você pode ler uma pequena descrição do componente selecionado atualmente. "
-"Para modificar o componente selecionado, clique na lista à esquerda. Para "
-"modificar o programa componente, por favor, escolha-o abaixo."
+"Aqui você pode ler uma pequena descrição do componente selecionado "
+"atualmente. Para modificar o componente selecionado, clique na lista à "
+"esquerda. Para modificar o programa componente, por favor, escolha-o abaixo."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p> Esta lista mostra os tipos de componentes configuráveis. Clique sobre o "
 "componente que deseja configurar.</p>\n"
-"<p>Neste diálogo você pode modificar os componentes padrão do TDE. Componentes "
-"são programas que manipulam tarefas básicas, como um emulador de terminal, o "
-"editor de texto e o cliente de e-mail. Diferentes aplicativos precisam, algumas "
-"vezes, invocar um emulador de consule, enviar um e-mail ou exibir algum texto. "
-"Para fazer isto consistentemente, estes aplicativos chamam sempre os mesmos "
-"componentes. Aqui você pode selecionar quais programas  são estes.</p>\n"
+"<p>Neste diálogo você pode modificar os componentes padrão do TDE. "
+"Componentes são programas que manipulam tarefas básicas, como um emulador de "
+"terminal, o editor de texto e o cliente de e-mail. Diferentes aplicativos "
+"precisam, algumas vezes, invocar um emulador de consule, enviar um e-mail ou "
+"exibir algum texto. Para fazer isto consistentemente, estes aplicativos "
+"chamam sempre os mesmos componentes. Aqui você pode selecionar quais "
+"programas  são estes.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Endereço do Destinatário</li> "
-"<li>%s: Assunto</li> "
-"<li>%c: Cópia(CC)</li> "
-"<li>%b: Cópia Oculta (BCC)</li> "
-"<li>%B: Texto de modelo do corpo</li> "
-"<li>%A: Anexo </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Endereço do Destinatário</li> <li>%s: Assunto</li> <li>%c: "
+"Cópia(CC)</li> <li>%b: Cópia Oculta (BCC)</li> <li>%B: Texto de modelo do "
+"corpo</li> <li>%A: Anexo </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Pressione este botão para selecionar o seu cliente favorito de e-mail. Por "
 "favor, note que o arquivo que você selecionou tem que possuir o atributo de "
-"executável ajustado, para ser aceito."
-"<br>Você também pode usar vários campos que serão substuídos pelos valores "
-"reais quando o cliente de e-mail for chamado: "
-"<ul> "
-"<li>%t: Endereço do destinatário</li> "
-"<li>%s: Assunto</li> "
-"<li>%c: Cópia (CC)</li> "
-"<li>%b: Cópia Oculta (BCC)</li> "
-"<li>%B: Modelo de Corpo de texto</li> "
-"<li>%A: Anexo </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"executável ajustado, para ser aceito.<br>Você também pode usar vários campos "
+"que serão substuídos pelos valores reais quando o cliente de e-mail for "
+"chamado: <ul> <li>%t: Endereço do destinatário</li> <li>%s: Assunto</li> <li>"
+"%c: Cópia (CC)</li> <li>%b: Cópia Oculta (BCC)</li> <li>%B: Modelo de Corpo "
+"de texto</li> <li>%A: Anexo </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Clique aqui para navegar para o arquivo do programa de e-mail."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Executar em um terminal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Ative esta opção se desejar que o cliente de e-mail seja executado em um "
 "terminal (por ex., o <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Usar o KMail como cliente de e-mail preferido"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "O Kmail é o programa de e-mail padrão para o TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Usar um cliente de e-mail &diferente:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Selecione esta opção se deseja usar qualquer outro programa de e-mail."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Usar um programa de &terminal diferente:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Usar o &Konsole como aplicativo de terminal"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Pressione este botão para selecionar o seu cliente de terminal favorito. Note "
-"que o arquivo que selecionar deve ser configurado para ser executável, para que "
-"seja aceito."
-"<br>Note também que alguns programas que utilizam o Emulador de Terminal não "
-"funcionarão, se você adicionar argumetnos de linha de comando (por exemplo: "
-"konsole -ls)."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"Pressione este botão para selecionar o seu cliente de terminal favorito. "
+"Note que o arquivo que selecionar deve ser configurado para ser executável, "
+"para que seja aceito.<br>Note também que alguns programas que utilizam o "
+"Emulador de Terminal não funcionarão, se você adicionar argumetnos de linha "
+"de comando (por exemplo: konsole -ls)."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Clique aqui para navegar, para localizar o aplicativo de terminal."
diff --git a/tde-i18n-ro/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-ro/messages/tdebase/kcmcomponentchooser.po
index e1364d5fe99..20e4f834f1f 100644
--- a/tde-i18n-ro/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-ro/messages/tdebase/kcmcomponentchooser.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-04-07 23:25+0300\n"
 "Last-Translator: Claudiu Costin <claudiuc@kde.org>\n"
 "Language-Team: Romanian <kde-i18n-ro@kde.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 "Claudiu Costin"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -47,8 +47,8 @@ msgstr "Necunoscut"
 #: componentchooser.cpp:408
 #, fuzzy
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Aţi modificat componenta implicită de utilizat. Doriţi să salvaţi acum "
 "această modificare?<BR><BR>Dacă selectaţi <B>Nu</B> modificările vor fi "
@@ -60,8 +60,8 @@ msgstr "Nu există o descriere"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Alegeţi din lista de mai jos componenta care să fie utilizată implicit cu "
 "serviciul %1."
@@ -78,227 +78,188 @@ msgstr "Alegere componente"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c) 2002, Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Deschide URL-urile <b>http</b> şi <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "într-o aplicaţie bazată pe conţinutul URL-urilor"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "în următorul navigator de web:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Componenta implicită"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Aici puteţi schimba programul componentă. Componentele sînt programe care "
 "execută activităţi de bază, precum emulator de terminal, editor de text sau "
-"client de e-mail. Unele aplicaţii TDE au uneori nevoie să pornească un emulator "
-"de consolă, să trimită un e-mail sau să afişeze text. Pentru a face acest lucru "
-"consistent, aceste aplicaţii apelează întotdeauna la aceleaşi componente. Aici "
-"puteţi alege care programe să fie folosite ca şi componente de bază."
+"client de e-mail. Unele aplicaţii TDE au uneori nevoie să pornească un "
+"emulator de consolă, să trimită un e-mail sau să afişeze text. Pentru a face "
+"acest lucru consistent, aceste aplicaţii apelează întotdeauna la aceleaşi "
+"componente. Aici puteţi alege care programe să fie folosite ca şi componente "
+"de bază."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Descriere componentă"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Aici puteţi citi o mică descriere a componentei selectate. Pentru a schimba "
 "componenta selectată, daţi clic în lista din stînga. Pentru a modifica "
 "programul componentă, alegeţi-l mai jos."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>Această listă afişează tipurile de componente ce pot fi configurate. Daţi "
 "clic pe cea pe care doriţi să o configuraţi.</p>\n"
-"<p>În acest dialog puteţi schimba componentele implicite TDE. Componentele sînt "
-"programe care execută activităţi de bază, precum emulator de terminal, editor "
-"de text sau client de e-mail. Unele aplicaţii TDE au uneori nevoie să pornească "
-"un emulator de consolă, să trimită un e-mail sau să afişeze text. Pentru a face "
-"acest lucru consistent, aceste aplicaţii apelează întotdeauna la aceleaşi "
-"componente. Aici puteţi alege care programe să fie folosite ca şi componente de "
-"bază.</p>\n"
+"<p>În acest dialog puteţi schimba componentele implicite TDE. Componentele "
+"sînt programe care execută activităţi de bază, precum emulator de terminal, "
+"editor de text sau client de e-mail. Unele aplicaţii TDE au uneori nevoie să "
+"pornească un emulator de consolă, să trimită un e-mail sau să afişeze text. "
+"Pentru a face acest lucru consistent, aceste aplicaţii apelează întotdeauna "
+"la aceleaşi componente. Aici puteţi alege care programe să fie folosite ca "
+"şi componente de bază.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Adresa destinatarului</li> "
-"<li>%s: Subiect</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Text conţinut model</li> "
-"<li>%A: Ataşament </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Adresa destinatarului</li> <li>%s: Subiect</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Text conţinut "
+"model</li> <li>%A: Ataşament </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Apăsaţi acest buton pentru a selecta clientul de e-mail favorit. Ca să fie "
-"acceptat fişierul selectat trebuie să aibă atributul de executabil. "
-"<br> Puteţi utiliza variabilele de mai jos care vor fi înlocuite cu valorile "
-"necesare atunci cînd clientul de email este executat:"
-"<ul> "
-"<li>%t: Adresa destinatarului</li> "
-"<li>%s: Subiect</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Text conţinut model</li> "
-"<li>%A: Ataşament </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"acceptat fişierul selectat trebuie să aibă atributul de executabil. <br> "
+"Puteţi utiliza variabilele de mai jos care vor fi înlocuite cu valorile "
+"necesare atunci cînd clientul de email este executat:<ul> <li>%t: Adresa "
+"destinatarului</li> <li>%s: Subiect</li> <li>%c: Carbon Copy (CC)</li> <li>"
+"%b: Blind Carbon Copy (BCC)</li> <li>%B: Text conţinut model</li> <li>%A: "
+"Ataşament </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Daţi clic aici pentru a căuta un program de e-mail."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Execută în terminal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Activaţi această opţiune dacă doriţi ca clientul de e-mail să fie executat "
 "într-o fereastră terminal (de exemplu <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Utilizează KMail ca client de e-mail preferat"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail este programul de e-mail standard pentru mediul grafic TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Utilizează un client de &email diferit:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
-"Selectaţi această opţiune dacă doriţi să utilizaţi alt program de trimis "
-"e-mail-uri."
+"Selectaţi această opţiune dacă doriţi să utilizaţi alt program de trimis e-"
+"mail-uri."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Utilizează un program diferit de &terminal:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Utilizează Konsole ca aplicaţie terminal"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Apăsaţi acest buton pentru a selecta clientul de terminal preferat. Pentru a fi "
-"acceptat, fişierul pe care îl selectaţi trebuie să aibă setat atributul  de "
-"executabil."
-"<br> Reţineţi că unele programe care utilizează \"Emulatorul de terminal\" nu "
-"vor funcţiona dacă adăgaţi argumente în linia de comandă (de exemplu: konsole "
-"-ls)."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"Apăsaţi acest buton pentru a selecta clientul de terminal preferat. Pentru a "
+"fi acceptat, fişierul pe care îl selectaţi trebuie să aibă setat atributul  "
+"de executabil.<br> Reţineţi că unele programe care utilizează \"Emulatorul "
+"de terminal\" nu vor funcţiona dacă adăgaţi argumente în linia de comandă "
+"(de exemplu: konsole -ls)."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Daţi clic aici pentru a răsfoi pentru program de terminal."
diff --git a/tde-i18n-ru/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-ru/messages/tdebase/kcmcomponentchooser.po
index 542524ff898..1c30c7d64cc 100644
--- a/tde-i18n-ru/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-ru/messages/tdebase/kcmcomponentchooser.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-03 12:23+0300\n"
 "Last-Translator: Andrey Cherepanov <sibskull@mail.ru>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -18,17 +18,17 @@ 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"
 "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"
@@ -52,8 +52,8 @@ msgstr "Неизвестное"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Вы изменили у компонента выбор по умолчанию. Сохранить изменения?</qt>"
 
@@ -63,11 +63,11 @@ msgstr "Описание недоступно"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Выберите из списка ниже компонент, который должен использоваться по умолчанию "
-"для службы %1."
+"Выберите из списка ниже компонент, который должен использоваться по "
+"умолчанию для службы %1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -81,90 +81,82 @@ msgstr "Компоненты по умолчанию"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Открывать URL типа <b>http</b> и <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "в приложении, основанном на содержимом URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "в следующем браузере:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Компонент по умолчанию"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "В этом диалоге вы можете сменить программу-компонент. Компонентами являются "
 "программы, которые выполняют основные задачи, такие как эмулятор терминала, "
 "текстовый редактор или почтовый клиент. Различным приложениям TDE иногда "
-"необходимо вызвать эмулятор терминала, отправить почту или отобразить "
-"какой-либо текст. Здесь вы можете выбрать, какие программы являются этими "
+"необходимо вызвать эмулятор терминала, отправить почту или отобразить какой-"
+"либо текст. Здесь вы можете выбрать, какие программы являются этими "
 "компонентами."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Описание компонента"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Здесь можно прочитать небольшое описание текущего выбранного компонента. Чтобы "
-"сменить выбранный компонент, выберите его в списке слева. Чтобы сменить "
-"программу компонента, укажите ее ниже."
+"Здесь можно прочитать небольшое описание текущего выбранного компонента. "
+"Чтобы сменить выбранный компонент, выберите его в списке слева. Чтобы "
+"сменить программу компонента, укажите ее ниже."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Этот список показывает настраиваемые типы компонентов. Выберите компонент, "
-"который вы хотите настроить.</p>\n"
+"<p>Этот список показывает настраиваемые типы компонентов. Выберите "
+"компонент, который вы хотите настроить.</p>\n"
 "<p> В этом диалоге вы можете выбрать основные компоненты TDE. Компонентами "
 "являются программы, которые выполняют основные задачи, такие как эмулятор "
 "терминала, текстовый редактор или почтовый клиент. Различным приложениям TDE "
@@ -173,133 +165,100 @@ msgstr ""
 "компонентами.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Адресат</li> "
-"<li>%s: Тема</li> "
-"<li>%c: Копия (CC)</li>  "
-"<li>%b: Слепая копия (BCC)</li> "
-"<li>%B: Шаблон тела письма</li> "
-"<li>%A: Вложение </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Адресат</li> <li>%s: Тема</li> <li>%c: Копия (CC)</li>  <li>%b: "
+"Слепая копия (BCC)</li> <li>%B: Шаблон тела письма</li> <li>%A: Вложение </"
+"li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Нажмите эту кнопку, чтобы выбрать ваш любимый клиент электронной почты. "
-"Убедитесь, что выбранный вами файл имеет атрибут выполняемого. "
-"<br> Вы можете также использовать несколько параметров, которые при вызове "
-"почтового клиента будут заменены реальными данными: "
-"<ul> "
-"<li>%t: Адресат</li> "
-"<li>%s: Тема</li> "
-"<li>%c: Копия (CC)</li> "
-"<li>%b: Слепая копия (BCC)</li> "
-"<li>%B: Текст шаблона тела сообщения</li> "
-"<li>%A: Вложение </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Убедитесь, что выбранный вами файл имеет атрибут выполняемого. <br> Вы "
+"можете также использовать несколько параметров, которые при вызове почтового "
+"клиента будут заменены реальными данными: <ul> <li>%t: Адресат</li> <li>%s: "
+"Тема</li> <li>%c: Копия (CC)</li> <li>%b: Слепая копия (BCC)</li> <li>%B: "
+"Текст шаблона тела сообщения</li> <li>%A: Вложение </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Нажмите для поиска файла почтовой программы."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Выполнять в терминале"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Установите этот параметр, если хотите, чтобы ваш почтовый клиент выполнялся в "
-"терминале (например <em>Konsole</em>)"
+"Установите этот параметр, если хотите, чтобы ваш почтовый клиент выполнялся "
+"в терминале (например <em>Konsole</em>)"
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Использовать KMail как предпочтительный клиент электр. почты"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail - это стандартная почтовая программа среды TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Использовать &другой клиент электронной почты"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Выберите этот параметр, если вы хотите использовать любую другую почтовую "
 "программу."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Использовать &другую терминальную программу:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Использовать &Konsole как терминальное приложение"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Нажмите эту кнопку для поиска вашего любимого терминального клиента. Учтите, "
-"что выбранный вами файл должен иметь атрибут \"исполняемый\". "
-"<br> Учтите, что некоторые программы, которые используют эмулятор терминала, не "
-"будут работать, если вы добавите аргументы командной строки (пример: konsole "
-"-ls)."
+"что выбранный вами файл должен иметь атрибут \"исполняемый\". <br> Учтите, "
+"что некоторые программы, которые используют эмулятор терминала, не будут "
+"работать, если вы добавите аргументы командной строки (пример: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Нажмите для поиска терминальной программы."
diff --git a/tde-i18n-rw/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-rw/messages/tdebase/kcmcomponentchooser.po
index 92ec652bfc6..a65c78b893f 100644
--- a/tde-i18n-rw/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-rw/messages/tdebase/kcmcomponentchooser.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser 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-02 00:53-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"
@@ -59,8 +59,8 @@ msgstr "Kitazwi"
 #: componentchooser.cpp:408
 #, fuzzy
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt> Byahinduwe i Mburabuzi Bya , Kuri Kubika Guhindura... NONEAHA ? </qt> "
 
@@ -70,8 +70,8 @@ msgstr "Nta mwirondoro uhari"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Guhitamo uhereye ku rutonde hasi rwo inyangingo igomba gukoreshwa mu buryo "
 "mburabuzi ku bijyanye na serivisi %1. "
@@ -88,225 +88,185 @@ msgstr "Muhitamo w'Inyangingo"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Gufungura <b>http</b> na <b>https </b> URL</qt> "
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "muri porogaramu ishingiye ku biri muri URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "muri mucukumbuzi ikurikira:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Inyangingo Mburabuzi"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Hano ushobora guhindura porogaramu y'inyangingo. Inyangingo ni amaporogaramu "
 "afasha ibikorwa shingiro, nka mukuruzi igihera, muhinduzi y'umwandiko "
-"n'umukiriya imeli. Amaporogaramu TDE atandukanye akeneye guhamagara mukuruzi ya "
-"konsole, kohereza imeli cyangwa kwerekana umwandiko. Gukora ibyo mu buryo "
+"n'umukiriya imeli. Amaporogaramu TDE atandukanye akeneye guhamagara mukuruzi "
+"ya konsole, kohereza imeli cyangwa kwerekana umwandiko. Gukora ibyo mu buryo "
 "nyabwo, aya maporogaramu buri gihe ahamagara inyangingo zimwe. Ushobora "
 "guhitamo hano amaporogaramu ajyanye n'izi nyangingo."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Isobanuramiterere ry'Inyangingo"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Hano ushobora gusoma isobanuramiterere rito ry'inyangingo ryatoranyijwe "
-"rigezweho. Mu guhindura inyangingo yatoranyijwe, kanda ku rutonde ibumoso. Mu "
-"guhindura porogaramu y'inyangingo, wayihitamo hasi."
+"rigezweho. Mu guhindura inyangingo yatoranyijwe, kanda ku rutonde ibumoso. "
+"Mu guhindura porogaramu y'inyangingo, wayihitamo hasi."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Iyi ilisiti yerekana ubwoko bw'inyangingo bubonezwa. Kanda inyangingo ushaka "
-"kuboneza. </p>\n"
-"<p>Muri aka gasanduku kiganiro ushobora guhindura inyangingo mburabuzi za TDE. "
-"Inyangingo ni amaporogaramu afasha ibikorwa shingiro, nka mukuruzi igihera, "
-"muhinduzi w'umwandiko n'umukiriya imeli. Amaporogaramu TDE atandukanye rimwe na "
-"rimwe akeneye guhamagara mukuruzi wa konsole, kohereza ubutumwa cyangwa "
-"kwerekana umwandiko. Gukora ibyo mu buryo nyabwo, aya maporogaramu buri gihe "
-"ahamagara inyangingo zimwe. Ushobora guhitamo hano amaporogaramu ajyanye n'izi "
-"nyangingo.</p>\n"
+"<p>Iyi ilisiti yerekana ubwoko bw'inyangingo bubonezwa. Kanda inyangingo "
+"ushaka kuboneza. </p>\n"
+"<p>Muri aka gasanduku kiganiro ushobora guhindura inyangingo mburabuzi za "
+"TDE. Inyangingo ni amaporogaramu afasha ibikorwa shingiro, nka mukuruzi "
+"igihera, muhinduzi w'umwandiko n'umukiriya imeli. Amaporogaramu TDE "
+"atandukanye rimwe na rimwe akeneye guhamagara mukuruzi wa konsole, kohereza "
+"ubutumwa cyangwa kwerekana umwandiko. Gukora ibyo mu buryo nyabwo, aya "
+"maporogaramu buri gihe ahamagara inyangingo zimwe. Ushobora guhitamo hano "
+"amaporogaramu ajyanye n'izi nyangingo.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Aderesi y'uwandikiwe</li> "
-"<li>%s: Ikivugwaho</li> "
-"<li>%c: Kopi (CC)</li> "
-"<li>%b: Kopi Itagaragara (BCC)</li> "
-"<li>%B: Umwandiko w'Igihimba Inyandiko-rugero</li> "
-"<li>%A: Umugereka </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Aderesi y'uwandikiwe</li> <li>%s: Ikivugwaho</li> <li>%c: Kopi "
+"(CC)</li> <li>%b: Kopi Itagaragara (BCC)</li> <li>%B: Umwandiko w'Igihimba "
+"Inyandiko-rugero</li> <li>%A: Umugereka </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Kanda iyi buto mu guhitamo umukiriya imeli wifuje. Wamenya ko idosiye "
 "watoranyije igomba kugira itsinda ry'ibijyana bitangizwa kugira yemerwe. "
 "<br>Ushobora ariko gukoresha gukoresha uturindamwanya twinshi tuzasimburwa "
-"n'uduciro tw'ubu igihe imeli mukiriya yiswe:"
-"<ul> "
-"<li>%t: Aderesi y'uwandikiwe</li> "
-"<li>%s: Ikivugwaho</li> "
-"<li>%c: Kopi (CC)</li> "
-"<li>%b: Kopi Itagaragara (BCC)</li> "
-"<li>%B: Umwandiko w'Igihimba Inyandiko-rugero</li> "
-"<li>%A: Umugereka </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"n'uduciro tw'ubu igihe imeli mukiriya yiswe:<ul> <li>%t: Aderesi "
+"y'uwandikiwe</li> <li>%s: Ikivugwaho</li> <li>%c: Kopi (CC)</li> <li>%b: "
+"Kopi Itagaragara (BCC)</li> <li>%B: Umwandiko w'Igihimba Inyandiko-rugero</"
+"li> <li>%A: Umugereka </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Kanda hano mu gushakisha ibijyanye n'idosiye ya porogaramu y'ubutumwa"
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Gutangiza mu gihera"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Gukoresha ubu buryo niba ushaka ko umukiriya imeli watoranyijwe utangizwa mu "
 "gihera (urugero <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Gukoresha KMail nk'umukiriya imeli wifujwe"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail ni porogaramu y'Ubutumwa isanzwe ya TDE ibiro"
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Gukoresha umukiriya imeli utandukanye:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Guhitamo ubu buryo niba ushaka gukoresha indi porogaramu y'ubutumwa."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Gukoresha porogaramu igihera itandukanye: "
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Gukoresha Konsole nka porogaramu igihera"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Kanda iyi buto mu guhitamo umukiriya igihera wifuza. Wamenya ko idosiye "
 "wahisemo igomba kugira itsinda ry'ibijyana ritangizwa mu rwego rwo kugira "
-"byemerwe."
-"<br>Kandi wamenya ko amaporogaramu amwe n'amwe akoresha Mukuruzi Igihera "
-"zitazakora niba wongeyeho inkoresha y'umurongo w'ibwirizwa (Urugero: konsole "
-"-ls)"
+"byemerwe.<br>Kandi wamenya ko amaporogaramu amwe n'amwe akoresha Mukuruzi "
+"Igihera zitazakora niba wongeyeho inkoresha y'umurongo w'ibwirizwa (Urugero: "
+"konsole -ls)"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Kanda hano mu gushakisha porogaramu igihera."
diff --git a/tde-i18n-se/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-se/messages/tdebase/kcmcomponentchooser.po
index 69607f2c7b8..796455716a7 100644
--- a/tde-i18n-se/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-se/messages/tdebase/kcmcomponentchooser.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-06 22:51+0100\n"
 "Last-Translator: Børre Gaup <boerre@skolelinux.no>\n"
 "Language-Team: Northern Sami <i18n-sme@lister.ping.uio.no>\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 "Børre Gaup"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -49,8 +49,8 @@ msgstr "Amas"
 #: componentchooser.cpp:408
 #, fuzzy
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Don leat rievdadan standárdoasi. Háliidatgo vurket rievdadusa dál?</qt>"
 
@@ -60,10 +60,11 @@ msgstr "Ii leat válddahus olamuttus"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Vállje dan oasi maid háliidat geavahit %1 bálvalussii listtus dás vuolábealde."
+"Vállje dan oasi maid háliidat geavahit %1 bálvalussii listtus dás "
+"vuolábealde."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -77,199 +78,159 @@ msgstr "Oasseválljejeaddji"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Raba <b>http</b>- ja <b>https</b>-URL:aid</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr ""
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "dán fierpmádatloganis:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr " …"
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Standárdoassi"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Oasseválddahus"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Vuostáiváldi čujuhus</li> "
-"<li>%s: Fáddá</li> "
-"<li>%c: Máŋgus (CC)</li> "
-"<li>%b: Čiegus máŋgus</li> "
-"<li>%B: Dieđáhusmálle</li> "
-"<li>%A: Mielddus</li> </ul>"
+"<ul> <li>%t: Vuostáiváldi čujuhus</li> <li>%s: Fáddá</li> <li>%c: Máŋgus "
+"(CC)</li> <li>%b: Čiegus máŋgus</li> <li>%B: Dieđáhusmálle</li> <li>%A: "
+"Mielddus</li> </ul>"
 
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Deaddil dán boalu válljet oidojuvvon e-boastaprográmma. Fiila maid válljet "
-"ferte leat vuojehahtti prográmmafiila. "
-"<br>Sáhtát maiddái geavahit \"placeholders\" mat lonuhuvvojit čuovvovaš "
-"árvvuiguin go e-boastaprográmma álggahuvvo: "
-"<ul> "
-"<li>%t: Vuostáiváldi čujuhus</li> "
-"<li>%s: Fáddá</li> "
-"<li>%c: Máŋgus (CC)</li> "
-"<li>%b: Čiegus máŋgus</li> "
-"<li>%B: Dieđáhusmálle</li> "
+"ferte leat vuojehahtti prográmmafiila. <br>Sáhtát maiddái geavahit "
+"\"placeholders\" mat lonuhuvvojit čuovvovaš árvvuiguin go e-boastaprográmma "
+"álggahuvvo: <ul> <li>%t: Vuostáiváldi čujuhus</li> <li>%s: Fáddá</li> <li>"
+"%c: Máŋgus (CC)</li> <li>%b: Čiegus máŋgus</li> <li>%B: Dieđáhusmálle</li> "
 "<li>%A: Mielddus</li> </ul>"
 
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Coahkkal dákko ohcan dihte e-boastaprográmma."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Vuoje terminálas"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Geavat dán molssaeavttu jos háliidat ahte e-boastaprográmma galgá terminálláses "
-"vuojehuvvot (omd. <em>Konsole</em>)."
+"Geavat dán molssaeavttu jos háliidat ahte e-boastaprográmma galgá "
+"terminálláses vuojehuvvot (omd. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Geavat KMail oidojuvvon e-boastaprográmman"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail lea TDE:a standárda e-boastaprográmma."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Geavat &eará e-boastaprográmma:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Vállje dán molssaeavttu jus háliidat geavahit eará e-boastaprográmma."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Geavat eará &terminálprográmma:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Geavat Konsole terminálprográmman"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Coahkkal dákko ohcan dihte terminálprográmma."
diff --git a/tde-i18n-sk/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-sk/messages/tdebase/kcmcomponentchooser.po
index 33f5d070285..6ab26e3fcfe 100644
--- a/tde-i18n-sk/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-sk/messages/tdebase/kcmcomponentchooser.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-25 16:20+0100\n"
 "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
 "Language-Team: Slovak <en@li.org>\n"
@@ -18,13 +18,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"
@@ -48,8 +48,8 @@ msgstr "Neznámy"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr "<qt>Zmenili ste štandardný komponent. Chcete tieto zmeny uložiť?</qt>"
 
 #: componentchooser.cpp:412
@@ -58,8 +58,8 @@ msgstr "Popis nie je k dispozícii"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr "Vyberte si zo zoznamu, ktorý komponent sa má používať pre službu %1."
 
 #: kcm_componentchooser.cpp:34
@@ -74,222 +74,183 @@ msgstr "Výber komponent"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Otvára URL pre <b>http</b> a <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "v aplikácii podľa obsahu URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "v tomto prehliadači:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Štandardný komponent"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Tu môžete zmeniť program komponentu. Sú to programy, ktoré vykonávajú základné "
-"činnosti, ako je emulátor terminálu, textový editor a poštový klient. Rôzne TDE "
-"aplikácie niekedy potrebujú spustiť príkazový riadok, poslať e-mail alebo "
-"zobraziť nejaký text. Aby to bolo konzistentné, vždy sa použijú tieto "
-"komponenty. Tu si môžete vybrať, ktoré to budú."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"Tu môžete zmeniť program komponentu. Sú to programy, ktoré vykonávajú "
+"základné činnosti, ako je emulátor terminálu, textový editor a poštový "
+"klient. Rôzne TDE aplikácie niekedy potrebujú spustiť príkazový riadok, "
+"poslať e-mail alebo zobraziť nejaký text. Aby to bolo konzistentné, vždy sa "
+"použijú tieto komponenty. Tu si môžete vybrať, ktoré to budú."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Popis komponentu"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Tu si môžete prečítať krátky popis práve vybraného komponentu. Aby ste ho "
-"zmenili, kliknite v zozname vľavo. Aby ste zmenili program pre tento komponent, "
-"vyberte ho nižšie."
+"zmenili, kliknite v zozname vľavo. Aby ste zmenili program pre tento "
+"komponent, vyberte ho nižšie."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Tento zoznam ukazuje typy nastaviteľných komponentov. Kliknite na komponent, "
-"ktorý chcete upraviť.</p>\n"
+"<p>Tento zoznam ukazuje typy nastaviteľných komponentov. Kliknite na "
+"komponent, ktorý chcete upraviť.</p>\n"
 "<p>V tomto dialógu môžete zmeniť štandardné komponenty TDE. Sú to programy, "
-"ktoré vykonávajú základné činnosti, ako je emulátor terminálu, textový editor a "
-"poštový klient. Rôzne TDE aplikácie niekedy potrebujú spustiť príkazový riadok, "
-"poslať e-mail alebo zobraziť nejaký text. Aby to bolo konzistentné, vždy sa "
-"použijú tieto komponenty. Tu si môžete vybrať, ktoré to budú.</p>\n"
+"ktoré vykonávajú základné činnosti, ako je emulátor terminálu, textový "
+"editor a poštový klient. Rôzne TDE aplikácie niekedy potrebujú spustiť "
+"príkazový riadok, poslať e-mail alebo zobraziť nejaký text. Aby to bolo "
+"konzistentné, vždy sa použijú tieto komponenty. Tu si môžete vybrať, ktoré "
+"to budú.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul>"
-"<li>%t: Adresa príjemcu</li> "
-"<li>%s: Predmet</li> "
-"<li>%c: Kópia (CC) </li>"
-"<li>%b: Neviditeľná kópia (BCC)</li> "
-"<li>%B: Text šablóny tela</li> "
-"<li>%A: Príloha</li></ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul><li>%t: Adresa príjemcu</li> <li>%s: Predmet</li> <li>%c: Kópia (CC) </"
+"li><li>%b: Neviditeľná kópia (BCC)</li> <li>%B: Text šablóny tela</li> <li>"
+"%A: Príloha</li></ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Stlačením tohto tlačidla môžete vybrať svojho obľúbeného poštového klienta. "
 "Uvedomte si, že súbor, ktorý vyberiete, musí byť možné spustiť. Iba tak bude "
-"považovaný za platnú voľbu."
-"<br>V príkaze môžete použiť niektoré zástupné znaky, ktoré sa nahradia "
-"skutočnými hodnotami pri spustení poštového klienta: "
-"<ul>"
-"<li>%t: Adresa príjemcu</li> "
-"<li>%s: Predmet</li> "
-"<li>%c: Kópia (CC) </li>"
-"<li>%b: Neviditeľná kópia (BCC)</li> "
-"<li>%B: Text šablóny tela</li> "
-"<li>%A: Príloha</li></ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"považovaný za platnú voľbu.<br>V príkaze môžete použiť niektoré zástupné "
+"znaky, ktoré sa nahradia skutočnými hodnotami pri spustení poštového "
+"klienta: <ul><li>%t: Adresa príjemcu</li> <li>%s: Predmet</li> <li>%c: Kópia "
+"(CC) </li><li>%b: Neviditeľná kópia (BCC)</li> <li>%B: Text šablóny tela</"
+"li> <li>%A: Príloha</li></ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Sem kliknite, ak chcete nájsť súbor poštového programu."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Spustiť na &termináli"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Túto voľbu zapnite, ak chcete, aby sa vybraný poštový klient spúšťal v "
 "termináli (napr. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Použiť ako poštového klienta KMail"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail je štandardný poštový klient pre prostredie TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Použiť iného &poštového klienta:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Pomocou tejto voľby môžete použiť iný poštový program."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Použiť iný &terminál:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Použiť ako terminál Konsole"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Stlačením tohto tlačidla môžete vybrať svoj obľúbený terminál. Uvedomte si, že "
-"súbor, ktorý vyberiete, musí byť spustiteľný."
-"<br>Ďalej si uvedomte, že niektoré programy, ktoré emulátor terminálu budú "
-"používať, nemusia fungovať v prípade, že zadáte pre emulátor argumenty pre "
-"príkazový riadok (napr. konsole -ls)."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"Stlačením tohto tlačidla môžete vybrať svoj obľúbený terminál. Uvedomte si, "
+"že súbor, ktorý vyberiete, musí byť spustiteľný.<br>Ďalej si uvedomte, že "
+"niektoré programy, ktoré emulátor terminálu budú používať, nemusia fungovať "
+"v prípade, že zadáte pre emulátor argumenty pre príkazový riadok (napr. "
+"konsole -ls)."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Sem kliknite, ak chcete vybrať emulátor terminálu."
diff --git a/tde-i18n-sl/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-sl/messages/tdebase/kcmcomponentchooser.po
index 9c20f278d62..e2a13524b11 100644
--- a/tde-i18n-sl/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-sl/messages/tdebase/kcmcomponentchooser.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-08 17:56+0100\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -23,13 +23,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"
@@ -53,8 +53,8 @@ msgstr "Neznano"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Spremenili ste privzeto komponento po svoji želji. Ali želite shraniti "
 "spremembo?</qt>"
@@ -65,10 +65,11 @@ msgstr "Opis ni na voljo"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Izberite iz spodnjega seznama sestavni del, ki naj se uporablja za storitev %1."
+"Izberite iz spodnjega seznama sestavni del, ki naj se uporablja za storitev "
+"%1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -82,223 +83,184 @@ msgstr "Izbiralnik komponent"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Odpri URL-je <b>http</b> in <b>https</b> </qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "v programu na osnovi vsebine URL-ja"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "v naslednjem brskalniku:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Privzeta komponenta"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Tu lahko spremenite program komponente. Komponente so programi, ki opravljajo "
-"osnovne naloge, kot so terminalni emulator, urejevalnik besedil in odjemalec "
-"e-pošte. Različni programi za TDE včasih potrebujejo konzolo, poslati pošto ali "
-"pikazati nekaj besedila. Ta se to zgodi usklajeno, ti programi vedno prikličejo "
-"iste komponente. Tu lahko izberete, kateri programi so te komponente."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"Tu lahko spremenite program komponente. Komponente so programi, ki "
+"opravljajo osnovne naloge, kot so terminalni emulator, urejevalnik besedil "
+"in odjemalec e-pošte. Različni programi za TDE včasih potrebujejo konzolo, "
+"poslati pošto ali pikazati nekaj besedila. Ta se to zgodi usklajeno, ti "
+"programi vedno prikličejo iste komponente. Tu lahko izberete, kateri "
+"programi so te komponente."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Opis komponente"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Tu lako preberete kratek opis trenutno izbrane komponente. Da spremenite "
 "izbrano komponento, kliknite na seznam na levi. Da bi spremenili program "
 "komponente, izberite spodaj."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p> Ta seznam prikazuje prilagodljive vrste komponent. Kliknite komponento, ki "
-"bi jo radi prilagodili.</p>\n"
-"<p>V tem oknu lahko spremenite privzete komponente TDE. Komponente so programi, "
-"ki opravljajo osnovne naloge, kot so terminalni emulator, urejevalnik besedil "
-"in odjemalec e-pošte. Različni programi za TDE včasih potrebujejo konzolo, "
-"poslati pošto ali pikazati nekaj besedila. Ta se to zgodi usklajeno, ti "
-"programi vedno prikličejo iste komponente. Tu lahko izberete, kateri programi "
-"so te komponente."
-
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+"<p> Ta seznam prikazuje prilagodljive vrste komponent. Kliknite komponento, "
+"ki bi jo radi prilagodili.</p>\n"
+"<p>V tem oknu lahko spremenite privzete komponente TDE. Komponente so "
+"programi, ki opravljajo osnovne naloge, kot so terminalni emulator, "
+"urejevalnik besedil in odjemalec e-pošte. Različni programi za TDE včasih "
+"potrebujejo konzolo, poslati pošto ali pikazati nekaj besedila. Ta se to "
+"zgodi usklajeno, ti programi vedno prikličejo iste komponente. Tu lahko "
+"izberete, kateri programi so te komponente."
+
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Naslov prejemnika</li> "
-"<li>%s: Zadeva</li> "
-"<li>%c: Kopijo prejme (Kp)</li> "
-"<li>%b: Skrito kopijo prejme (Skp)</li> "
-"<li>%B: Besedilo predloge telesa</li> "
-"<li>%A: Priloga </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Naslov prejemnika</li> <li>%s: Zadeva</li> <li>%c: Kopijo "
+"prejme (Kp)</li> <li>%b: Skrito kopijo prejme (Skp)</li> <li>%B: Besedilo "
+"predloge telesa</li> <li>%A: Priloga </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Kliknite ta gumb za izbiro vašega najljubšega e-poštnega odjemalca. Prosim "
-"vedite, da mora imeti izbrana datoteka nastavljen atribut za izvajanje, da bo "
-"sprejeta."
-"<br> Lahko tudi uporabite več nadomestiteljev, ki bodo nadomeščeni takrat, ko "
-"bo e-poštni odjemalec poklican."
-"<ul> "
-"<li>%t: Naslov prejemnika</li> "
-"<li>%s: Zadeva</li> "
-"<li>%c: Kopijo prejme (Kp)</li> "
-"<li>%b: Skrito kopijo prejme (Skp)</li> "
-"<li>%B: Besedilo predloge telesa</li> "
-"<li>%A: Priloga </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"vedite, da mora imeti izbrana datoteka nastavljen atribut za izvajanje, da "
+"bo sprejeta.<br> Lahko tudi uporabite več nadomestiteljev, ki bodo "
+"nadomeščeni takrat, ko bo e-poštni odjemalec poklican.<ul> <li>%t: Naslov "
+"prejemnika</li> <li>%s: Zadeva</li> <li>%c: Kopijo prejme (Kp)</li> <li>%b: "
+"Skrito kopijo prejme (Skp)</li> <li>%B: Besedilo predloge telesa</li> <li>"
+"%A: Priloga </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Kliknite tukaj, da bi poiskali programsko datoteko za pošto."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Poženi v terminalu"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Aktivirajte to možnost, če želite izbran odjemalec e-pošte pognati v terminalu "
-"(npr. <em>Konzoli</em>)."
+"Aktivirajte to možnost, če želite izbran odjemalec e-pošte pognati v "
+"terminalu (npr. <em>Konzoli</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Uporabi KMail kot prednostni odjemalec e-pošte"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail je standarden poštni program za namizje TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Uporabi drug odjemalec &e-pošte:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Izberite to možnost, če želite uporabiti katerikoli drug poštni program."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Uporabi drug &terminalni program:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Uporabi Konzolo kot terminalni program"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Pritisnite ta gumb, da izberete vašega najljubšega terminalskega odjemnika. "
-"Prosim vedite, da mora imeti izbrana datoteka nastavljen atribut izvedljivosti, "
-"da je sprejeta. "
-"<br>Vedite tudi, da nekateri programi, ki uporabljajo terminalski emulator, ne "
-"bodo delovali, če dodate argumente ukazne vrstice (primer: konsole -ls)."
+"Prosim vedite, da mora imeti izbrana datoteka nastavljen atribut "
+"izvedljivosti, da je sprejeta. <br>Vedite tudi, da nekateri programi, ki "
+"uporabljajo terminalski emulator, ne bodo delovali, če dodate argumente "
+"ukazne vrstice (primer: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Kliknite tukaj, da bi poiskali terminalsnki programo."
diff --git a/tde-i18n-sr/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-sr/messages/tdebase/kcmcomponentchooser.po
index 40303e6e946..2cec07eddd1 100644
--- a/tde-i18n-sr/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-sr/messages/tdebase/kcmcomponentchooser.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-08 15:11+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -18,13 +18,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"
@@ -48,11 +48,11 @@ msgstr "Непознат"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Променили сте подразумевану жељену компоненту, желите ли сада да снимите ту "
-"промену?</qt>"
+"<qt>Променили сте подразумевану жељену компоненту, желите ли сада да снимите "
+"ту промену?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -60,11 +60,11 @@ msgstr "Опис није доступан"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Изаберите из листе испод која ће компонента бити коришћена као подразумевана за "
-"сервис %1."
+"Изаберите из листе испод која ће компонента бити коришћена као подразумевана "
+"за сервис %1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -78,224 +78,185 @@ msgstr "Изборник компоненти"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "© 2002, Џозеф Венингер (Joseph Wenninger)"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Отвори <b>http</b> и <b>https</b> URL-ове</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "у програму на основу садржаја URL-а"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "у следеђем прегледачу:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Подразумевана компонента"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Овде можете променити компонентски програм. Компоненте су програми који рукују "
-"основним задацима, као што је емулација терминала, уређивање текста и "
-"е-поштански клијент. Различити TDE-ови програми понекад имају потребу да позову "
-"емулатор терминала, да пошаљу е-поруку или прикажу неки текст. Да би то радили "
-"усаглашено, сви они увек позивају исте компоненте. Овде можете одабрати који су "
-"програми те компоненте."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"Овде можете променити компонентски програм. Компоненте су програми који "
+"рукују основним задацима, као што је емулација терминала, уређивање текста и "
+"е-поштански клијент. Различити TDE-ови програми понекад имају потребу да "
+"позову емулатор терминала, да пошаљу е-поруку или прикажу неки текст. Да би "
+"то радили усаглашено, сви они увек позивају исте компоненте. Овде можете "
+"одабрати који су програми те компоненте."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Опис компоненте"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Овде можете прочитати мали опис тренутно одабране компоненте. Ради промене "
 "компоненте, кликните у листу са леве стране. Да бисте променили програм "
 "компоненте, одаберите га доле."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Ова листа приказује подесиве врсте компоненти. Кликните на компоненту коју "
-"желите да подесите.</p>\n"
+"<p>Ова листа приказује подесиве врсте компоненти. Кликните на компоненту "
+"коју желите да подесите.</p>\n"
 "<p>У овом дијалогу можете променити TDE-ове подразумеване компоненте. "
 "Компоненте су програми који рукују основним задацима, као што је емулација "
-"терминала, уређивање текста и е-поштански клијент. Различити TDE-ови програми "
-"понекад имају потребу да позову емулатор терминала, да пошаљу е-поруку или "
-"прикажу неки текст. Да би то радили усаглашено, сви они увек позивају исте "
-"компоненте. Овде можете одабрати који су програми те компоненте.</p>\n"
+"терминала, уређивање текста и е-поштански клијент. Различити TDE-ови "
+"програми понекад имају потребу да позову емулатор терминала, да пошаљу е-"
+"поруку или прикажу неки текст. Да би то радили усаглашено, сви они увек "
+"позивају исте компоненте. Овде можете одабрати који су програми те "
+"компоненте.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Адреса примаоца</li> "
-"<li>%s: Тема</li> "
-"<li>%c: Копија (CC)</li> "
-"<li>%b: Невидљива копија (BCC)</li> "
-"<li>%B: Текст тела шаблона</li> "
-"<li>%A: Прилог </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Адреса примаоца</li> <li>%s: Тема</li> <li>%c: Копија (CC)</li> "
+"<li>%b: Невидљива копија (BCC)</li> <li>%B: Текст тела шаблона</li> <li>%A: "
+"Прилог </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Притисните ово дугме да бисте изабрали жељени е-поштански клијент. Имајте на "
 "уму да фајл који изаберете мора имати постављен извршни атрибут да био "
-"прихваћен."
-"<br> Такође можете користити неколико симбола који ће бити замењени стварним "
-"вредностима када се позове е-поштански клијент:"
-"<ul> "
-"<li>%t: Адреса примаоца</li> "
-"<li>%s: Тема</li> "
-"<li>%c: Копија (CC)</li> "
-"<li>%b: Невидљива копија (BCC)</li> "
-"<li>%B: Текст тела шаблона</li> "
-"<li>%A: Прилог </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"прихваћен.<br> Такође можете користити неколико симбола који ће бити "
+"замењени стварним вредностима када се позове е-поштански клијент:<ul> <li>"
+"%t: Адреса примаоца</li> <li>%s: Тема</li> <li>%c: Копија (CC)</li> <li>%b: "
+"Невидљива копија (BCC)</li> <li>%B: Текст тела шаблона</li> <li>%A: Прилог </"
+"li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Кликните овде да бисте потражили програм за пошту."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Пок&рени у терминалу"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Укључите ову опцију ако желите да се изабрани е-поштански клијент извршава у "
 "терминалу (нпр. у <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Користи KMail као подразумевани е-поштански клијент"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail је стандардни програм за пошту у TDE окружењу."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Користи други &е-поштански клијент:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Одаберите ову опцију ако желите да користите други програм за пошту."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Користи други &терминалски програм:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Користи Konsole као терминалски програм"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Притисните ово дугме да бисте одабрали подразумевани терминалски клијент. "
 "Приметите да фајл који одаберете мора да има постављен извршни атрибут да би "
-"био прихваћен. "
-"<br>Такође, приметите да неки програми који користе емулатор терминала, неће "
-"радити ако додате аргументе командне линије (нпр: konsole -ls)."
+"био прихваћен. <br>Такође, приметите да неки програми који користе емулатор "
+"терминала, неће радити ако додате аргументе командне линије (нпр: konsole -"
+"ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Кликните овде да бисте потражили терминалски програм."
diff --git a/tde-i18n-sr@Latn/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-sr@Latn/messages/tdebase/kcmcomponentchooser.po
index cbe07a616ab..f6147081474 100644
--- a/tde-i18n-sr@Latn/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-sr@Latn/messages/tdebase/kcmcomponentchooser.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-08 15:11+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -18,13 +18,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"
@@ -48,11 +48,11 @@ msgstr "Nepoznat"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Promenili ste podrazumevanu željenu komponentu, želite li sada da snimite "
-"tu promenu?</qt>"
+"<qt>Promenili ste podrazumevanu željenu komponentu, želite li sada da "
+"snimite tu promenu?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -60,11 +60,11 @@ msgstr "Opis nije dostupan"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Izaberite iz liste ispod koja će komponenta biti korišćena kao podrazumevana za "
-"servis %1."
+"Izaberite iz liste ispod koja će komponenta biti korišćena kao podrazumevana "
+"za servis %1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -78,224 +78,185 @@ msgstr "Izbornik komponenti"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "© 2002, Džozef Veninger (Joseph Wenninger)"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Otvori <b>http</b> i <b>https</b> URL-ove</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "u programu na osnovu sadržaja URL-a"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "u sledeđem pregledaču:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Podrazumevana komponenta"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"Ovde možete promeniti komponentski program. Komponente su programi koji rukuju "
-"osnovnim zadacima, kao što je emulacija terminala, uređivanje teksta i "
-"e-poštanski klijent. Različiti TDE-ovi programi ponekad imaju potrebu da pozovu "
-"emulator terminala, da pošalju e-poruku ili prikažu neki tekst. Da bi to radili "
-"usaglašeno, svi oni uvek pozivaju iste komponente. Ovde možete odabrati koji su "
-"programi te komponente."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"Ovde možete promeniti komponentski program. Komponente su programi koji "
+"rukuju osnovnim zadacima, kao što je emulacija terminala, uređivanje teksta "
+"i e-poštanski klijent. Različiti TDE-ovi programi ponekad imaju potrebu da "
+"pozovu emulator terminala, da pošalju e-poruku ili prikažu neki tekst. Da bi "
+"to radili usaglašeno, svi oni uvek pozivaju iste komponente. Ovde možete "
+"odabrati koji su programi te komponente."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Opis komponente"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Ovde možete pročitati mali opis trenutno odabrane komponente. Radi promene "
 "komponente, kliknite u listu sa leve strane. Da biste promenili program "
 "komponente, odaberite ga dole."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Ova lista prikazuje podesive vrste komponenti. Kliknite na komponentu koju "
-"želite da podesite.</p>\n"
+"<p>Ova lista prikazuje podesive vrste komponenti. Kliknite na komponentu "
+"koju želite da podesite.</p>\n"
 "<p>U ovom dijalogu možete promeniti TDE-ove podrazumevane komponente. "
 "Komponente su programi koji rukuju osnovnim zadacima, kao što je emulacija "
-"terminala, uređivanje teksta i e-poštanski klijent. Različiti TDE-ovi programi "
-"ponekad imaju potrebu da pozovu emulator terminala, da pošalju e-poruku ili "
-"prikažu neki tekst. Da bi to radili usaglašeno, svi oni uvek pozivaju iste "
-"komponente. Ovde možete odabrati koji su programi te komponente.</p>\n"
+"terminala, uređivanje teksta i e-poštanski klijent. Različiti TDE-ovi "
+"programi ponekad imaju potrebu da pozovu emulator terminala, da pošalju e-"
+"poruku ili prikažu neki tekst. Da bi to radili usaglašeno, svi oni uvek "
+"pozivaju iste komponente. Ovde možete odabrati koji su programi te "
+"komponente.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Adresa primaoca</li> "
-"<li>%s: Tema</li> "
-"<li>%c: Kopija (CC)</li> "
-"<li>%b: Nevidljiva kopija (BCC)</li> "
-"<li>%B: Tekst tela šablona</li> "
-"<li>%A: Prilog </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Adresa primaoca</li> <li>%s: Tema</li> <li>%c: Kopija (CC)</li> "
+"<li>%b: Nevidljiva kopija (BCC)</li> <li>%B: Tekst tela šablona</li> <li>%A: "
+"Prilog </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Pritisnite ovo dugme da biste izabrali željeni e-poštanski klijent. Imajte na "
-"umu da fajl koji izaberete mora imati postavljen izvršni atribut da bio "
-"prihvaćen."
-"<br> Takođe možete koristiti nekoliko simbola koji će biti zamenjeni stvarnim "
-"vrednostima kada se pozove e-poštanski klijent:"
-"<ul> "
-"<li>%t: Adresa primaoca</li> "
-"<li>%s: Tema</li> "
-"<li>%c: Kopija (CC)</li> "
-"<li>%b: Nevidljiva kopija (BCC)</li> "
-"<li>%B: Tekst tela šablona</li> "
-"<li>%A: Prilog </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Pritisnite ovo dugme da biste izabrali željeni e-poštanski klijent. Imajte "
+"na umu da fajl koji izaberete mora imati postavljen izvršni atribut da bio "
+"prihvaćen.<br> Takođe možete koristiti nekoliko simbola koji će biti "
+"zamenjeni stvarnim vrednostima kada se pozove e-poštanski klijent:<ul> <li>"
+"%t: Adresa primaoca</li> <li>%s: Tema</li> <li>%c: Kopija (CC)</li> <li>%b: "
+"Nevidljiva kopija (BCC)</li> <li>%B: Tekst tela šablona</li> <li>%A: Prilog "
+"</li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Kliknite ovde da biste potražili program za poštu."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Pok&reni u terminalu"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Uključite ovu opciju ako želite da se izabrani e-poštanski klijent izvršava u "
-"terminalu (npr. u <em>Konsole</em>)."
+"Uključite ovu opciju ako želite da se izabrani e-poštanski klijent izvršava "
+"u terminalu (npr. u <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Koristi KMail kao podrazumevani e-poštanski klijent"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail je standardni program za poštu u TDE okruženju."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Koristi drugi &e-poštanski klijent:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Odaberite ovu opciju ako želite da koristite drugi program za poštu."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Koristi drugi &terminalski program:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Koristi Konsole kao terminalski program"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Pritisnite ovo dugme da biste odabrali podrazumevani terminalski klijent. "
-"Primetite da fajl koji odaberete mora da ima postavljen izvršni atribut da bi "
-"bio prihvaćen. "
-"<br>Takođe, primetite da neki programi koji koriste emulator terminala, neće "
-"raditi ako dodate argumente komandne linije (npr: konsole -ls)."
+"Primetite da fajl koji odaberete mora da ima postavljen izvršni atribut da "
+"bi bio prihvaćen. <br>Takođe, primetite da neki programi koji koriste "
+"emulator terminala, neće raditi ako dodate argumente komandne linije (npr: "
+"konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Kliknite ovde da biste potražili terminalski program."
diff --git a/tde-i18n-ss/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-ss/messages/tdebase/kcmcomponentchooser.po
index 17702609b8a..6ac392cc251 100644
--- a/tde-i18n-ss/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-ss/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-06 17:06+0100\n"
 "PO-Revision-Date: 2002-11-13 15:18+0200\n"
 "Last-Translator: Adam Mathebula <adam@translate.org.za>\n"
 "Language-Team: Siswati <siswati@translate.org.za>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Adam Mathebula"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -47,11 +47,11 @@ msgstr "Ngatiwa"
 #: componentchooser.cpp:408
 #, fuzzy
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Utjintje incenye yelizinga lekutsandza kwakho, ingabe ufuna kukugcina loko "
-"nyalo ? <BR><BR>Kukhetsa <B>No</B> kutawulahla lutjintgjo lwakho</qt>"
+"<qt>Utjintje incenye yelizinga lekutsandza kwakho, ingabe ufuna kukugcina "
+"loko nyalo ? <BR><BR>Kukhetsa <B>No</B> kutawulahla lutjintgjo lwakho</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -59,11 +59,11 @@ msgstr "Akukho sichasiso lesikhona"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Khetsa kuleluhlu lolungentansi kutsi nguyiphi incenye lekufanele yisetjentiswe "
-"ngekuhluleka kwe %1 lusito."
+"Khetsa kuleluhlu lolungentansi kutsi nguyiphi incenye lekufanele "
+"yisetjentiswe ngekuhluleka kwe %1 lusito."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -77,200 +77,161 @@ msgstr "Sikhetsi sencenye"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr ""
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr ""
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr ""
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Inyenye yekwehluleka"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Sichasiso sencenye"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Likheli lemamukeli</li> "
-"<li>%s: Sihloko</li> "
-"<li>%c: Sitsatsiso se Carbon  (CC)</li> "
-"<li>%b: Sitsatsiso se Carbon lengaboni (BCC)</li> "
-"<li>%B: Umbhalo weluhlaka lemtimba</li> "
-"<li>%A: Lokunamatsiselwe </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Likheli lemamukeli</li> <li>%s: Sihloko</li> <li>%c: Sitsatsiso "
+"se Carbon  (CC)</li> <li>%b: Sitsatsiso se Carbon lengaboni (BCC)</li> <li>"
+"%B: Umbhalo weluhlaka lemtimba</li> <li>%A: Lokunamatsiselwe </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Cindzetela lenkhinobho kukhetsa likhasimende le email yakho loyitsandzako. "
-"Uyacelwa kutsi ucaphele  kutsi lelifayela lolikhetsile kufanele libe nebunjalo "
-"lobuchubekekako kuze lamukeleke."
-"<br> Ungasebentisa ngalokunjalo titsatsandzawo letinyentana letitawubekwa "
-"nemanani yelucobo nangabe likhasimende le email libitiwe: "
-"<ul> "
-"<li>%t: Likheli lemamukeli</li> "
-"<li>%s: Sihloko</li> "
-"<li>%c: Sitsatsiso se Carbon (CC)</li> "
-"<li>%b: Sitsatsiso seCarbon lengaboni (BCC)</li> "
-"<li>%B: Umbhalo weluhlaka lemtimba</li> "
-"<li>%A: Lokunamatsiselwe </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Uyacelwa kutsi ucaphele  kutsi lelifayela lolikhetsile kufanele libe "
+"nebunjalo lobuchubekekako kuze lamukeleke.<br> Ungasebentisa ngalokunjalo "
+"titsatsandzawo letinyentana letitawubekwa nemanani yelucobo nangabe "
+"likhasimende le email libitiwe: <ul> <li>%t: Likheli lemamukeli</li> <li>%s: "
+"Sihloko</li> <li>%c: Sitsatsiso se Carbon (CC)</li> <li>%b: Sitsatsiso "
+"seCarbon lengaboni (BCC)</li> <li>%B: Umbhalo weluhlaka lemtimba</li> <li>"
+"%A: Lokunamatsiselwe </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Sebentisa esikhungweni"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Vuselela lokwenta ngalenye indlela nangabe ufuna lelikhasimende le-email "
 "lekhetsiwe kutsi lichubekiseke esikhungweni (e.g. <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Sebentisa i-Kmail njenge-email yelikhasimende lenconotwako"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Sebentisa likhasimende le-email &lehlukile:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Sebentisa luhlelo &lwesikhungo lesehlukile:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Sebentisa i-Konsole njengesicelo sesikhungo"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr ""
diff --git a/tde-i18n-sv/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-sv/messages/tdebase/kcmcomponentchooser.po
index fe0978b9569..fc5ba0776fc 100644
--- a/tde-i18n-sv/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-sv/messages/tdebase/kcmcomponentchooser.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-21 18:00+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,13 +17,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 "Stefan Asserhäll"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -47,8 +47,8 @@ msgstr "Okänd"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Du ändrade vald standardkomponent. Vill du spara ändringen nu?</qt>"
 
@@ -58,8 +58,8 @@ msgstr "Ingen beskrivning tillgänglig"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr "Välj vilken komponent som normalt ska användas för tjänsten %1."
 
 #: kcm_componentchooser.cpp:34
@@ -74,222 +74,182 @@ msgstr "Komponentväljare"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "© 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Öppna webbadresser med <b>http</b> och <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "i ett program baserat på innehållet i webbadressen"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "i följande webbläsare:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Standardkomponent"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Här kan du ändra komponentprogram. Komponenter är program som hanterar "
-"grundläggande uppgifter, som terminalprogrammet, texteditorn och "
-"e-postprogrammet. Olika TDE-program kan ibland behöva starta en terminal, "
+"grundläggande uppgifter, som terminalprogrammet, texteditorn och e-"
+"postprogrammet. Olika TDE-program kan ibland behöva starta en terminal, "
 "skicka e-post eller visa text. För att göra det på samma sätt, använder "
-"programmen alltid samma komponenter. Här kan du välja vilka program som används "
-"som komponenter."
+"programmen alltid samma komponenter. Här kan du välja vilka program som "
+"används som komponenter."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Komponentbeskrivning"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Du kan läsa en kort beskrivning av komponenten som för närvarande är vald här. "
-"För att ändra den markerade komponenten, klicka på listan till vänster. För att "
-"ändra komponentprogrammet, välj det nedan."
+"Du kan läsa en kort beskrivning av komponenten som för närvarande är vald "
+"här. För att ändra den markerade komponenten, klicka på listan till vänster. "
+"För att ändra komponentprogrammet, välj det nedan."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>Den här listan visar komponenttyper som kan ställas in. Klicka på "
 "komponenten du vill ändra.</p>\n"
-"<p>Du kan ändra TDE:s förvalda komponenter i den här dialogrutan. Komponenter "
-"är program som hanterar grundläggande uppgifter, som terminalprogrammet, "
-"texteditorn och e-postprogrammet. Olika TDE-program kan ibland behöva starta en "
-"terminal, skicka e-post eller visa text. För att göra det på samma sätt, "
-"använder programmen alltid samma komponenter. Här kan du välja vilka program "
-"som används som komponenter.</p>\n"
+"<p>Du kan ändra TDE:s förvalda komponenter i den här dialogrutan. "
+"Komponenter är program som hanterar grundläggande uppgifter, som "
+"terminalprogrammet, texteditorn och e-postprogrammet. Olika TDE-program kan "
+"ibland behöva starta en terminal, skicka e-post eller visa text. För att "
+"göra det på samma sätt, använder programmen alltid samma komponenter. Här "
+"kan du välja vilka program som används som komponenter.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Mottagarens adress</li> "
-"<li>%s: Rubrik</li> "
-"<li>%c: Kopia (CC)</li> "
-"<li>%b: Dold kopia (BCC)</li> "
-"<li>%B: Mallens text</li> "
-"<li>%A: Bilaga</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Mottagarens adress</li> <li>%s: Rubrik</li> <li>%c: Kopia (CC)</"
+"li> <li>%b: Dold kopia (BCC)</li> <li>%B: Mallens text</li> <li>%A: Bilaga</"
+"li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Klicka på knappen för att välja önskad e-postklient. Observera att filen du "
-"väljer måste ha körbehörigheter för att accepteras."
-"<br> Du kan också använda flera platsmarkörer, som ersätts med riktiga värden "
-"då e-postklienten anropas:"
-"<ul> "
-"<li>%t: Mottagarens adress</li> "
-"<li>%s: Rubrik</li> "
-"<li>%c: Kopia (CC)</li> "
-"<li>%b: Dold kopia (BCC)</li> "
-"<li>%B: Mallens text</li> "
-"<li>%A: Bilaga </li></ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"väljer måste ha körbehörigheter för att accepteras.<br> Du kan också använda "
+"flera platsmarkörer, som ersätts med riktiga värden då e-postklienten "
+"anropas:<ul> <li>%t: Mottagarens adress</li> <li>%s: Rubrik</li> <li>%c: "
+"Kopia (CC)</li> <li>%b: Dold kopia (BCC)</li> <li>%B: Mallens text</li> <li>"
+"%A: Bilaga </li></ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Klicka här för att hitta e-postprogrammets fil."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Kö&r i terminal"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Markera det här alternativet om du vill att den valda e-postklienten ska köras "
-"i en terminal (t ex <em>Konsole</em>)."
+"Markera det här alternativet om du vill att den valda e-postklienten ska "
+"köras i en terminal (t ex <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "Använd &Kmail som e-postklient"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail är standardprogram för e-post med TDE skrivbordsmiljön."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "A&nvänd en annan e-postklient:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Markera alternativet om du vill använda något annat e-postprogram."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Använd ett annat &terminalprogram:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "A&nvänd Konsole som terminalprogram"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"Tryck på den här knappen för att välja din favoritterminal. Observera att filen "
-"som du väljer måste vara körbar för att accepteras."
-"<br>Observera också att vissa program som använder en terminalemulator inte "
-"fungerar om du lägger till kommandoradsväljare (till exempel: konsole -ls)."
+"Tryck på den här knappen för att välja din favoritterminal. Observera att "
+"filen som du väljer måste vara körbar för att accepteras.<br>Observera också "
+"att vissa program som använder en terminalemulator inte fungerar om du "
+"lägger till kommandoradsväljare (till exempel: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Klicka här för att bläddra efter terminalprogram."
diff --git a/tde-i18n-ta/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-ta/messages/tdebase/kcmcomponentchooser.po
index f9e0de6aa96..cc1abae36aa 100644
--- a/tde-i18n-ta/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-ta/messages/tdebase/kcmcomponentchooser.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-02-14 02:32-0800\n"
 "Last-Translator: Tamil PC <tamilpc@ambalam.com>\n"
 "Language-Team:  <ta@li.org>\n"
@@ -15,13 +15,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"
@@ -46,12 +46,11 @@ msgstr "தெரியாதது"
 #: componentchooser.cpp:408
 #, fuzzy
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>உங்களுடைய கொடாநிலை பயன்பாட்டு நிரல் ஒன்றை மாற்றியுள்ளீர்கள். இந்த மாற்றத்தை "
-"இப்போது சேமிக்க வேண்டுமா?<BR><BR> <B>இல்லை</B> என்பதை தேர்ந்தெடுத்தால் "
-"மாற்றங்கள் மறக்கப்படும்</qt>"
+"<qt>உங்களுடைய கொடாநிலை பயன்பாட்டு நிரல் ஒன்றை மாற்றியுள்ளீர்கள். இந்த மாற்றத்தை இப்போது "
+"சேமிக்க வேண்டுமா?<BR><BR> <B>இல்லை</B> என்பதை தேர்ந்தெடுத்தால் மாற்றங்கள் மறக்கப்படும்</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -59,11 +58,11 @@ msgstr "விளக்கம் ஏதும் அளிக்கப்பட
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"கீழே கொடுக்கப்பட்டுள்ள பட்டியலில் உள்ள பயன்பாட்டு நிரலில், %1 சேவைக்கு எது "
-"பயன்படுத்தப்பட வேண்டும்"
+"கீழே கொடுக்கப்பட்டுள்ள பட்டியலில் உள்ள பயன்பாட்டு நிரலில், %1 சேவைக்கு எது பயன்படுத்தப்பட "
+"வேண்டும்"
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -77,225 +76,180 @@ msgstr "நிரல் தேர்வாளர்"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt><b>http</b> ÁüÚõ <b>https</b> URL¸¨Ç ¾¢È</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "ÀÂñÀ¡ð¨¼ º¡÷ó¾ ¯ûÇ¼ì¸ URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "¦¾¡¼Õõ ¯Ä¡Å¢Â¢ø:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "கொடாநிலை நிரல்"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"இங்குத் தாங்கள் சாதனத்தின் நிரல்களை மாற்ற இயலும்.பொதுப் பணிகளான முனையப் போன்மை, "
-"எழுத்துத் திருத்தி மற்றும் மின்னஞ்சல் கிளையன்கள் முதலியவற்றை கையாளும் "
-"நிரல்களையே நாம் சாதனங்கள் என்கிறோம். சிலச் சமயங்களில் பணியகப் போன்மைகளை "
-"எழுப்பவும், அஞ்சல் அனுப்பவும் அல்லது சில எழுத்துக்களை வெளியிடவும் வித்தியாசமான "
-"TDE பயன்பாடுகள் தேவைப்படுகின்றன. இவற்றையே நிலையாக செய்வதற்கு, இச்சாதனத்தையே "
-"பயன்பாடுகள் அழைக்கின்றன. இங்கு தாங்கள் எச்சாதனத்தை பயன்படுத்துகிறீர்களோ அதன் "
-"நிரல்களை தேர்ந்தெடுக்கலாம்."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"இங்குத் தாங்கள் சாதனத்தின் நிரல்களை மாற்ற இயலும்.பொதுப் பணிகளான முனையப் போன்மை, எழுத்துத் "
+"திருத்தி மற்றும் மின்னஞ்சல் கிளையன்கள் முதலியவற்றை கையாளும் நிரல்களையே நாம் சாதனங்கள் "
+"என்கிறோம். சிலச் சமயங்களில் பணியகப் போன்மைகளை எழுப்பவும், அஞ்சல் அனுப்பவும் அல்லது சில "
+"எழுத்துக்களை வெளியிடவும் வித்தியாசமான TDE பயன்பாடுகள் தேவைப்படுகின்றன. இவற்றையே "
+"நிலையாக செய்வதற்கு, இச்சாதனத்தையே பயன்பாடுகள் அழைக்கின்றன. இங்கு தாங்கள் எச்சாதனத்தை "
+"பயன்படுத்துகிறீர்களோ அதன் நிரல்களை தேர்ந்தெடுக்கலாம்."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "பயன்பாட்டு நிரல் விளக்கம்"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"இங்குத் தாங்கள் தற்பொழுது தேர்ந்தெடுக்கப்பட்ட சாதனங்களின் சிறியக் குறிப்பைப் "
-"படிக்கலாம்.சாதனங்களை மாற்றுவதற்கு, தாங்கள் இடதுப் பக்கமாக பட்டியலைச் "
-"சொடுக்கவும். சாதனத்தின் நிரல்களை மாற்ற விரும்பினால் தயைக் கூர்ந்து கீழேக் "
-"கொடுக்கப் பட்டதை தேர்ந்தெடுக்கவும்."
+"இங்குத் தாங்கள் தற்பொழுது தேர்ந்தெடுக்கப்பட்ட சாதனங்களின் சிறியக் குறிப்பைப் படிக்கலாம்."
+"சாதனங்களை மாற்றுவதற்கு, தாங்கள் இடதுப் பக்கமாக பட்டியலைச் சொடுக்கவும். சாதனத்தின் நிரல்களை "
+"மாற்ற விரும்பினால் தயைக் கூர்ந்து கீழேக் கொடுக்கப் பட்டதை தேர்ந்தெடுக்கவும்."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>இந்தப் பட்டியல் உள்ளமைப்பிற்க்கான சாதனவகைகளைக் கொண்டுள்ளது. தாங்கள் "
-"விரும்பும் சாதனத்தில் சொடுக்கவும்.</p>\n"
-"<p>இந்த உரையாலில் தாங்கள்TDE முன்னிருப்பு சாதனங்களையும் மாற்ற இயலும். பொதுப் "
-"பணிகளான முனையப் போன்மை, எழுத்துத் திருத்தி மற்றும் மின்னஞ்சல் கிளையன்கள் "
-"முதலியவற்றை கையாளும் நிரல்களையே நாம் சாதனங்கள் என்கிறோம். சிலச் சமயங்களில் "
-"பணியகப் போன்மைகளை எழுப்பவும், அஞ்சல் அனுப்பவும் அல்லது சில எழுத்துக்களை "
-"வெளியிடவும் வித்தியாசமான TDE பயன்பாடுகள் தேவைப்படுகின்றன. இவற்றையே நிலையாக "
-"செய்வதற்கு, இச்சாதனத்தையே பயன்பாடுகள் அழைக்கின்றன. இங்கு தாங்கள் எச்சாதனத்தை "
-"பயன்படுத்துகிறீர்களோ அதன் நிரல்களை தேர்ந்தெடுக்கலாம்.</p>\n"
+"<p>இந்தப் பட்டியல் உள்ளமைப்பிற்க்கான சாதனவகைகளைக் கொண்டுள்ளது. தாங்கள் விரும்பும் சாதனத்தில் "
+"சொடுக்கவும்.</p>\n"
+"<p>இந்த உரையாலில் தாங்கள்TDE முன்னிருப்பு சாதனங்களையும் மாற்ற இயலும். பொதுப் பணிகளான "
+"முனையப் போன்மை, எழுத்துத் திருத்தி மற்றும் மின்னஞ்சல் கிளையன்கள் முதலியவற்றை கையாளும் "
+"நிரல்களையே நாம் சாதனங்கள் என்கிறோம். சிலச் சமயங்களில் பணியகப் போன்மைகளை எழுப்பவும், அஞ்சல் "
+"அனுப்பவும் அல்லது சில எழுத்துக்களை வெளியிடவும் வித்தியாசமான TDE பயன்பாடுகள் "
+"தேவைப்படுகின்றன. இவற்றையே நிலையாக செய்வதற்கு, இச்சாதனத்தையே பயன்பாடுகள் அழைக்கின்றன. "
+"இங்கு தாங்கள் எச்சாதனத்தை பயன்படுத்துகிறீர்களோ அதன் நிரல்களை தேர்ந்தெடுக்கலாம்.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: பெறுநர் முகவரி</li> "
-"<li>%s: பொருள்</li> "
-"<li>%c: கார்பன் நகல் (காந)</li> "
-"<li>%b:பார்க்கமுடியாத கார்பன் நகல்(பாகாந)</li> "
-"<li>%B: உரையின் படிம அச்சு</li> "
+"<ul> <li>%t: பெறுநர் முகவரி</li> <li>%s: பொருள்</li> <li>%c: கார்பன் நகல் (காந)</"
+"li> <li>%b:பார்க்கமுடியாத கார்பன் நகல்(பாகாந)</li> <li>%B: உரையின் படிம அச்சு</li> "
 "<li>%A: இணைப்பு</li> </ul>"
 
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"இந்த பொத்தானைஅழுத்தி உங்களின் விருப்பமான மின்னஞ்சல் கருவியை தேர்ந்தெடுங்கள்.  "
-"நீங்கள் தேர்ந்தெடுத்த கோப்பு இயக்க  கூடியதாக இருந்தால் மட்டுமே, இது "
-"ஒப்புக்கொள்ளப்படும்."
-"<br>நீங்கள் அதனுடன் பல மாறிகளை பயன்படுத்தலாம். அவை அதற்கான மதிப்புகளால் "
-"மாற்றப்படும் "
-"<ul> "
-"<li>%t: பெறுநர் முகவரி</li> "
-"<li>%s: பொருள்</li> "
-"<li>%c: கார்பன் நகல் (காந)</li> "
-"<li>%b:பார்க்கமுடியாத கார்பன் நகல்(பாகாந)</li> "
-"<li>%B: உரையின் படிம அச்சு</li> "
-"<li>%A: இணைப்பு</li> </ul>"
+"இந்த பொத்தானைஅழுத்தி உங்களின் விருப்பமான மின்னஞ்சல் கருவியை தேர்ந்தெடுங்கள்.  நீங்கள் "
+"தேர்ந்தெடுத்த கோப்பு இயக்க  கூடியதாக இருந்தால் மட்டுமே, இது ஒப்புக்கொள்ளப்படும்.<br>நீங்கள் "
+"அதனுடன் பல மாறிகளை பயன்படுத்தலாம். அவை அதற்கான மதிப்புகளால் மாற்றப்படும் <ul> <li>%t: "
+"பெறுநர் முகவரி</li> <li>%s: பொருள்</li> <li>%c: கார்பன் நகல் (காந)</li> <li>%b:"
+"பார்க்கமுடியாத கார்பன் நகல்(பாகாந)</li> <li>%B: உரையின் படிம அச்சு</li> <li>%A: "
+"இணைப்பு</li> </ul>"
 
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "அஞ்சல் நிறலை உலாவ இங்கே அழுத்தவும் ."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "முனையத்தில் இயக்கு"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr "வேறொரு மின்னஞ்சல் கருவியை முனையத்தில் இயக்க இந்த தேர்வை பயன்படுத்து"
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "kமின்னஞ்சலை மின்னஞ்சல் கருவியாக பயன்படுத்து"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail லே TDE மேல்மேஜைக்காண த்ரமாண அஞ்சள் நிறல்."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "வேறொரு மின்னஞ்சல் கருவியை பயன்படுத்து:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "இந்த விருப்பத்தை வேறு அஞ்சல் நிறலை தேர்ந்தெடுக்க தேர்வுசெய்யவும்."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "வேறொரு முனைய நிரலை பயன்படுத்து:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "கான்சோலை முனைய நிரலாக பயன்படுத்து"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"உங்கள் விருப்ப முணைய கிளையணை தேர்ந்தெடுக்க இந்த பொத்தாணை அழுத்தவும். நீங்கள் "
-"தேர்வு செய்த கோப்பு கண்டிப்பாக இயக்கக்கூடிய பாதுகாப்பு கோவை ஏற்றுக்கொள்வதாக "
-"இருக்க வேண்டும் எண்பதை குறித்த்க்கொள்ளவும்."
-"<br> நீங்கள் கட்டளை வரி அளபுருகளை சேர்த்தால் முணய உருவாக்கியை உங்களால் "
+"உங்கள் விருப்ப முணைய கிளையணை தேர்ந்தெடுக்க இந்த பொத்தாணை அழுத்தவும். நீங்கள் தேர்வு செய்த "
+"கோப்பு கண்டிப்பாக இயக்கக்கூடிய பாதுகாப்பு கோவை ஏற்றுக்கொள்வதாக இருக்க வேண்டும் எண்பதை "
+"குறித்த்க்கொள்ளவும்.<br> நீங்கள் கட்டளை வரி அளபுருகளை சேர்த்தால் முணய உருவாக்கியை உங்களால் "
 "பயன்படுத்தி பணி புரிய முடியாது (எடுத்துக்காட்டு\t: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "அஞ்சல் நிறலை உலாவ இங்கே அழுத்தவும் ."
diff --git a/tde-i18n-tg/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-tg/messages/tdebase/kcmcomponentchooser.po
index b21b50185e5..f42a9f98608 100644
--- a/tde-i18n-tg/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-tg/messages/tdebase/kcmcomponentchooser.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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 21:52+0000\n"
 "Last-Translator: Abrorova <H_Abrorova@rambler.ru>\n"
 "Language-Team:  Tajik\n"
@@ -20,13 +20,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"
@@ -52,12 +52,12 @@ msgstr "Номаълум"
 #: componentchooser.cpp:408
 #, fuzzy
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Шумо пешфарзи баҳши нитихоби худро таъғир додед, оё мехоҳед ки таъғирро "
-"хамаашро нигоҳ доред?<BR><BR>Агар шумо НЕ интихоб кунед <B>Не</B> "
-"таъғироти шумо нигоҳ дошта намешавад</qt> "
+"хамаашро нигоҳ доред?<BR><BR>Агар шумо НЕ интихоб кунед <B>Не</B> таъғироти "
+"шумо нигоҳ дошта намешавад</qt> "
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -65,11 +65,11 @@ msgstr "Тасвир мавҷудият надорад"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Аз рӯйхати зерномнависшудаи қисмати оне ки барои истифода зикр накарда, барои "
-"хизмати %1-ро интихоб кунед.  "
+"Аз рӯйхати зерномнависшудаи қисмати оне ки барои истифода зикр накарда, "
+"барои хизмати %1-ро интихоб кунед.  "
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -83,230 +83,191 @@ msgstr "Қисмати Интихобкунанда"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Кушодани <b>http</b> ва <b>http-ҳо</b> URL-ҳо</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "замима ба матни URL асос ёфтааст"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "дар барраси зерин:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Банакардани Қисмат "
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Дар ин ҷо шумо иетавонед барномаи компонентро дигаргун зозед. Ин компонентҳо "
 "барномае ҳастанд, ки мисолҳои асосиро ба худ ҷалб мекунад, монанди терминали "
 "эмулятор, муҳаррири матн ва кргари почтаи электронӣ. Дигар барномаҳои TDE як "
-"хел вақт ба гирондани эмулятори Console, фиристодани почта ёки нишон додани як "
-"хел матн, мӯҳтоҷ астанд. Кардани ин доимот, ҳамон барномаҳо ҳар дафъа ба "
-"компанентҳои якшакла мӯҳтоҷ астанд. Дар ин ҷо шумо метавонед нитихоб кунед, ки "
-"кадом барномаҳо ба кадом компонентҳо мӯҳтоҷ астанд."
+"хел вақт ба гирондани эмулятори Console, фиристодани почта ёки нишон додани "
+"як хел матн, мӯҳтоҷ астанд. Кардани ин доимот, ҳамон барномаҳо ҳар дафъа ба "
+"компанентҳои якшакла мӯҳтоҷ астанд. Дар ин ҷо шумо метавонед нитихоб кунед, "
+"ки кадом барномаҳо ба кадом компонентҳо мӯҳтоҷ астанд."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Тасвири Қисмат "
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Дар ин ҷо шумо метавонед ахбороти кӯтоҳро бо компоненти равони интихобшударо  "
-"хонед. Барои дигаргун кардани интихоботи компонент, ба рӯйхати чап паҳш кунед. "
-"Барои дигаргун кардани барномаи компонент,  илтимос, поёнбударо интихоб кунед."
+"Дар ин ҷо шумо метавонед ахбороти кӯтоҳро бо компоненти равони "
+"интихобшударо  хонед. Барои дигаргун кардани интихоботи компонент, ба "
+"рӯйхати чап паҳш кунед. Барои дигаргун кардани барномаи компонент,  илтимос, "
+"поёнбударо интихоб кунед."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p> Ин рӯйхат намуди компоненти дигаргункарнанро нишон медиҳад. Барои "
 "компоненте,ки  шумо мехоҳед дигаргун кунед, ин компонентро пахш кунед.</p>\n"
-"<p>Дар ин диалог шумо метавонед TDE-и компонентҳоро ба накардан дигаргун созед. "
-"Ин компонентҳо барномае ҳастанд, ки мисолҳои асосиро ба худ ҷалб мекунад, "
-"монанди терминали эмулятор, муҳаррири матн ва кргари почтаи электронӣ. Дигар "
-"барномаҳои TDE як хел вақт ба гирондани эмулятори Console, фиристодани почта "
-"ёки нишон додани як хел матн, мӯҳтоҷ астанд. Кардани ин доимот, ҳамон барномаҳо "
-"ҳар дафъа ба компанентҳои якшакла мӯҳтоҷ астанд. Дар ин ҷо шумо метавонед "
-"нитихоб кунед, ки кадом барномаҳо ба кадом компонентҳо мӯҳтоҷ астанд.</p>\n"
+"<p>Дар ин диалог шумо метавонед TDE-и компонентҳоро ба накардан дигаргун "
+"созед. Ин компонентҳо барномае ҳастанд, ки мисолҳои асосиро ба худ ҷалб "
+"мекунад, монанди терминали эмулятор, муҳаррири матн ва кргари почтаи "
+"электронӣ. Дигар барномаҳои TDE як хел вақт ба гирондани эмулятори Console, "
+"фиристодани почта ёки нишон додани як хел матн, мӯҳтоҷ астанд. Кардани ин "
+"доимот, ҳамон барномаҳо ҳар дафъа ба компанентҳои якшакла мӯҳтоҷ астанд. Дар "
+"ин ҷо шумо метавонед нитихоб кунед, ки кадом барномаҳо ба кадом компонентҳо "
+"мӯҳтоҷ астанд.</p>\n"
 "</qt> "
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t:Адреси Қабулкунанда</li> "
-"<li>%s:Мавзӯъи</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Матни нусха </li> "
-"<li>%A: Пайвандонидан</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t:Адреси Қабулкунанда</li> <li>%s:Мавзӯъи</li> <li>%c: Carbon Copy "
+"(CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Матни нусха </li> <li>"
+"%A: Пайвандонидан</li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Барои коргари почтаи электронии дӯстдоштаатро интихоб кунед, ин кнопкаро пахш "
-"кунед. Илтимос ба ин таваҷҷӯҳ кунед, ки ин файле ки шумо интихоб кардед бояд "
-"коргари аттрибутӣ бошанд, ва барои кор бурдан бояд бо тартиб сохта шаванд."
-"<br> Шумо ҳам метавонед якчанд placeholders -ҳоро истифода кунед, ва ин "
-"placeholders -ҳо ҳамроҳи маънои ҳозира ҷо шаванд, вақте ки коргари почтаи "
-"электронии бо ин ном ҷои гирад:"
-"<ul> "
-"<li>%t: Адреси Қабулкунанда</li> "
-"<li>%s: Мавзӯъ</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Матни нусха </li> "
-"<li>%A: Пайвандонидан</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Барои коргари почтаи электронии дӯстдоштаатро интихоб кунед, ин кнопкаро "
+"пахш кунед. Илтимос ба ин таваҷҷӯҳ кунед, ки ин файле ки шумо интихоб кардед "
+"бояд коргари аттрибутӣ бошанд, ва барои кор бурдан бояд бо тартиб сохта "
+"шаванд.<br> Шумо ҳам метавонед якчанд placeholders -ҳоро истифода кунед, ва "
+"ин placeholders -ҳо ҳамроҳи маънои ҳозира ҷо шаванд, вақте ки коргари почтаи "
+"электронии бо ин ном ҷои гирад:<ul> <li>%t: Адреси Қабулкунанда</li> <li>%s: "
+"Мавзӯъ</li> <li>%c: Carbon Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</"
+"li> <li>%B: Матни нусха </li> <li>%A: Пайвандонидан</li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Дар ин ҷо пахш кунед барои кушодани барномаи файли почта "
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Дар &терминал иҷро кунед"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Агар шумо хоҳед ки кргари почтаи электрониро дар терминал иҷро шавад, ин "
 "параметрро интихоб кунед (мисол <em>Konsole</em>) "
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Барномаи KMail-ро ҳамчун почтаи электронӣ истифода кунед."
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail - барномаи стандартии Mail буда, дар мизи кории TDE ҷойгир аст."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Аз &коргари почтаи электронӣ, барномаи дигарро истифода кунед "
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Агар шумо хоҳед ягон дирар барномаи почтар истифода кунед, ин параметрро "
 "интихоб кунед."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Аз &барномаи терминал, барномаи дигарро истифода кунед "
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Барномаи Konsole -ро ҳамчун барномаи терминал истифода баред"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Барои интихоби мизоҷи поёнаи дӯстдоштаатон, ин тугмаро пахш кунед. Дар хотир "
-"доред, ки файле, ки шумо интихоб кардаед бояд маҷмӯъи сифатҳои иҷропазирро, ки "
-"қобили қабуланд, дошта бошанд."
-"<br> Инчунин дар хотир доред, ки баъзе барномаҳое, ки аз тарафи Намунасози "
-"Поёна пуштибонӣ шудаанд, ҳангоми илова намудани нишонвандҳои сатри фармон "
-"(Масалан: konsole -ls) кор намекунанд."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"доред, ки файле, ки шумо интихоб кардаед бояд маҷмӯъи сифатҳои иҷропазирро, "
+"ки қобили қабуланд, дошта бошанд.<br> Инчунин дар хотир доред, ки баъзе "
+"барномаҳое, ки аз тарафи Намунасози Поёна пуштибонӣ шудаанд, ҳангоми илова "
+"намудани нишонвандҳои сатри фармон (Масалан: konsole -ls) кор намекунанд."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Барои баррасии барномаи поёна дар ин ҷо ангушт занед."
@@ -316,5 +277,8 @@ msgstr "Барои баррасии барномаи поёна дар ин ҷо
 #~ msgstr "&Барномаи KMail-ро ҳамчун почтаи электронӣ истифода кунед."
 
 #, fuzzy
-#~ msgid "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE desktop."
-#~ msgstr "Kmail - барномаи стандартии Mail буда, дар мизи кории TDE ҷойгир аст."
+#~ msgid ""
+#~ "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE "
+#~ "desktop."
+#~ msgstr ""
+#~ "Kmail - барномаи стандартии Mail буда, дар мизи кории TDE ҷойгир аст."
diff --git a/tde-i18n-th/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-th/messages/tdebase/kcmcomponentchooser.po
index f350fed0f3a..46e68807604 100644
--- a/tde-i18n-th/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-th/messages/tdebase/kcmcomponentchooser.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-12 22:56+1000\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\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"
@@ -47,11 +47,11 @@ msgstr "ไม่รู้จัก"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>คุณได้ทำการเปลี่ยนแปลงคอมโพเน้นท์ปริยาย คุณต้องการจะบันทึกการเปลี่ยนแปลง "
-"เดี๋ยวนี้หรือไม่ ?</qt>"
+"<qt>คุณได้ทำการเปลี่ยนแปลงคอมโพเน้นท์ปริยาย คุณต้องการจะบันทึกการเปลี่ยนแปลง เดี๋ยวนี้หรือไม่ ?"
+"</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -59,10 +59,9 @@ msgstr "ยังไม่มีข้อมูลรายละเอียด
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
-msgstr ""
-"เลือกคอมโพเน้นท์ที่ต้องการใช้งานกับบริการ %1 โดยปริยาย จากรายการด้านล่างนี้"
+"Choose from the list below which component should be used by default for the "
+"%1 service."
+msgstr "เลือกคอมโพเน้นท์ที่ต้องการใช้งานกับบริการ %1 โดยปริยาย จากรายการด้านล่างนี้"
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -76,225 +75,179 @@ msgstr "เครื่องมือเลือกคอมโพเน้น
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 โจเซฟ เวนนิงเกอร์"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>เปิดตำแหน่ง URL <b>http</b> และ <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "ในแอพพลิเคชันที่กำหนดให้ใช้กับตำแหน่ง URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "ในเบราว์เซอร์ต่อไปนี้:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "คอมโพเน้นท์ปริยาย"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"คุณสามารถเปลี่ยนโปรแกรมของคอมโพเน้นท์ได้ที่นี่ "
-"คอมโพเน้นท์ก็คือโปรแกรมที่มีการทำงานทั่ว ๆ ไป เช่น เทอร์มินัล, "
-"เครื่องมือแก้ไขข้อความ และโปรแกรมรับ/ส่งอีเมล เป็นต้น แอพพลิเคชันต่างๆ ของ TDE "
-"อาจจำเป็นต้องจะเรียกใช้ตัวจำลองคอนโซล, ส่งอีเมล หรือแสดงแฟ้มข้อความ "
+"คุณสามารถเปลี่ยนโปรแกรมของคอมโพเน้นท์ได้ที่นี่ คอมโพเน้นท์ก็คือโปรแกรมที่มีการทำงานทั่ว ๆ ไป "
+"เช่น เทอร์มินัล, เครื่องมือแก้ไขข้อความ และโปรแกรมรับ/ส่งอีเมล เป็นต้น แอพพลิเคชันต่างๆ ของ "
+"TDE อาจจำเป็นต้องจะเรียกใช้ตัวจำลองคอนโซล, ส่งอีเมล หรือแสดงแฟ้มข้อความ "
 "ในการที่จะทำแบบนั้นได้โดยไม่สะดุด "
-"แอพพลิเคชันเหล่านี้จะเรียกใช้คอมโพเน้นท์เดียวกันเสมอคุณสามารถเลือกได้ว่าจะให้โปร"
-"แกรมไหนเป็นคอมโพเน้นท์อะไร ได้ที่นี่ี่"
+"แอพพลิเคชันเหล่านี้จะเรียกใช้คอมโพเน้นท์เดียวกันเสมอคุณสามารถเลือกได้ว่าจะให้โปรแกรมไหนเป็นคอมโพเน้นท์อะไร "
+"ได้ที่นี่ี่"
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "คำอธิบายของคอมโพเน้นท์"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"คุณสามารถอ่านคำอธิบายย่อ ๆ ของคอมโพเน้นท์ที่เลือกได้ที่นี่ "
-"หากต้องการเปลี่ยนการเลือกคอมโพเน้นท์ ให้คลิกที่รายการทางด้านซ้าย "
-"หากต้องการเปลี่ยนโปรแกรมของคอมโพเน้นท์ ให้เลือกจากด้านล่างนี้"
+"คุณสามารถอ่านคำอธิบายย่อ ๆ ของคอมโพเน้นท์ที่เลือกได้ที่นี่ หากต้องการเปลี่ยนการเลือกคอมโพเน้นท์ "
+"ให้คลิกที่รายการทางด้านซ้าย หากต้องการเปลี่ยนโปรแกรมของคอมโพเน้นท์ ให้เลือกจากด้านล่างนี้"
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>ชุดรายการนี้แสดงถึงประเภทคอมโพเน้นท์ที่ปรับแต่งได้ "
-"ให้การคลิกที่คอมโพเน้นท์ที่ คุณต้องการปรับแต่ง</p>\n"
+"<p>ชุดรายการนี้แสดงถึงประเภทคอมโพเน้นท์ที่ปรับแต่งได้ ให้การคลิกที่คอมโพเน้นท์ที่ "
+"คุณต้องการปรับแต่ง</p>\n"
 "<p>ในกล่องโต้ตอบนี้ คุณสามารถจะเปลี่ยนคอมโพเน้นท์โดยปริยาย ของ TDE ได้ "
-"คอมโพเน้นท์ก็คือโปรแกรมที่มีการทำงานทั่ว ๆ ไป เช่น เทอร์มินัล, "
-"เครื่องมือแก้ไขข้อความ และโปรแกรมรับ/ส่งอีเมล แอพพลิเคชันต่างๆ ของ TDE "
-"อาจจำเป็นต้องจะเรียกใช้ตัวจำลองคอนโซล, ส่งอีเมล หรือแสดงแฟ้มข้อความ "
-"ในการที่จะทำแบบนั้นได้แบบไม่สะดุดแอพพลิเคชันเหล่านี้จะต้องเรียกใช้คอมโพเน้นท์เดี"
-"ยวกันเสมอ คุณสามารถเลือกได้ว่าจะให้ "
-"โปรแกรมไหนเป็นคอมโพเน้นท์อะไรได้ที่นี่ี่ป็นอะไรได้ที่นี่</p>\n"
+"คอมโพเน้นท์ก็คือโปรแกรมที่มีการทำงานทั่ว ๆ ไป เช่น เทอร์มินัล, เครื่องมือแก้ไขข้อความ "
+"และโปรแกรมรับ/ส่งอีเมล แอพพลิเคชันต่างๆ ของ TDE อาจจำเป็นต้องจะเรียกใช้ตัวจำลองคอนโซล, "
+"ส่งอีเมล หรือแสดงแฟ้มข้อความ "
+"ในการที่จะทำแบบนั้นได้แบบไม่สะดุดแอพพลิเคชันเหล่านี้จะต้องเรียกใช้คอมโพเน้นท์เดียวกันเสมอ "
+"คุณสามารถเลือกได้ว่าจะให้ โปรแกรมไหนเป็นคอมโพเน้นท์อะไรได้ที่นี่ี่ป็นอะไรได้ที่นี่</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: ที่อยู่ผู้รับ</li> "
-"<li>%s: เรื่อง</li> "
-"<li>%c: ทำสำเนา (CC)</li> "
-"<li>%b: ซ่อนการทำสำเนา (BCC)</li> "
-"<li>%B: แม่แบบเนื้อความ</li> "
-"<li>%A: สิ่งที่แนบมาด้วย </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: ที่อยู่ผู้รับ</li> <li>%s: เรื่อง</li> <li>%c: ทำสำเนา (CC)</li> <li>%b: "
+"ซ่อนการทำสำเนา (BCC)</li> <li>%B: แม่แบบเนื้อความ</li> <li>%A: สิ่งที่แนบมาด้วย </li> "
+"</ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"กดที่ปุ่มนี้ เพื่อเลือกโปรแกรมรับ/ส่งอีเมลที่ต้องการ โปรดจำไว้ว่า "
-"แฟ้มที่คุณเลือกนั้น จะต้องสามารถประมวลผลได้"
-"<br> คุณสามารถใช้ตัวแทนค่าต่างๆ ซึ่งจะถูกแทนค่าด้วยค่าจริงๆ "
-"ได้เมื่อเรียกใช้โปรแกรมรับ/ส่งอีเมล: "
-"<ul> "
-"<li>%t: ที่อยู่ผู้รับ</li> "
-"<li>%s: เรื่อง</li> "
-"<li>%c: ทำสำเนา (CC)</li> "
-"<li>%b: ซ่อนการทำสำเนา (BCC)</li> "
-"<li>%B: แม่แบบเนื้อความ</li> "
-"<li>%A: สิ่งที่แนบมาด้วย </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"กดที่ปุ่มนี้ เพื่อเลือกโปรแกรมรับ/ส่งอีเมลที่ต้องการ โปรดจำไว้ว่า แฟ้มที่คุณเลือกนั้น "
+"จะต้องสามารถประมวลผลได้<br> คุณสามารถใช้ตัวแทนค่าต่างๆ ซึ่งจะถูกแทนค่าด้วยค่าจริงๆ "
+"ได้เมื่อเรียกใช้โปรแกรมรับ/ส่งอีเมล: <ul> <li>%t: ที่อยู่ผู้รับ</li> <li>%s: เรื่อง</li> <li>"
+"%c: ทำสำเนา (CC)</li> <li>%b: ซ่อนการทำสำเนา (BCC)</li> <li>%B: แม่แบบเนื้อความ</"
+"li> <li>%A: สิ่งที่แนบมาด้วย </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "คลิกที่นี่เพื่อเรียกดูแฟ้มโปรแกรมอีเมล"
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "สั่งทำ&งานในเทอร์มินัล"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"เปิดใช้งานตัวเลือกนี้ หากคุณต้องการให้โปรแกรมรับ/ส่งอีเมลที่เลือกไว้ "
-"ทำงานในเทอร์มินัล (เช่น <em>Konsole</em>)"
+"เปิดใช้งานตัวเลือกนี้ หากคุณต้องการให้โปรแกรมรับ/ส่งอีเมลที่เลือกไว้ ทำงานในเทอร์มินัล (เช่น "
+"<em>Konsole</em>)"
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "ใช้โปรแกรม KMail เป็นโปรแกรมรับ/ส่งอีเมลหลัก"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail เป็นโปรแกรมรับ/ส่งอีเมล์์มาตรฐานสำหรับ TDE"
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "ใช้โปรแกรมรับ/ส่งอีเ&มลอื่น:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "เลือกตัวเลือกนี้หากตั้งการใช้งานโปรแกรมรับ/ส่งอีเมลตัวอื่น"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "ใช้โปรแกรมเ&ทอร์มินัลอื่น:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "ใช้ &Konsole เป็นโปรแกรมเทอร์มินัล"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"คลิกที่ปุ่มนี้เพื่อเลือกโปรแกรมเทอร์มินัลสุดโปรดของคุณจำไว้ว่าแฟ้มที่คุณเลือกจะต"
-"้องสามารถประมวลผลได้"
-"<br>โปรดสังเกตไว้ด้วยว่า "
+"คลิกที่ปุ่มนี้เพื่อเลือกโปรแกรมเทอร์มินัลสุดโปรดของคุณจำไว้ว่าแฟ้มที่คุณเลือกจะต้องสามารถประมวลผลได้<br>โปรดสังเกตไว้ด้วยว่า "
 "บางโปรแกรมที่ใช้ประโยชน์จากโปรแกรมจำลองเทอร์มินัลจะไม่ทำงาน "
 "หากคุณใส่อาร์กิวเมนต์ในบรรทัดคำสั่ง (เช่น: konsole -ls)"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "คลิกที่นี่เพื่อเรียกดูโปรแกรมเทอร์มินัล"
diff --git a/tde-i18n-tr/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-tr/messages/tdebase/kcmcomponentchooser.po
index 63ad1858b8a..fb9ddf14b27 100644
--- a/tde-i18n-tr/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-tr/messages/tdebase/kcmcomponentchooser.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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 12:08+0300\n"
 "Last-Translator: Serdar Soytetir\n"
 "Language-Team: Turkish <tr@li.org>\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 "Görkem Çetin"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -47,11 +47,11 @@ msgstr "Bilinmeyen"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Öntanımlı bileşen seçiminizi değiştirdiniz. Değişikliği kaydetmek istiyor "
-"musunuz?</qt>"
+"<qt>Öntanımlı bileşen seçiminizi değiştirdiniz. Değişikliği kaydetmek "
+"istiyor musunuz?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -59,8 +59,8 @@ msgstr "Açıklama yok"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "%1 servisi için aşağıdaki bileşenlerin hangisinin öntanımlı olarak "
 "kullanılacağını belirleyin."
@@ -77,219 +77,181 @@ msgstr "Bileşen Seçici"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt><b>http</b> ve <b>https</b> adreslerini açın</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "adresin içeriğini taban almış bir uygulamanın içinde"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "bu web tarayıcıda:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Öntanımlı Bileşen"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Eklenti programıın buradan değiştirebilirsiniz. Eklentiler basit işlevleri "
 "yerine getiren programlardır, terminal emülatörü, metin düzenleyici ve email "
-"alıcı gibi. Farklı TDE uygulamaları bazen konsol emülatörüne, mail göndermeye "
-"veya yazı görüntülemeye ihtiyaç duyar. Düzeni bozmamak için bu uygulamalar "
-"herzaman aynı eklentiyi kullanır. Buradan bu eklentileri seçebilirsiniz."
+"alıcı gibi. Farklı TDE uygulamaları bazen konsol emülatörüne, mail "
+"göndermeye veya yazı görüntülemeye ihtiyaç duyar. Düzeni bozmamak için bu "
+"uygulamalar herzaman aynı eklentiyi kullanır. Buradan bu eklentileri "
+"seçebilirsiniz."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Bileşen Açıklaması"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Seçili eklenti hakkında kısa bilgiyi buradan okuyabilirsiniz. Seçili eklentiyi "
-"değiştirmek için soldaki listeye tıklayın. Eeklnti programını değiştirmek için "
-"aşağıdan seçin."
+"Seçili eklenti hakkında kısa bilgiyi buradan okuyabilirsiniz. Seçili "
+"eklentiyi değiştirmek için soldaki listeye tıklayın. Eeklnti programını "
+"değiştirmek için aşağıdan seçin."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Bu liste yapılandırılabilir eklentilerin listesini gösterir. Yapılandırmak "
-"istediğiniz eklentinin üzerine tıklayın.</p>\n"
-"<p>Bu pencerede TDE'nin öntanımlı eklentilerini değiştirebilirsiniz. Eklentiler "
-"basit işlevleri yerine getiren programlardır, terminal emülatörü, metin "
-"düzenleyici ve email alıcı gibi. Farklı TDE uygulamaları bazen konsol "
+"<p>Bu liste yapılandırılabilir eklentilerin listesini gösterir. "
+"Yapılandırmak istediğiniz eklentinin üzerine tıklayın.</p>\n"
+"<p>Bu pencerede TDE'nin öntanımlı eklentilerini değiştirebilirsiniz. "
+"Eklentiler basit işlevleri yerine getiren programlardır, terminal emülatörü, "
+"metin düzenleyici ve email alıcı gibi. Farklı TDE uygulamaları bazen konsol "
 "emülatörüne, mail göndermeye veya yazı görüntülemeye ihtiyaç duyar. Düzeni "
 "bozmamak için bu uygulamalar herzaman aynı eklentiyi kullanır. Buradan bu "
 "eklentileri seçebilirsiniz.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Alıcı adresi</li> "
-"<li>%s: Konu</li> "
-"<li>%c: Karbon kopya (Kk)</li> "
-"<li>%b: Gizli karbon kopya (Gkk)</li> "
-"<li>%B: Şablon metin gövdesi</li> "
+"<ul> <li>%t: Alıcı adresi</li> <li>%s: Konu</li> <li>%c: Karbon kopya (Kk)</"
+"li> <li>%b: Gizli karbon kopya (Gkk)</li> <li>%B: Şablon metin gövdesi</li> "
 "<li>%A: Eklenti </li> </ul>"
 
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Kullanabileceğiniz e-posta yazılımını ayarlamak için bu düğmeye tıklayın. "
-"<br> Ayrıca e-posta ayarlarında bazı değerleri tanımlamak mümkündür: "
-"<ul> "
-"<li>%t: Alıcı adresi</li> "
-"<li>%s: Konu</li> "
-"<li>%c: Karbon kopya (CC)</li> "
-"<li>%b: Gizli karbon kopya (BCC)</li> "
-"<li>%B: Gövde metni</li> "
-"<li>%A: Eklenti</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"<br> Ayrıca e-posta ayarlarında bazı değerleri tanımlamak mümkündür: <ul> "
+"<li>%t: Alıcı adresi</li> <li>%s: Konu</li> <li>%c: Karbon kopya (CC)</li> "
+"<li>%b: Gizli karbon kopya (BCC)</li> <li>%B: Gövde metni</li> <li>%A: "
+"Eklenti</li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "E-posta program dosyasını aramak için burayı tıklayın."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Terminalde Çalıştır"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 "Eğer istediğiniz e-posta yazılımı bir terminalde (örnek: <em>Konsole</em> "
 "çalıştırılıyorsa, bu düğmeyi tıklayın."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "Tercih edilen e-posta programı için &Kmail kullan"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "TDE masaüstü için Kmail standart e-posta programıdır."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "&Farklı bir e-posta programı kullan:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Başka bir e-posta programı kullanmak istiyorsanız bu seçeneği seçin."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "F&arklı bir terminal programı kullan:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "Terminal uygulaması olarak K&onsole kullan"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "En sevdiğiniz terminal programcığını seçmek için bu düğmeye basın. Lütfen "
-"seçtiğiniz dosyanın çalıştırılabilir özellikli olmasına dikkat edin. "
-"<br> Ayrıca Terminal Emülatörünü kullanan bazı programların komut satırı "
+"seçtiğiniz dosyanın çalıştırılabilir özellikli olmasına dikkat edin. <br> "
+"Ayrıca Terminal Emülatörünü kullanan bazı programların komut satırı "
 "eklentisi eklediğinizde çalışmayaacğına dikkat edin (Örn. konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Terminal programına gözatmak için burayı tıklayın."
diff --git a/tde-i18n-uk/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-uk/messages/tdebase/kcmcomponentchooser.po
index 3cbe9a52016..935a813038c 100644
--- a/tde-i18n-uk/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-uk/messages/tdebase/kcmcomponentchooser.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-10-07 19:23-0700\n"
 "Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -18,16 +18,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 "Andriy Rysin,Іван Петрущак"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -51,8 +51,8 @@ msgstr "Невідомо"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Ви змінили типовий компонент вашого вибору. Хочете зберегти цю зміну "
 "тепер?</qt>"
@@ -63,8 +63,8 @@ msgstr "Опис відсутній"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr "Виберіть зі списку внизу, який компонент буде типовим для служби %1."
 
 #: kcm_componentchooser.cpp:34
@@ -79,226 +79,185 @@ msgstr "Селектор компонентів"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Відкривати <b>http</b> та <b>https</b> адреси</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "у програмі виходячи зі змісту адреси"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "у наступному навігаторі:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Типовий компонент"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Тут ви можете змінити програму компонент. Компоненти - це програми, що "
-"виконують основні задачі, наприклад, емуляцію терміналу, редактор текстів або "
-"клієнт електронної пошти. Різні програми TDE деколи мають викликати емулятор "
-"консолі, відсилати листи або відображати деякий текст. Для цього "
-"використовуються ці компоненти. Тут ви можете вибрати які програми відповідають "
-"яким компонентам."
-
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+"виконують основні задачі, наприклад, емуляцію терміналу, редактор текстів "
+"або клієнт електронної пошти. Різні програми TDE деколи мають викликати "
+"емулятор консолі, відсилати листи або відображати деякий текст. Для цього "
+"використовуються ці компоненти. Тут ви можете вибрати які програми "
+"відповідають яким компонентам."
+
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Опис компонента"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 "Тут ви можете прочитати невеличкий опис вибраного компонента. Щоб змінити "
 "вибраний компонент, клацніть на списку ліворуч. Щоб змінити програму "
 "компонента, будь ласка, виберіть її нижче."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Цей список показує налаштовані типи компонент. Клацніть на компоненту, яку "
-"Ви хочете налаштувати.</p>\n"
+"<p>Цей список показує налаштовані типи компонент. Клацніть на компоненту, "
+"яку Ви хочете налаштувати.</p>\n"
 "<p>В цьому діалозі ви можете змінити типові компоненти TDE. Типовими "
 "компонентами є програми, що виконують базові задачі, наприклад, емуляцію "
 "терміналу, редактор текстів або клієнт електронної пошти. Різні програми TDE "
-"повинні деколи викликати емулятор терміналу, редагувати текст або відправляти "
-"електронні листи. Для того, щоб це робилось узгоджено, використовуються ці "
-"компоненти. Тут ви можете налаштувати, які програми будуть виконувати роль "
-"компонент.</p>\n"
+"повинні деколи викликати емулятор терміналу, редагувати текст або "
+"відправляти електронні листи. Для того, щоб це робилось узгоджено, "
+"використовуються ці компоненти. Тут ви можете налаштувати, які програми "
+"будуть виконувати роль компонент.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Адреса отримувача</li> "
-"<li>%s: Тема</li> "
-"<li>%c: Копія (CC)</li> "
-"<li>%b: Потайна копія (BCC)</li> "
-"<li>%B: Текст шаблона повідомлення</li> "
+"<ul> <li>%t: Адреса отримувача</li> <li>%s: Тема</li> <li>%c: Копія (CC)</"
+"li> <li>%b: Потайна копія (BCC)</li> <li>%B: Текст шаблона повідомлення</li> "
 "<li>%A: Долучення </li> </ul>"
 
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"Натисніть цю кнопку, щоб вибрати ваш улюблений клієнт пошти. Зауважте, що файл, "
-"який ви виберете має бути з встановленим бітом виконання."
-"<br> Ви також можете вибрати різні шаблони для заміни при запуску клієнта "
-"пошти:"
-"<ul> "
-"<li>%t: Адреса отримувача</li> "
-"<li>%s: Тема</li> "
-"<li>%c: Копія (CC)</li> "
-"<li>%b: Потайна копія (BCC)</li> "
-"<li>%B: Шаблон тексту повідомлення</li> "
-"<li>%A: Долучення</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"Натисніть цю кнопку, щоб вибрати ваш улюблений клієнт пошти. Зауважте, що "
+"файл, який ви виберете має бути з встановленим бітом виконання.<br> Ви також "
+"можете вибрати різні шаблони для заміни при запуску клієнта пошти:<ul> <li>"
+"%t: Адреса отримувача</li> <li>%s: Тема</li> <li>%c: Копія (CC)</li> <li>%b: "
+"Потайна копія (BCC)</li> <li>%B: Шаблон тексту повідомлення</li> <li>%A: "
+"Долучення</li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Клацніть тут для пошуку програми пошти."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "Зап&устити в терміналі"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Ввімкніть цей параметр, якщо ви хочете, щоб вибраний клієнт пошти було запущено "
-"в терміналі (напр., <em>Konsole</em>)."
+"Ввімкніть цей параметр, якщо ви хочете, щоб вибраний клієнт пошти було "
+"запущено в терміналі (напр., <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Вживати KMail, як основний клієнт пошти"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail - типова програма пошти для стільниці TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Вживати інший клієнт &пошти:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Виберіть цей параметр, якщо ви хочете використовувати іншу програму пошти."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Вживати іншу програму &термінала:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Вживати Konsole, як програму термінала"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Натисніть цю кнопку для вибору вашого улюбленого емулятора термінала. "
-"Будь ласка, зауважте, що файл, який ви виберете, повинен мати встановленим біт "
-"дозволу виконання. "
-"<br> Також зауважте, що деякі програми, що використовують емулятор термінала, "
-"не будуть працювати, якщо додати аргументи командного рядка (наприклад: konsole "
-"-ls)."
-
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+"Будь ласка, зауважте, що файл, який ви виберете, повинен мати встановленим "
+"біт дозволу виконання. <br> Також зауважте, що деякі програми, що "
+"використовують емулятор термінала, не будуть працювати, якщо додати "
+"аргументи командного рядка (наприклад: konsole -ls)."
+
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Клацніть тут для пошуку програми термінала."
diff --git a/tde-i18n-uz/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-uz/messages/tdebase/kcmcomponentchooser.po
index eec0937f0e2..66c88c0d8d5 100644
--- a/tde-i18n-uz/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-uz/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-29 22:24+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.11.1\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"
@@ -45,11 +45,11 @@ msgstr "Nomaʼlum"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Andoza komponentga oʻzgarish kiritildi. Oʻzgarishni saqlashni "
-"istaysizmi?</qt>"
+"<qt>Andoza komponentga oʻzgarish kiritildi. Oʻzgarishni saqlashni istaysizmi?"
+"</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -57,8 +57,8 @@ msgstr "Hech qanday taʼrif yoʻq"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr "Quyidagi roʻyxatdan \"%1\" xizmati uchun andoza komponentni tanlang."
 
 #: kcm_componentchooser.cpp:34
@@ -73,181 +73,150 @@ msgstr "Komponentlarni tanlagich"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(C) 2002, Jozef Venninger (Joseph Wenninger)"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt><b>HTTP</b> va <b>HTTPS</b> URL'larni ochish</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "mos keladigan dasturda"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "koʻrsatilgan brauzerda:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "Tanlash"
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Andoza komponent"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Komponentning taʼrifi"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Xat-xabar dasturini tanlash uchun shu yerni bosing."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Terminalda bajarish"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Tanlangan xat-xabar dasturini terminalda (m-n <em>Konsole</em>"
-") ishga tushirish uchun shuni tanlang."
+"Tanlangan xat-xabar dasturini terminalda (m-n <em>Konsole</em>) ishga "
+"tushirish uchun shuni tanlang."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Xat-xabar klienti sifatida KMail dasturidan foydalanish"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail - TDE uchun andoza xat-xabar dasturi."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "&Boshqa xat-xabar klientidan foydalanish:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Boshqa xat-xabar dasturidan foydalanmoqchi boʻlsangiz, shuni tanlang."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "&Boshqa terminal dasturidan foydalanish:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Terminal sifatida Konsole dasturidan foydalanish"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Terminal dasturini tanlash uchun shu yerni bosing."
@@ -257,5 +226,7 @@ msgstr "Terminal dasturini tanlash uchun shu yerni bosing."
 #~ msgstr "&Xat-xabar klienti sifatida KMail dasturidan foydalanish"
 
 #, fuzzy
-#~ msgid "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE desktop."
+#~ msgid ""
+#~ "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE "
+#~ "desktop."
 #~ msgstr "KMail - TDE uchun andoza xat-xabar dasturi."
diff --git a/tde-i18n-uz@cyrillic/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-uz@cyrillic/messages/tdebase/kcmcomponentchooser.po
index 53dd7576dfd..68a6d654fd9 100644
--- a/tde-i18n-uz@cyrillic/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-uz@cyrillic/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-29 22:24+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.11.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"
@@ -45,8 +45,8 @@ msgstr "Номаълум"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Андоза компонентга ўзгариш киритилди. Ўзгаришни сақлашни истайсизми?</qt>"
 
@@ -56,8 +56,8 @@ msgstr "Ҳеч қандай таъриф йўқ"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr "Қуйидаги рўйхатдан \"%1\" хизмати учун андоза компонентни танланг."
 
 #: kcm_componentchooser.cpp:34
@@ -72,181 +72,150 @@ msgstr "Компонентларни танлагич"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(C) 2002, Жозеф Веннингер (Joseph Wenninger)"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt><b>HTTP</b> ва <b>HTTPS</b> URL'ларни очиш</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "мос келадиган дастурда"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "кўрсатилган браузерда:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "Танлаш"
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Андоза компонент"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Компонентнинг таърифи"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Хат-хабар дастурини танлаш учун шу ерни босинг."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Терминалда бажариш"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Танланган хат-хабар дастурини терминалда (м-н <em>Konsole</em>"
-") ишга тушириш учун шуни танланг."
+"Танланган хат-хабар дастурини терминалда (м-н <em>Konsole</em>) ишга тушириш "
+"учун шуни танланг."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "&Хат-хабар клиенти сифатида KMail дастуридан фойдаланиш"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "KMail - TDE учун андоза хат-хабар дастури."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "&Бошқа хат-хабар клиентидан фойдаланиш:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Бошқа хат-хабар дастуридан фойдаланмоқчи бўлсангиз, шуни танланг."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "&Бошқа терминал дастуридан фойдаланиш:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Терминал сифатида Konsole дастуридан фойдаланиш"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Терминал дастурини танлаш учун шу ерни босинг."
@@ -256,5 +225,7 @@ msgstr "Терминал дастурини танлаш учун шу ерни
 #~ msgstr "&Хат-хабар клиенти сифатида KMail дастуридан фойдаланиш"
 
 #, fuzzy
-#~ msgid "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE desktop."
+#~ msgid ""
+#~ "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE "
+#~ "desktop."
 #~ msgstr "KMail - TDE учун андоза хат-хабар дастури."
diff --git a/tde-i18n-vi/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-vi/messages/tdebase/kcmcomponentchooser.po
index c1b02a38dc5..35c061c4825 100644
--- a/tde-i18n-vi/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-vi/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-14 23:22+0930\n"
 "Last-Translator: Phan Vĩnh Thịnh <teppi82@gmail.com>\n"
 "Language-Team: Vietnamese <kde-l10n-vi@kde.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: KBabel 1.10\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"
@@ -46,8 +46,8 @@ msgstr "Không rõ"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
 "<qt>Bạn đã thay đổi thành phần mặc định theo lựa chọn. Ghi thay đổi ngay bây "
 "giờ?</qt>"
@@ -58,8 +58,8 @@ msgstr "Không có mô tả"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
 "Chọn từ danh sách phía dưới thành phần muốn dùng làm mặc định cho dịch vụ %1."
 
@@ -75,220 +75,180 @@ msgstr "Trình chọn thành phần"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "Bản quyền © năm 2002 của Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Mở các địa chỉ URL <b>http</b> và <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "trong một ứng dụng dựa trên nội dung của địa chỉ URL"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "trong trình duyệt sau:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Ứng dụng mặc định"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 "Ở đây bạn có thể thay đổi chương trình thành phần. Thành phần là các chương "
-"trình điều khiển các công việc cơ bản, như giả trình lệnh, soạn thảo và trình "
-"thư. Một số ứng dụng TDE đôi khi cần một trình lệnh, gửi một thư, hay hiển thị "
-"văn bản. Để đảm bảo tính ổn định, các ứng dụng luôn luôn gọi cùng một thành "
-"phần. Bạn có thể chọn những thành phần đó ở đây."
+"trình điều khiển các công việc cơ bản, như giả trình lệnh, soạn thảo và "
+"trình thư. Một số ứng dụng TDE đôi khi cần một trình lệnh, gửi một thư, hay "
+"hiển thị văn bản. Để đảm bảo tính ổn định, các ứng dụng luôn luôn gọi cùng "
+"một thành phần. Bạn có thể chọn những thành phần đó ở đây."
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Mô tả thành phần"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
-"Ở đây bạn có thể đọc một mô tả nhỏ về ứng dụng đã chọn. Để thay đổi ứng dụng, "
-"nhấn lên danh sách ở bên trái. Để thay đổi ứng dụng thành phần, xin hãy chọn nó "
-"ở phía dưới."
+"Ở đây bạn có thể đọc một mô tả nhỏ về ứng dụng đã chọn. Để thay đổi ứng "
+"dụng, nhấn lên danh sách ở bên trái. Để thay đổi ứng dụng thành phần, xin "
+"hãy chọn nó ở phía dưới."
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
-"<p>Danh sách này hiển thị những dạng thành phần có thể cấu hình. Nhấn vào thành "
-"phần bạn muốn cấu hình.</p>\n"
+"<p>Danh sách này hiển thị những dạng thành phần có thể cấu hình. Nhấn vào "
+"thành phần bạn muốn cấu hình.</p>\n"
 "<p>Trong hộp thoại này bạn có thể thay đổi các thành phần mặc định của TDE. "
-"Thành phần là các chương trình điều khiển các công việc cơ bản, như giả trình "
-"lệnh, soạn thảo và trình thư. Một số ứng dụng TDE đôi khi cần một trình lệnh, "
-"gửi một thư, hay hiển thị văn bản. Để đảm bảo tính ổn định, các ứng dụng luôn "
-"luôn gọi cùng một thành phần. Bạn có thể chọn những thành phần đó ở đây.</p>\n"
+"Thành phần là các chương trình điều khiển các công việc cơ bản, như giả "
+"trình lệnh, soạn thảo và trình thư. Một số ứng dụng TDE đôi khi cần một "
+"trình lệnh, gửi một thư, hay hiển thị văn bản. Để đảm bảo tính ổn định, các "
+"ứng dụng luôn luôn gọi cùng một thành phần. Bạn có thể chọn những thành phần "
+"đó ở đây.</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Địa chỉ người nhận</li> "
-"<li>%s: Tên thư</li> "
-"<li>%c: Bản sao (CC)</li> "
-"<li>%b: Bản sao phụ (BCC)</li> "
-"<li>%B: Văn bản thư mẫu</li> "
-"<li>%A: Gắn kèm </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: Địa chỉ người nhận</li> <li>%s: Tên thư</li> <li>%c: Bản sao "
+"(CC)</li> <li>%b: Bản sao phụ (BCC)</li> <li>%B: Văn bản thư mẫu</li> <li>"
+"%A: Gắn kèm </li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 "Nhấn nút này để chọn trình thư ưa thích. Xin hãy chú ý rằng tập tin bạn chọn "
-"phải là có thể thực hiện."
-"<br> Bạn còn có thể chọn vài biến giữ chỗ mà sẽ được thay thế thành giá trị khi "
-"trình thư được gọi:"
-"<ul> "
-"<li>%t: Địa chỉ người nhận</li> "
-"<li>%s: Tên thư</li> "
-"<li>%c: Bản sao (CC)</li> "
-"<li>%b: Bản sao phụ (BCC)</li> "
-"<li>%B: Văn bản thư mẫu</li> "
-"<li>%A: Gắn kèm </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"phải là có thể thực hiện.<br> Bạn còn có thể chọn vài biến giữ chỗ mà sẽ "
+"được thay thế thành giá trị khi trình thư được gọi:<ul> <li>%t: Địa chỉ "
+"người nhận</li> <li>%s: Tên thư</li> <li>%c: Bản sao (CC)</li> <li>%b: Bản "
+"sao phụ (BCC)</li> <li>%B: Văn bản thư mẫu</li> <li>%A: Gắn kèm </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Nhấn vào đây để tìm tập tin chương trình thư."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Chạy trong trình lệnh"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
-"Dùng tùy chọn này nếu muốn trình thư đã chọn sẽ chạy trong một trình lệnh (ví "
-"dụ <em>Konsole</em>)."
+"Dùng tùy chọn này nếu muốn trình thư đã chọn sẽ chạy trong một trình lệnh "
+"(ví dụ <em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "Dùng &KMail là trình thư yêu thích"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail là chương trình thư chuẩn cho môi trường TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Dùng trình &thư khác:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "Chọn tùy chọn này nếu muốn dùng một trình thư khác."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Dùng một trình &lệnh khác:"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Dùng Konsole làm ứng dụng trình lệnh"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 "Nhấn vào nút này để chọn trình lệnh ưa thích. Xin hãy chú ý rằng tập tin bạn "
-"chọn phải là có thể thực hiện."
-"<br> Đồng thời cũng chú ý rằng một vài chương trình giả trình lệnh sẽ không làm "
-"việc khi thêm các tham số dòng lệnh (Ví dụ: konsole -ls)."
+"chọn phải là có thể thực hiện.<br> Đồng thời cũng chú ý rằng một vài chương "
+"trình giả trình lệnh sẽ không làm việc khi thêm các tham số dòng lệnh (Ví "
+"dụ: konsole -ls)."
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Nhấn vào đây để tìm trình lệnh."
diff --git a/tde-i18n-wa/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-wa/messages/tdebase/kcmcomponentchooser.po
index c39bd298f7c..d05e5d70bd6 100644
--- a/tde-i18n-wa/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-wa/messages/tdebase/kcmcomponentchooser.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-06-16 23:20+0200\n"
 "Last-Translator: Jean Cayron <jean.cayron@gmail.com>\n"
 "Language-Team: Walloon\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 "Djan Cayron"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -44,11 +44,11 @@ msgstr "Nén cnoxhou"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr ""
-"<qt>Vos avoz candjî les prémetous componints di vosse tchoes. Voloz vs schaper "
-"ces candjmints asteure?</qt>"
+"<qt>Vos avoz candjî les prémetous componints di vosse tchoes. Voloz vs "
+"schaper ces candjmints asteure?</qt>"
 
 #: componentchooser.cpp:412
 msgid "No description available"
@@ -56,11 +56,11 @@ msgstr "Pont d' discrijhaedje di disponibe"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr ""
-"Tchoezixhoz el djivêye vaici pa dzo ké componint divreut esse eployî prémetou "
-"pol siervice %1."
+"Tchoezixhoz el djivêye vaici pa dzo ké componint divreut esse eployî "
+"prémetou pol siervice %1."
 
 #: kcm_componentchooser.cpp:34
 msgid "kcmcomponentchooser"
@@ -74,186 +74,151 @@ msgstr "Tchoezixheu d' componint"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "© 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Drovi les adresses <b>http</b> et <b>https</b></qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "dins on programe båzé so ç' ki gn a dins l' adresse"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "el betchteu shuvant:"
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "Prémetou componint"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "Discrijhaedje do componint"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
 msgstr ""
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: Adresse do conteu</li> "
-"<li>%s: Sudjet</li> "
-"<li>%c: Copeye (CC)</li> "
-"<li>%b: Catcheye Copeye (BCC)</li> "
-"<li>%B: Coir di tecse do modele</li> "
+"<ul> <li>%t: Adresse do conteu</li> <li>%s: Sudjet</li> <li>%c: Copeye (CC)</"
+"li> <li>%b: Catcheye Copeye (BCC)</li> <li>%B: Coir di tecse do modele</li> "
 "<li>%A: Ataetchmint </li> </ul>"
 
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "Clitchîz vaici po naivyî viè l' fitchî do programe d' emile."
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Enonder dvins on terminå"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
 msgstr ""
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "E&ployî KMail come cliyint emile mia inmé"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail est l' sitandård programe d' emile pol sicribanne TDE."
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "Eplo&yî on ôte cliyint emile:"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "Eplo&yî on ôte programe di terminå"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "&Eployî Konsole come programe di terminå"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Clitchîz vaici po naivyî viè l' prgrame terminå."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po
index d3fda1049cf..2edb96e8e7e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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-16 11:49+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 "TDE 中文翻译组"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -44,8 +44,8 @@ msgstr "未知"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr "<qt>您更改了所选的默认组件，是否想要现在保存更改？</qt>"
 
 #: componentchooser.cpp:412
@@ -54,8 +54,8 @@ msgstr "没有可用的描述"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr "请从下面的列表中选择 %1 服务所使用的默认组件。"
 
 #: kcm_componentchooser.cpp:34
@@ -70,205 +70,173 @@ msgstr "组件选择"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(C)，2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>打开 <b>http</b> 和 <b>https</b> URLs</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "根据 URL 的内容决定应用程序"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "在以下浏览器中："
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "默认组件"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"您可以在此处更改组件程序。所谓组件，是指那些完成基本任务的程序，如终端模拟器，文本编辑器和电子邮件客户程序。不同的 TDE "
-"应用程序有时会调用终端模拟器，发送电子邮件或显示某些文字。为了让这些操作显得更加整齐划一，这些应用程序都会调用相同的组件。您可以在此选择这些组件所对应的程序。"
+"您可以在此处更改组件程序。所谓组件，是指那些完成基本任务的程序，如终端模拟"
+"器，文本编辑器和电子邮件客户程序。不同的 TDE 应用程序有时会调用终端模拟器，发"
+"送电子邮件或显示某些文字。为了让这些操作显得更加整齐划一，这些应用程序都会调"
+"用相同的组件。您可以在此选择这些组件所对应的程序。"
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "组件描述"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
-msgstr "您将在此看到关于目前所选组件的简短描述。要选择不同的组件，请点击左侧的列表。要更改此组件对应的程序，请在下面选择。"
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
+msgstr ""
+"您将在此看到关于目前所选组件的简短描述。要选择不同的组件，请点击左侧的列表。"
+"要更改此组件对应的程序，请在下面选择。"
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>此列表显示了可配置的组件类型。请点击您想要配置的组件。</p>\n"
-"<p>您可以在此对话框中更改 TDE 默认的组件。所谓组件，是指那些完成基本任务的程序，如终端模拟器，文本编辑器和电子邮件客户程序。不同的 TDE "
-"应用程序有时会调用终端模拟器，发送电子邮件或显示某些文字。为了让这些操作显得更加整齐划一，这些应用程序都会调用相同的组件。您可以在此选择这些组件所对应的程序。<"
-"/p>\n"
+"<p>您可以在此对话框中更改 TDE 默认的组件。所谓组件，是指那些完成基本任务的程"
+"序，如终端模拟器，文本编辑器和电子邮件客户程序。不同的 TDE 应用程序有时会调用"
+"终端模拟器，发送电子邮件或显示某些文字。为了让这些操作显得更加整齐划一，这些"
+"应用程序都会调用相同的组件。您可以在此选择这些组件所对应的程序。</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t：收件人地址</li> "
-"<li>%s：主题</li> "
-"<li>%c：抄送(CC)</li> "
-"<li>%b：密件抄送(BCC)</li> "
-"<li>%B：模板主体文本</li> "
-"<li>%A：附件</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t：收件人地址</li> <li>%s：主题</li> <li>%c：抄送(CC)</li> <li>%b："
+"密件抄送(BCC)</li> <li>%B：模板主体文本</li> <li>%A：附件</li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"单击此按钮选择您喜爱的电子邮件客户程序。请注意，您所选择的文件必须设置了可执行属性。"
-"<br>您也可以在这里使用占位符，这些占位符会在调用电子邮件程序的时候被自动替换为实际的值。可用的占位符有："
-"<ul> "
-"<li>%t：收件人地址</li> "
-"<li>%s：主题</li> "
-"<li>%c：抄送(CC)</li> "
-"<li>%b：密件抄送(BCC)</li> "
-"<li>%B：模板主体文本</li> "
-"<li>%A：附件</li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"单击此按钮选择您喜爱的电子邮件客户程序。请注意，您所选择的文件必须设置了可执"
+"行属性。<br>您也可以在这里使用占位符，这些占位符会在调用电子邮件程序的时候被"
+"自动替换为实际的值。可用的占位符有：<ul> <li>%t：收件人地址</li> <li>%s：主题"
+"</li> <li>%c：抄送(CC)</li> <li>%b：密件抄送(BCC)</li> <li>%B：模板主体文本</"
+"li> <li>%A：附件</li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "单击此处浏览邮件程序文件。"
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "在终端中运行(&R)"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
-msgstr "如果您想要在终端(如 <em>Konsole</em>)中执行选中的电子邮件客户程序，则应该选中此选项。"
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
+msgstr ""
+"如果您想要在终端(如 <em>Konsole</em>)中执行选中的电子邮件客户程序，则应该选中"
+"此选项。"
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "使用 KMail 作为首选的电子邮件客户程序(&U)"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail 是 TDE 桌面的标准邮件程序。"
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "使用另外的电子邮件客户程序(&E)："
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "如果您想要使用另外的邮件程序，请选择此选项。"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "使用另外的终端程序(&T)："
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "使用 Konsole 作为终端程序(&U)"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"单击此按钮可选择您喜爱的终端客户程序。请注意，您所选的文件必须已经设置了可执行属性才能被接受。"
-"<br>请注意，某些终端模拟程序无法接受您添加的命令行参数(例如：konsole -ls。)"
+"单击此按钮可选择您喜爱的终端客户程序。请注意，您所选的文件必须已经设置了可执"
+"行属性才能被接受。<br>请注意，某些终端模拟程序无法接受您添加的命令行参数(例"
+"如：konsole -ls。)"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "单击此处浏览终端程序。"
diff --git a/tde-i18n-zh_TW/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-zh_TW/messages/tdebase/kcmcomponentchooser.po
index 39cd6fabb8b..67bf7bd45de 100644
--- a/tde-i18n-zh_TW/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-zh_TW/messages/tdebase/kcmcomponentchooser.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\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 19:31+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 "Keng-Tso Ou"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -47,8 +47,8 @@ msgstr "不明"
 
 #: componentchooser.cpp:408
 msgid ""
-"<qt>You changed the default component of your choice. Do you want to save that "
-"change now?</qt>"
+"<qt>You changed the default component of your choice. Do you want to save "
+"that change now?</qt>"
 msgstr "<qt>您的選擇已經變更預設的元件，您現在要儲存此變更嗎？</qt>"
 
 #: componentchooser.cpp:412
@@ -57,8 +57,8 @@ msgstr "沒有可取得之敘述"
 
 #: componentchooser.cpp:423 componentchooser.cpp:428
 msgid ""
-"Choose from the list below which component should be used by default for the %1 "
-"service."
+"Choose from the list below which component should be used by default for the "
+"%1 service."
 msgstr "從下列清單中選擇 %1 服務預設使用的元件。"
 
 #: kcm_componentchooser.cpp:34
@@ -73,205 +73,174 @@ msgstr "元件選擇工具"
 msgid "(c), 2002 Joseph Wenninger"
 msgstr "(c), 2002 Joseph Wenninger"
 
-#. i18n: file browserconfig_ui.ui line 49
-#: rc.cpp:3
+#: browserconfig_ui.ui:49
 #, no-c-format
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>開啟 <b>http</b> 與 <b>https</b> 網址</qt>"
 
-#. i18n: file browserconfig_ui.ui line 57
-#: rc.cpp:6
+#: browserconfig_ui.ui:57
 #, no-c-format
 msgid "in an application based on the contents of the URL"
 msgstr "於基於此網址內容的應用程式"
 
-#. i18n: file browserconfig_ui.ui line 68
-#: rc.cpp:9
+#: browserconfig_ui.ui:68
 #, no-c-format
 msgid "in the following browser:"
 msgstr "於下列瀏覽器："
 
-#. i18n: file browserconfig_ui.ui line 120
-#: rc.cpp:12 rc.cpp:39 rc.cpp:72
+#: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#. i18n: file componentchooser_ui.ui line 43
-#: rc.cpp:15
+#: componentchooser_ui.ui:43
 #, no-c-format
 msgid "Default Component"
 msgstr "預設元件"
 
-#. i18n: file componentchooser_ui.ui line 46
-#: rc.cpp:18
+#: componentchooser_ui.ui:46
 #, no-c-format
 msgid ""
-"Here you can change the component program. Components are programs that handle "
-"basic tasks, like the terminal emulator, the text editor and the email client. "
-"Different TDE applications sometimes need to invoke a console emulator, send a "
-"mail or display some text. To do so consistently, these applications always "
-"call the same components. You can choose here which programs these components "
-"are."
+"Here you can change the component program. Components are programs that "
+"handle basic tasks, like the terminal emulator, the text editor and the "
+"email client. Different TDE applications sometimes need to invoke a console "
+"emulator, send a mail or display some text. To do so consistently, these "
+"applications always call the same components. You can choose here which "
+"programs these components are."
 msgstr ""
-"您將可在此改變元件程式。元件指的是處理基本工作的程式， 例如終端機程式，文字編輯器及電子郵件程式等。眾多的TDE應用程式有時需要 "
-"引入終端機程式，寄發電子郵件或者顯示一些文字。為求一致，這些應用程式 都會呼叫同樣的元件。您可在此選擇這些元件所使用的程式。"
+"您將可在此改變元件程式。元件指的是處理基本工作的程式， 例如終端機程式，文字編"
+"輯器及電子郵件程式等。眾多的TDE應用程式有時需要 引入終端機程式，寄發電子郵件"
+"或者顯示一些文字。為求一致，這些應用程式 都會呼叫同樣的元件。您可在此選擇這些"
+"元件所使用的程式。"
 
-#. i18n: file componentchooser_ui.ui line 75
-#: rc.cpp:21
+#: componentchooser_ui.ui:75
 #, no-c-format
 msgid "Component Description"
 msgstr "元件描述"
 
-#. i18n: file componentchooser_ui.ui line 78
-#: rc.cpp:24
+#: componentchooser_ui.ui:78
 #, no-c-format
 msgid ""
-"Here you can read a small description of the currently selected component. To "
-"change the selected component, click on the list to the left. To change the "
-"component program,  please choose it below."
-msgstr "您可於此讀到目前所選元件的簡單描述。要改變所選的元件，請點選左方的列表。 要改變元件程式，請在下方選擇。"
+"Here you can read a small description of the currently selected component. "
+"To change the selected component, click on the list to the left. To change "
+"the component program,  please choose it below."
+msgstr ""
+"您可於此讀到目前所選元件的簡單描述。要改變所選的元件，請點選左方的列表。 要改"
+"變元件程式，請在下方選擇。"
 
-#. i18n: file componentchooser_ui.ui line 119
-#: rc.cpp:27
+#: componentchooser_ui.ui:119
 #, no-c-format
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
 "want to configure.</p>\n"
 "<p>In this dialog you can change TDE default components. Components are "
-"programs that handle basic tasks, like the terminal emulator, the text editor "
-"and the email client. Different TDE applications sometimes need to invoke a "
-"console emulator, send a mail or display some text. To do so consistently, "
-"these applications always call the same components. Here you can select which "
-"programs these components are.</p>\n"
+"programs that handle basic tasks, like the terminal emulator, the text "
+"editor and the email client. Different TDE applications sometimes need to "
+"invoke a console emulator, send a mail or display some text. To do so "
+"consistently, these applications always call the same components. Here you "
+"can select which programs these components are.</p>\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
 "<p>這個列表顯示可設定元件的類別。請點選您想設定的元件。</p>\n"
-"<p>在這個對話框您可改變TDE的預設元件。您將可在此改變元件程式。元件指 的是處理基本工作的程式，例如終端機程式，文字編輯器及電子郵件程式等。 "
-"眾多的TDE應用程式有時需要引入終端機程式，寄發電子郵件或者顯示一些文 字。為求一致，這些應用程式都會呼叫同樣的元件。 "
-"您可在此選擇這些元件所使用的程式。</p>\n"
+"<p>在這個對話框您可改變TDE的預設元件。您將可在此改變元件程式。元件指 的是處理"
+"基本工作的程式，例如終端機程式，文字編輯器及電子郵件程式等。 眾多的TDE應用程"
+"式有時需要引入終端機程式，寄發電子郵件或者顯示一些文 字。為求一致，這些應用程"
+"式都會呼叫同樣的元件。 您可在此選擇這些元件所使用的程式。</p>\n"
 "</qt>"
 
-#. i18n: file emailclientconfig_ui.ui line 83
-#: rc.cpp:33
+#: emailclientconfig_ui.ui:83
 #, no-c-format
 msgid ""
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
+"Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body "
+"text</li> <li>%A: Attachment </li> </ul>"
 msgstr ""
-"<ul> "
-"<li>%t: 收件者電子郵件位址</li> "
-"<li>%s: 主旨</li> "
-"<li>%c: 副本 (CC)</li> "
-"<li>%b: 密件副本 (BCC)</li> "
-"<li>%B: 本文文字範本</li> "
-"<li>%A: 附加檔案 </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 86
-#: rc.cpp:36
+"<ul> <li>%t: 收件者電子郵件位址</li> <li>%s: 主旨</li> <li>%c: 副本 (CC)</"
+"li> <li>%b: 密件副本 (BCC)</li> <li>%B: 本文文字範本</li> <li>%A: 附加檔案 </"
+"li> </ul>"
+
+#: emailclientconfig_ui.ui:86
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
 "file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> You can also use several placeholders which will be replaced with the "
-"actual values when the email client is called:"
-"<ul> "
-"<li>%t: Recipient's address</li> "
-"<li>%s: Subject</li> "
-"<li>%c: Carbon Copy (CC)</li> "
-"<li>%b: Blind Carbon Copy (BCC)</li> "
-"<li>%B: Template body text</li> "
-"<li>%A: Attachment </li> </ul>"
+"accepted.<br> You can also use several placeholders which will be replaced "
+"with the actual values when the email client is called:<ul> <li>%t: "
+"Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> "
+"<li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: "
+"Attachment </li> </ul>"
 msgstr ""
-"按下這個按鈕以選擇您偏好的電子郵件軟體。 請注意 您選擇的檔案必須具有可執行之屬性才會被接受。"
-"<br> 您也可以使用數個在電子郵件軟體被呼叫時將以實際數值取代的占位符"
-"<ul> "
-"<li>%t: 收件者電子郵件位址</li> "
-"<li>%s: 主旨</li> "
-"<li>%c: 副本 (CC)</li> "
-"<li>%b: 密件副本 (BCC)</li> "
-"<li>%B: 本文文字範本</li> "
-"<li>%A: 附加檔案 </li> </ul>"
-
-#. i18n: file emailclientconfig_ui.ui line 100
-#: rc.cpp:42
+"按下這個按鈕以選擇您偏好的電子郵件軟體。 請注意 您選擇的檔案必須具有可執行之"
+"屬性才會被接受。<br> 您也可以使用數個在電子郵件軟體被呼叫時將以實際數值取代的"
+"占位符<ul> <li>%t: 收件者電子郵件位址</li> <li>%s: 主旨</li> <li>%c: 副本 "
+"(CC)</li> <li>%b: 密件副本 (BCC)</li> <li>%B: 本文文字範本</li> <li>%A: 附加"
+"檔案 </li> </ul>"
+
+#: emailclientconfig_ui.ui:100
 #, no-c-format
 msgid "Click here to browse for the mail program file."
 msgstr "點選這裡以瀏覽郵件程式檔案。"
 
-#. i18n: file emailclientconfig_ui.ui line 113
-#: rc.cpp:45
+#: emailclientconfig_ui.ui:113
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "在終端機中執行(&R)"
 
-#. i18n: file emailclientconfig_ui.ui line 116
-#: rc.cpp:48
+#: emailclientconfig_ui.ui:116
 #, no-c-format
 msgid ""
-"Activate this option if you want the selected email client to be executed in a "
-"terminal (e.g. <em>Konsole</em>)."
-msgstr "如果您想要讓所選擇的電子郵件軟體在終端機中執行，請選擇這個選項 (終端機：e.g. <em>Konsole</em>)."
+"Activate this option if you want the selected email client to be executed in "
+"a terminal (e.g. <em>Konsole</em>)."
+msgstr ""
+"如果您想要讓所選擇的電子郵件軟體在終端機中執行，請選擇這個選項 (終端機：e.g. "
+"<em>Konsole</em>)."
 
-#. i18n: file emailclientconfig_ui.ui line 141
-#: rc.cpp:51
+#: emailclientconfig_ui.ui:141
 #, no-c-format
 msgid "&Use KMail as preferred email client"
 msgstr "使用 KMail 如同偏好的電子郵件軟體(&U)"
 
-#. i18n: file emailclientconfig_ui.ui line 144
-#: rc.cpp:54
+#: emailclientconfig_ui.ui:144
 #, no-c-format
 msgid "Kmail is the standard Mail program for the TDE desktop."
 msgstr "Kmail 是 TDE 的標準郵件程式。"
 
-#. i18n: file emailclientconfig_ui.ui line 152
-#: rc.cpp:57
+#: emailclientconfig_ui.ui:152
 #, no-c-format
 msgid "Use a different &email client:"
 msgstr "使用其他的電子郵件軟體 (&e):"
 
-#. i18n: file emailclientconfig_ui.ui line 155
-#: rc.cpp:60
+#: emailclientconfig_ui.ui:155
 #, no-c-format
 msgid "Select this option if you want to use any other mail program."
 msgstr "如果想使用其他的郵件程式，請選擇這個選項。"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 72
-#: rc.cpp:63
+#: terminalemulatorconfig_ui.ui:72
 #, no-c-format
 msgid "Use a different &terminal program:"
 msgstr "使用其他的終端機軟體 (&t):"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 97
-#: rc.cpp:66
+#: terminalemulatorconfig_ui.ui:97
 #, no-c-format
 msgid "&Use Konsole as terminal application"
 msgstr "使用 Konsole 如同偏好的終端機軟體(&U)"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 130
-#: rc.cpp:69
+#: terminalemulatorconfig_ui.ui:130
 #, no-c-format
 msgid ""
-"Press this button to select your favorite terminal client. Please note that the "
-"file you select has to have the executable attribute set in order to be "
-"accepted."
-"<br> Also note that some programs that utilize Terminal Emulator will not work "
-"if you add command line arguments (Example: konsole -ls)."
+"Press this button to select your favorite terminal client. Please note that "
+"the file you select has to have the executable attribute set in order to be "
+"accepted.<br> Also note that some programs that utilize Terminal Emulator "
+"will not work if you add command line arguments (Example: konsole -ls)."
 msgstr ""
-"按這個按鈕來選擇您喜愛的終端機客戶端。請注意您所選的檔案必須設定可執行屬性才能被接受。"
-"<br>同時也注意某些使用終端機模擬器的程式可能無法依您下的命令列引數運作(例如：konsole -ls)。"
+"按這個按鈕來選擇您喜愛的終端機客戶端。請注意您所選的檔案必須設定可執行屬性才"
+"能被接受。<br>同時也注意某些使用終端機模擬器的程式可能無法依您下的命令列引數"
+"運作(例如：konsole -ls)。"
 
-#. i18n: file terminalemulatorconfig_ui.ui line 152
-#: rc.cpp:75
+#: terminalemulatorconfig_ui.ui:152
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "點選這裡以瀏覽終端機程式。"
@@ -281,7 +250,9 @@ msgstr "點選這裡以瀏覽終端機程式。"
 #~ msgstr "使用 KMail 如同偏好的電子郵件軟體(&U)"
 
 #, fuzzy
-#~ msgid "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE desktop."
+#~ msgid ""
+#~ "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the TDE "
+#~ "desktop."
 #~ msgstr "Kmail 是 TDE 的標準郵件程式。"
 
 #~ msgid "Form1"