Rename common header files for consistency with class renaming

20 files changed, 217 insertions, 217 deletions

diff --git a/po/cs.po b/po/cs.po
index 60ca3c0..799edac 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:802
+#: common/nokde/nokde_tdecmdlineargs.cpp:802
 msgid ""
 "\n"
 "%1:\n"
@@ -26,7 +26,7 @@ msgstr ""
 "\n"
 "%1:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:946
+#: common/nokde/nokde_tdecmdlineargs.cpp:946
 msgid ""
 "\n"
 "Arguments:\n"
@@ -34,7 +34,7 @@ msgstr ""
 "\n"
 "Parametry:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:885
+#: common/nokde/nokde_tdecmdlineargs.cpp:885
 msgid ""
 "\n"
 "Options:\n"
@@ -242,11 +242,11 @@ msgstr "%1 bytů"
 msgid "%1 for block %2"
 msgstr "%1 pro blok %2"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:883
+#: common/nokde/nokde_tdecmdlineargs.cpp:883
 msgid "%1 options"
 msgstr "%1 přepínače"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:647
+#: common/nokde/nokde_tdecmdlineargs.cpp:647
 msgid "%1 was written by somebody who wants to remain anonymous."
 msgstr "%1 byl napsán někým, kdo chce zůstat neznámý."
 
@@ -380,7 +380,7 @@ msgstr "O&věřit"
 msgid "&Zero"
 msgstr "Vy&nulovat"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:545
+#: common/nokde/nokde_tdecmdlineargs.cpp:545
 msgid "'%1' missing."
 msgstr "'%1' chybí."
 
@@ -2410,7 +2410,7 @@ msgstr "Konec všech částí kódu"
 msgid "End of command file reached."
 msgstr "Dosažen konec příkazového souboru."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:861
+#: common/nokde/nokde_tdecmdlineargs.cpp:861
 msgid "End of options"
 msgstr "Konec přepínačů"
 
@@ -3126,7 +3126,7 @@ msgstr "Generování je tímto mikrokontrolérem podporováno jen částečně."
 msgid "Generic Pointer"
 msgstr "Obecné přepínače"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:841
+#: common/nokde/nokde_tdecmdlineargs.cpp:841
 msgid "Generic options"
 msgstr "Obecné přepínače"
 
@@ -4072,7 +4072,7 @@ msgstr "Nezvolen žádný mikrokontrolér"
 msgid "No device specified."
 msgstr "Nespecifikován žádný mikrokontrolér"
 
-#: common/nokde/nokde_kaboutdata.cpp:430
+#: common/nokde/nokde_tdeaboutdata.cpp:430
 msgid ""
 "No licensing terms for this program have been specified.\n"
 "Please check the documentation or the source for any\n"
@@ -4574,11 +4574,11 @@ msgstr "Prosím zkompilujte projekt"
 msgid "Please provide your email address."
 msgstr "Prosím zadejte svůj e-mail."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:654
+#: common/nokde/nokde_tdecmdlineargs.cpp:654
 msgid "Please use %1 to report bugs, do not mail the authors directly.\n"
 msgstr "Použijte prosím %1 k nahlášení chyby, nepište přímo autorům.\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:652
+#: common/nokde/nokde_tdecmdlineargs.cpp:652
 msgid "Please use http://bugs.kde.org to report bugs, do not mail the authors directly.\n"
 msgstr "Použijte prosím http://bugs.kde.org k nahlášení chyby, nepište přímo autorům.\n"
 
@@ -5501,7 +5501,7 @@ msgstr "Rozpoznávám..."
 msgid "Short"
 msgstr "USB Port"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:850
+#: common/nokde/nokde_tdecmdlineargs.cpp:850
 msgid "Show %1 specific options"
 msgstr "Zobrazit přepínače pro %1"
 
@@ -5509,11 +5509,11 @@ msgstr "Zobrazit přepínače pro %1"
 msgid "Show Program Counter"
 msgstr "Zobrazit programový čítač"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:857
+#: common/nokde/nokde_tdecmdlineargs.cpp:857
 msgid "Show all options"
 msgstr "Zobrazit všechny přepínače"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:858
+#: common/nokde/nokde_tdecmdlineargs.cpp:858
 msgid "Show author information"
 msgstr "Zobrazit informaci o autorech"
 
@@ -5526,15 +5526,15 @@ msgstr ""
 msgid "Show disassembly location"
 msgstr "Výpis zpětného překladu"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:842
+#: common/nokde/nokde_tdecmdlineargs.cpp:842
 msgid "Show help about options"
 msgstr "Zobrazit nápovědu k přepínačům"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:860
+#: common/nokde/nokde_tdecmdlineargs.cpp:860
 msgid "Show license information"
 msgstr "Zobrazit informaci o licenci"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:859
+#: common/nokde/nokde_tdecmdlineargs.cpp:859
 msgid "Show version information"
 msgstr "Zobrazit informaci o verzi"
 
@@ -5906,7 +5906,7 @@ msgstr "Paměť mikrokontroléru je v neznámém stavu. Možná jej budete chtí
 msgid "The email address is optional. If you do not provide any, your comments will be sent anonymously. Just click OK in that case."
 msgstr "E-mailová adresa je volitelná. Pokud ji nezadáte, váš komentář bude odeslán anonymně. Prostě klikněte na OK."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:1313
+#: common/nokde/nokde_tdecmdlineargs.cpp:1313
 msgid "The files/URLs opened by the application will be deleted after use"
 msgstr "Soubory/adresy otevřené aplikací budou po použití smazány"
 
@@ -6117,7 +6117,7 @@ msgstr ""
 "Tento vývod je ovládán programovaným mikrokontrolérem.\n"
 "Bez mikrokontroléru musí být stejný jako \"Data out\" vývod (při zapnutí)."
 
-#: common/nokde/nokde_kaboutdata.cpp:437
+#: common/nokde/nokde_tdeaboutdata.cpp:437
 msgid "This program is distributed under the terms of the %1."
 msgstr "Tento program je distribuován za podmínek %1."
 
@@ -6322,7 +6322,7 @@ msgstr "Neočekávaná odpověď ($7F00) z ICD2 (%1)."
 msgid "Unexpected answer (08) from ICD2 (%1)."
 msgstr "Neočekávaná odpověď (08) z ICD2 (%1)."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:674
+#: common/nokde/nokde_tdecmdlineargs.cpp:674
 msgid "Unexpected argument '%1'."
 msgstr "Neočekávaný parametr '%1'."
 
@@ -6403,8 +6403,8 @@ msgstr "Neznámý formát hex souboru \"%1\"."
 msgid "Unknown id returned by bootloader (%1 read and %2 expected)."
 msgstr "Neznámé ID vráceno zavaděčem (%1 přečteno a  %2 vráceno).."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:521
-#: common/nokde/nokde_kcmdlineargs.cpp:537
+#: common/nokde/nokde_tdecmdlineargs.cpp:521
+#: common/nokde/nokde_tdecmdlineargs.cpp:537
 msgid "Unknown option '%1'."
 msgstr "Neznámý přepínač '%1'."
 
@@ -6514,11 +6514,11 @@ msgstr "Nahrát..."
 msgid "Upper-128-byte Pointer"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:838
+#: common/nokde/nokde_tdecmdlineargs.cpp:838
 msgid "Usage: %1 %2\n"
 msgstr "Použití: %1 %2\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:783
+#: common/nokde/nokde_tdecmdlineargs.cpp:783
 msgid "Use --help to get a list of available command line options."
 msgstr "K získání seznamu dostupných voleb příkazové řádky použijte přepínač --help."
 
@@ -6779,11 +6779,11 @@ msgstr "<qt>Váš počítač nejspíše nemá žádný sériový port.</qt>"
 msgid "Your email address (keep empty to post comments anonymously):"
 msgstr "Váš e-mail (pro anonymní odeslání ponechte prázdné):"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:818
+#: common/nokde/nokde_tdecmdlineargs.cpp:818
 msgid "[%1-options]"
 msgstr "[%1-přepínače]"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:811
+#: common/nokde/nokde_tdecmdlineargs.cpp:811
 msgid "[options] "
 msgstr "[přepínače]"
 
@@ -7061,7 +7061,7 @@ msgstr "Obslužný podprogram přerušení od Timer1"
 msgid "relocatable code"
 msgstr "přemístitelný kód"
 
-#: common/nokde/nokde_kaboutdata.cpp:374
+#: common/nokde/nokde_tdeaboutdata.cpp:374
 msgid "replace this with information about your translation team"
 msgstr "nahradit za informace o vašem překladatelském týmu"
 
@@ -7100,7 +7100,7 @@ msgstr "%1 bytů"
 msgid "symbol \"%1\""
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:644
+#: common/nokde/nokde_tdecmdlineargs.cpp:644
 msgid "the 2nd argument is a list of name+address, one on each line"
 msgstr "druhý parametr je seznam jméno+adresa, po jednom na každý řádek"
 
diff --git a/po/de.po b/po/de.po
index 4fc2e07..9a00c20 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Poedit-Country: GERMANY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:802
+#: common/nokde/nokde_tdecmdlineargs.cpp:802
 msgid ""
 "\n"
 "%1:\n"
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "%1:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:946
+#: common/nokde/nokde_tdecmdlineargs.cpp:946
 msgid ""
 "\n"
 "Arguments:\n"
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "Argumente:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:885
+#: common/nokde/nokde_tdecmdlineargs.cpp:885
 msgid ""
 "\n"
 "Options:\n"
@@ -240,11 +240,11 @@ msgstr "%1 bytes"
 msgid "%1 for block %2"
 msgstr "%1 für Block %2"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:883
+#: common/nokde/nokde_tdecmdlineargs.cpp:883
 msgid "%1 options"
 msgstr "%1 Optionen"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:647
+#: common/nokde/nokde_tdecmdlineargs.cpp:647
 msgid "%1 was written by somebody who wants to remain anonymous."
 msgstr "%1 wurde von jemandem geschrieben, der gerne Anonym bleiben wollte."
 
@@ -378,7 +378,7 @@ msgstr "&Vergleiche"
 msgid "&Zero"
 msgstr "&Zero"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:545
+#: common/nokde/nokde_tdecmdlineargs.cpp:545
 msgid "'%1' missing."
 msgstr "'%1' fehlt."
 
@@ -2387,7 +2387,7 @@ msgstr "Ende des Programmspeichers"
 msgid "End of command file reached."
 msgstr "Ende der Befehlsdatei erreicht."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:861
+#: common/nokde/nokde_tdecmdlineargs.cpp:861
 msgid "End of options"
 msgstr "Keine weiteren Optionen"
 
@@ -3092,7 +3092,7 @@ msgstr "Disassemblierung für dieses Bauteil nicht unterstützt."
 msgid "Generic Pointer"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:841
+#: common/nokde/nokde_tdecmdlineargs.cpp:841
 msgid "Generic options"
 msgstr ""
 
@@ -4045,7 +4045,7 @@ msgstr "Bauteil nicht angegeben."
 msgid "No device specified."
 msgstr "Bauteil nicht angegeben."
 
-#: common/nokde/nokde_kaboutdata.cpp:430
+#: common/nokde/nokde_tdeaboutdata.cpp:430
 msgid ""
 "No licensing terms for this program have been specified.\n"
 "Please check the documentation or the source for any\n"
@@ -4540,11 +4540,11 @@ msgstr ""
 msgid "Please provide your email address."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:654
+#: common/nokde/nokde_tdecmdlineargs.cpp:654
 msgid "Please use %1 to report bugs, do not mail the authors directly.\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:652
+#: common/nokde/nokde_tdecmdlineargs.cpp:652
 msgid "Please use http://bugs.kde.org to report bugs, do not mail the authors directly.\n"
 msgstr ""
 
@@ -5468,7 +5468,7 @@ msgstr "Automatische Erkennung..."
 msgid "Short"
 msgstr "USB Port"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:850
+#: common/nokde/nokde_tdecmdlineargs.cpp:850
 msgid "Show %1 specific options"
 msgstr "Zeige spezielle Optionen von %1"
 
@@ -5476,11 +5476,11 @@ msgstr "Zeige spezielle Optionen von %1"
 msgid "Show Program Counter"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:857
+#: common/nokde/nokde_tdecmdlineargs.cpp:857
 msgid "Show all options"
 msgstr "Zeige alle Optionen"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:858
+#: common/nokde/nokde_tdecmdlineargs.cpp:858
 msgid "Show author information"
 msgstr "Zeige Informationen über die Autoren"
 
@@ -5493,15 +5493,15 @@ msgstr ""
 msgid "Show disassembly location"
 msgstr "Liste der Disassemblierung"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:842
+#: common/nokde/nokde_tdecmdlineargs.cpp:842
 msgid "Show help about options"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:860
+#: common/nokde/nokde_tdecmdlineargs.cpp:860
 msgid "Show license information"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:859
+#: common/nokde/nokde_tdecmdlineargs.cpp:859
 msgid "Show version information"
 msgstr ""
 
@@ -5866,7 +5866,7 @@ msgstr ""
 msgid "The email address is optional. If you do not provide any, your comments will be sent anonymously. Just click OK in that case."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:1313
+#: common/nokde/nokde_tdecmdlineargs.cpp:1313
 msgid "The files/URLs opened by the application will be deleted after use"
 msgstr ""
 
@@ -6064,7 +6064,7 @@ msgid ""
 "Without device, it must follow the \"Data out\" pin (when powered on)."
 msgstr ""
 
-#: common/nokde/nokde_kaboutdata.cpp:437
+#: common/nokde/nokde_tdeaboutdata.cpp:437
 msgid "This program is distributed under the terms of the %1."
 msgstr ""
 
@@ -6264,7 +6264,7 @@ msgstr ""
 msgid "Unexpected answer (08) from ICD2 (%1)."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:674
+#: common/nokde/nokde_tdecmdlineargs.cpp:674
 msgid "Unexpected argument '%1'."
 msgstr ""
 
@@ -6345,8 +6345,8 @@ msgstr "Hex-Dateiformat:"
 msgid "Unknown id returned by bootloader (%1 read and %2 expected)."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:521
-#: common/nokde/nokde_kcmdlineargs.cpp:537
+#: common/nokde/nokde_tdecmdlineargs.cpp:521
+#: common/nokde/nokde_tdecmdlineargs.cpp:537
 msgid "Unknown option '%1'."
 msgstr ""
 
@@ -6452,11 +6452,11 @@ msgstr "lese..."
 msgid "Upper-128-byte Pointer"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:838
+#: common/nokde/nokde_tdecmdlineargs.cpp:838
 msgid "Usage: %1 %2\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:783
+#: common/nokde/nokde_tdecmdlineargs.cpp:783
 msgid "Use --help to get a list of available command line options."
 msgstr ""
 
@@ -6715,11 +6715,11 @@ msgstr ""
 msgid "Your email address (keep empty to post comments anonymously):"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:818
+#: common/nokde/nokde_tdecmdlineargs.cpp:818
 msgid "[%1-options]"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:811
+#: common/nokde/nokde_tdecmdlineargs.cpp:811
 msgid "[options] "
 msgstr ""
 
@@ -6991,7 +6991,7 @@ msgstr "Hauptkonfiguration"
 msgid "relocatable code"
 msgstr ""
 
-#: common/nokde/nokde_kaboutdata.cpp:374
+#: common/nokde/nokde_tdeaboutdata.cpp:374
 msgid "replace this with information about your translation team"
 msgstr ""
 
@@ -7030,7 +7030,7 @@ msgstr "%1 bytes"
 msgid "symbol \"%1\""
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:644
+#: common/nokde/nokde_tdecmdlineargs.cpp:644
 msgid "the 2nd argument is a list of name+address, one on each line"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 3314ee6..a2b3c63 100644
--- a/po/es.po
+++ b/po/es.po
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:802
+#: common/nokde/nokde_tdecmdlineargs.cpp:802
 msgid ""
 "\n"
 "%1:\n"
@@ -36,7 +36,7 @@ msgstr ""
 "\n"
 "%1:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:946
+#: common/nokde/nokde_tdecmdlineargs.cpp:946
 msgid ""
 "\n"
 "Arguments:\n"
@@ -44,7 +44,7 @@ msgstr ""
 "\n"
 "Argumentos:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:885
+#: common/nokde/nokde_tdecmdlineargs.cpp:885
 msgid ""
 "\n"
 "Options:\n"
@@ -246,11 +246,11 @@ msgstr "%1 bytes"
 msgid "%1 for block %2"
 msgstr "%1 para el bloque %2"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:883
+#: common/nokde/nokde_tdecmdlineargs.cpp:883
 msgid "%1 options"
 msgstr "%1 opciones"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:647
+#: common/nokde/nokde_tdecmdlineargs.cpp:647
 msgid "%1 was written by somebody who wants to remain anonymous."
 msgstr "%1 escrito por alguien que prefiere el anonimato."
 
@@ -382,7 +382,7 @@ msgstr "&Verificar"
 msgid "&Zero"
 msgstr "&Cero"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:545
+#: common/nokde/nokde_tdecmdlineargs.cpp:545
 msgid "'%1' missing."
 msgstr "«%1» desaparecido."
 
@@ -2345,7 +2345,7 @@ msgstr ""
 msgid "End of command file reached."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:861
+#: common/nokde/nokde_tdecmdlineargs.cpp:861
 msgid "End of options"
 msgstr ""
 
@@ -3024,7 +3024,7 @@ msgstr ""
 msgid "Generic Pointer"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:841
+#: common/nokde/nokde_tdecmdlineargs.cpp:841
 msgid "Generic options"
 msgstr ""
 
@@ -3940,7 +3940,7 @@ msgstr "No probado."
 msgid "No device specified."
 msgstr "No probado."
 
-#: common/nokde/nokde_kaboutdata.cpp:430
+#: common/nokde/nokde_tdeaboutdata.cpp:430
 msgid ""
 "No licensing terms for this program have been specified.\n"
 "Please check the documentation or the source for any\n"
@@ -4421,11 +4421,11 @@ msgstr ""
 msgid "Please provide your email address."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:654
+#: common/nokde/nokde_tdecmdlineargs.cpp:654
 msgid "Please use %1 to report bugs, do not mail the authors directly.\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:652
+#: common/nokde/nokde_tdecmdlineargs.cpp:652
 msgid "Please use http://bugs.kde.org to report bugs, do not mail the authors directly.\n"
 msgstr ""
 
@@ -5312,7 +5312,7 @@ msgstr "Reiniciando..."
 msgid "Short"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:850
+#: common/nokde/nokde_tdecmdlineargs.cpp:850
 msgid "Show %1 specific options"
 msgstr ""
 
@@ -5320,11 +5320,11 @@ msgstr ""
 msgid "Show Program Counter"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:857
+#: common/nokde/nokde_tdecmdlineargs.cpp:857
 msgid "Show all options"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:858
+#: common/nokde/nokde_tdecmdlineargs.cpp:858
 msgid "Show author information"
 msgstr ""
 
@@ -5336,15 +5336,15 @@ msgstr ""
 msgid "Show disassembly location"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:842
+#: common/nokde/nokde_tdecmdlineargs.cpp:842
 msgid "Show help about options"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:860
+#: common/nokde/nokde_tdecmdlineargs.cpp:860
 msgid "Show license information"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:859
+#: common/nokde/nokde_tdecmdlineargs.cpp:859
 msgid "Show version information"
 msgstr ""
 
@@ -5698,7 +5698,7 @@ msgstr ""
 msgid "The email address is optional. If you do not provide any, your comments will be sent anonymously. Just click OK in that case."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:1313
+#: common/nokde/nokde_tdecmdlineargs.cpp:1313
 msgid "The files/URLs opened by the application will be deleted after use"
 msgstr ""
 
@@ -5883,7 +5883,7 @@ msgid ""
 "Without device, it must follow the \"Data out\" pin (when powered on)."
 msgstr ""
 
-#: common/nokde/nokde_kaboutdata.cpp:437
+#: common/nokde/nokde_tdeaboutdata.cpp:437
 msgid "This program is distributed under the terms of the %1."
 msgstr ""
 
@@ -6080,7 +6080,7 @@ msgstr ""
 msgid "Unexpected answer (08) from ICD2 (%1)."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:674
+#: common/nokde/nokde_tdecmdlineargs.cpp:674
 msgid "Unexpected argument '%1'."
 msgstr ""
 
@@ -6159,8 +6159,8 @@ msgstr ""
 msgid "Unknown id returned by bootloader (%1 read and %2 expected)."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:521
-#: common/nokde/nokde_kcmdlineargs.cpp:537
+#: common/nokde/nokde_tdecmdlineargs.cpp:521
+#: common/nokde/nokde_tdecmdlineargs.cpp:537
 msgid "Unknown option '%1'."
 msgstr ""
 
@@ -6259,11 +6259,11 @@ msgstr "Cargando el firmware..."
 msgid "Upper-128-byte Pointer"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:838
+#: common/nokde/nokde_tdecmdlineargs.cpp:838
 msgid "Usage: %1 %2\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:783
+#: common/nokde/nokde_tdecmdlineargs.cpp:783
 msgid "Use --help to get a list of available command line options."
 msgstr ""
 
@@ -6516,11 +6516,11 @@ msgstr "Puede que su computadora no tenga ningún puerto serie."
 msgid "Your email address (keep empty to post comments anonymously):"
 msgstr "Su dirección de correo (deje en blanco para hacer comentarios anónimos):)"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:818
+#: common/nokde/nokde_tdecmdlineargs.cpp:818
 msgid "[%1-options]"
 msgstr "[%1-opciones]"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:811
+#: common/nokde/nokde_tdecmdlineargs.cpp:811
 msgid "[options] "
 msgstr "[opciones]"
 
@@ -6788,7 +6788,7 @@ msgstr "rutina de servicio de interrupciones de periféricos"
 msgid "relocatable code"
 msgstr "código reubicable"
 
-#: common/nokde/nokde_kaboutdata.cpp:374
+#: common/nokde/nokde_tdeaboutdata.cpp:374
 msgid "replace this with information about your translation team"
 msgstr "reemplazar esta información acerca del grupo de traducción"
 
@@ -6826,7 +6826,7 @@ msgstr "%1 bytes"
 msgid "symbol \"%1\""
 msgstr "símbolo \"%1\""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:644
+#: common/nokde/nokde_tdecmdlineargs.cpp:644
 msgid "the 2nd argument is a list of name+address, one on each line"
 msgstr "el 2do argumento es una lista de nombre+dirección, una por cada linea"
 
diff --git a/po/fr.po b/po/fr.po
index 0be9cc5..3f38c8c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:802
+#: common/nokde/nokde_tdecmdlineargs.cpp:802
 msgid ""
 "\n"
 "%1:\n"
@@ -24,7 +24,7 @@ msgstr ""
 "\n"
 "%1 :\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:946
+#: common/nokde/nokde_tdecmdlineargs.cpp:946
 msgid ""
 "\n"
 "Arguments:\n"
@@ -32,7 +32,7 @@ msgstr ""
 "\n"
 "Arguments :\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:885
+#: common/nokde/nokde_tdecmdlineargs.cpp:885
 msgid ""
 "\n"
 "Options:\n"
@@ -233,11 +233,11 @@ msgstr "%1 octets"
 msgid "%1 for block %2"
 msgstr "%1 pour le bloc %2"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:883
+#: common/nokde/nokde_tdecmdlineargs.cpp:883
 msgid "%1 options"
 msgstr "Options de %1"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:647
+#: common/nokde/nokde_tdecmdlineargs.cpp:647
 msgid "%1 was written by somebody who wants to remain anonymous."
 msgstr "%1 a été écrit par quelqu'un qui souhaitait rester anonyme."
 
@@ -370,7 +370,7 @@ msgstr "&Vérifier"
 msgid "&Zero"
 msgstr "&Zéro"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:545
+#: common/nokde/nokde_tdecmdlineargs.cpp:545
 msgid "'%1' missing."
 msgstr "« %1 » est manquant."
 
@@ -2328,7 +2328,7 @@ msgstr "Fin de toutes les sections de code"
 msgid "End of command file reached."
 msgstr "La fin du fichier de commandes a été atteinte."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:861
+#: common/nokde/nokde_tdecmdlineargs.cpp:861
 msgid "End of options"
 msgstr "Fin des options"
 
@@ -3006,7 +3006,7 @@ msgstr "La génération n'est que partiellement gérée pour ce circuit."
 msgid "Generic Pointer"
 msgstr "Pointeur génériques"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:841
+#: common/nokde/nokde_tdecmdlineargs.cpp:841
 msgid "Generic options"
 msgstr "Options génériques"
 
@@ -3917,7 +3917,7 @@ msgstr "Aucun circuit sélectionné."
 msgid "No device specified."
 msgstr "Aucun circuit spécifié"
 
-#: common/nokde/nokde_kaboutdata.cpp:430
+#: common/nokde/nokde_tdeaboutdata.cpp:430
 msgid ""
 "No licensing terms for this program have been specified.\n"
 "Please check the documentation or the source for any\n"
@@ -4400,11 +4400,11 @@ msgstr "Veuillez compiler le projet courant"
 msgid "Please provide your email address."
 msgstr "Veuillez fournir votre adresse courriel."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:654
+#: common/nokde/nokde_tdecmdlineargs.cpp:654
 msgid "Please use %1 to report bugs, do not mail the authors directly.\n"
 msgstr "Veuillez signaler les bogues (en anglais) sur %1 et ne pas écrire directement aux auteurs.\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:652
+#: common/nokde/nokde_tdecmdlineargs.cpp:652
 msgid "Please use http://bugs.kde.org to report bugs, do not mail the authors directly.\n"
 msgstr "Veuillez signaler les bogues (en anglais) sur http://bugs.kde.org et ne pas écrire directement aux auteurs.\n"
 
@@ -5290,7 +5290,7 @@ msgstr "Détection..."
 msgid "Short"
 msgstr "Short"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:850
+#: common/nokde/nokde_tdecmdlineargs.cpp:850
 msgid "Show %1 specific options"
 msgstr "Afficher les options spécifiques à %1"
 
@@ -5298,11 +5298,11 @@ msgstr "Afficher les options spécifiques à %1"
 msgid "Show Program Counter"
 msgstr "Afficher le compteur programme"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:857
+#: common/nokde/nokde_tdecmdlineargs.cpp:857
 msgid "Show all options"
 msgstr "Afficher toutes les options"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:858
+#: common/nokde/nokde_tdecmdlineargs.cpp:858
 msgid "Show author information"
 msgstr "Afficher les informations sur l'auteur"
 
@@ -5314,15 +5314,15 @@ msgstr "Afficher le bouton de fermeture sur les onglets (nécessite un redémarr
 msgid "Show disassembly location"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:842
+#: common/nokde/nokde_tdecmdlineargs.cpp:842
 msgid "Show help about options"
 msgstr "Afficher l'aide sur les options"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:860
+#: common/nokde/nokde_tdecmdlineargs.cpp:860
 msgid "Show license information"
 msgstr "Afficher les informations de licence"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:859
+#: common/nokde/nokde_tdecmdlineargs.cpp:859
 msgid "Show version information"
 msgstr "Afficher les informations de version"
 
@@ -5680,7 +5680,7 @@ msgstr "La mémoire du circuit est dans un état inconnu. Vous devriez reprogram
 msgid "The email address is optional. If you do not provide any, your comments will be sent anonymously. Just click OK in that case."
 msgstr "L'adresse courriel est optionnelle. Si vous ne la fournissez pas, vos commentaires seront envoyés de manière anonyme. Dans ce cas, cliquez sur OK."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:1313
+#: common/nokde/nokde_tdecmdlineargs.cpp:1313
 msgid "The files/URLs opened by the application will be deleted after use"
 msgstr "Les fichiers/URL ouverts par l'application seront effacés après utilisation"
 
@@ -5882,7 +5882,7 @@ msgstr ""
 "Cette broche est pilotée par le circuit programmé.\n"
 "Sans circuit, elle doit suivre la broche « Data out » (lorsqu'elle est alimentée)."
 
-#: common/nokde/nokde_kaboutdata.cpp:437
+#: common/nokde/nokde_tdeaboutdata.cpp:437
 msgid "This program is distributed under the terms of the %1."
 msgstr "Ce programme est distribué sous les termes de la %1."
 
@@ -6078,7 +6078,7 @@ msgstr "Réponse inattendue ($7F00) de l'ICD2 (%1)."
 msgid "Unexpected answer (08) from ICD2 (%1)."
 msgstr "Réponse inattendue (08) de l'ICD2 (%1)."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:674
+#: common/nokde/nokde_tdecmdlineargs.cpp:674
 msgid "Unexpected argument '%1'."
 msgstr "Argument inattendu « %1 »."
 
@@ -6156,8 +6156,8 @@ msgstr "Format de fichier hexadécimal inconnu « %1 »."
 msgid "Unknown id returned by bootloader (%1 read and %2 expected)."
 msgstr "Identifiant inconnu renvoyé par le chargeur de démarrage (%1 lu et %2 attendu)."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:521
-#: common/nokde/nokde_kcmdlineargs.cpp:537
+#: common/nokde/nokde_tdecmdlineargs.cpp:521
+#: common/nokde/nokde_tdecmdlineargs.cpp:537
 msgid "Unknown option '%1'."
 msgstr "Option inconnue « %1 »."
 
@@ -6256,11 +6256,11 @@ msgstr "Chargement..."
 msgid "Upper-128-byte Pointer"
 msgstr "Pointeur sur les 128 octets les plus hauts"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:838
+#: common/nokde/nokde_tdecmdlineargs.cpp:838
 msgid "Usage: %1 %2\n"
 msgstr "Usage : %1 %2\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:783
+#: common/nokde/nokde_tdecmdlineargs.cpp:783
 msgid "Use --help to get a list of available command line options."
 msgstr "Utilisez --help pour obtenir la liste des options de la ligne de commande."
 
@@ -6513,11 +6513,11 @@ msgstr "Votre ordinateur ne semble pas avoir de port série."
 msgid "Your email address (keep empty to post comments anonymously):"
 msgstr "Votre adresse courriel (laissez vide pour envoyer les commentaires anonymement) :"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:818
+#: common/nokde/nokde_tdecmdlineargs.cpp:818
 msgid "[%1-options]"
 msgstr "[%1-options]"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:811
+#: common/nokde/nokde_tdecmdlineargs.cpp:811
 msgid "[options] "
 msgstr "[options] "
 
@@ -6781,7 +6781,7 @@ msgstr "service de l'interruption du périphérique"
 msgid "relocatable code"
 msgstr "code relogeable"
 
-#: common/nokde/nokde_kaboutdata.cpp:374
+#: common/nokde/nokde_tdeaboutdata.cpp:374
 msgid "replace this with information about your translation team"
 msgstr "Alain Portal <aportal AT univ-montp2 DOT fr>"
 
@@ -6819,7 +6819,7 @@ msgstr "%1 octets"
 msgid "symbol \"%1\""
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:644
+#: common/nokde/nokde_tdecmdlineargs.cpp:644
 msgid "the 2nd argument is a list of name+address, one on each line"
 msgstr "le second argument est une liste de nom+adresse, un par ligne"
 
diff --git a/po/hu.po b/po/hu.po
index ef485f0..676774a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -22,7 +22,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:802
+#: common/nokde/nokde_tdecmdlineargs.cpp:802
 msgid ""
 "\n"
 "%1:\n"
@@ -30,7 +30,7 @@ msgstr ""
 "\n"
 "%1:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:946
+#: common/nokde/nokde_tdecmdlineargs.cpp:946
 msgid ""
 "\n"
 "Arguments:\n"
@@ -38,7 +38,7 @@ msgstr ""
 "\n"
 "Paraméterek:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:885
+#: common/nokde/nokde_tdecmdlineargs.cpp:885
 msgid ""
 "\n"
 "Options:\n"
@@ -246,11 +246,11 @@ msgstr "%1 bájtok"
 msgid "%1 for block %2"
 msgstr "%1 blokkoknak %2"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:883
+#: common/nokde/nokde_tdecmdlineargs.cpp:883
 msgid "%1 options"
 msgstr "%1 opciók"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:647
+#: common/nokde/nokde_tdecmdlineargs.cpp:647
 msgid "%1 was written by somebody who wants to remain anonymous."
 msgstr "%1 ."
 
@@ -384,7 +384,7 @@ msgstr "&Összehasonlítás"
 msgid "&Zero"
 msgstr "&Nulla"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:545
+#: common/nokde/nokde_tdecmdlineargs.cpp:545
 msgid "'%1' missing."
 msgstr "'%1' hiányzik."
 
@@ -2417,7 +2417,7 @@ msgstr "End of all code sections"
 msgid "End of command file reached."
 msgstr "End of command file reached."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:861
+#: common/nokde/nokde_tdecmdlineargs.cpp:861
 msgid "End of options"
 msgstr "End of options"
 
@@ -3124,7 +3124,7 @@ msgstr "Generation is only partially supported for this device."
 msgid "Generic Pointer"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:841
+#: common/nokde/nokde_tdecmdlineargs.cpp:841
 msgid "Generic options"
 msgstr ""
 
@@ -4071,7 +4071,7 @@ msgstr "Az eszköz nem meghatározott."
 msgid "No device specified."
 msgstr "Az eszköz nem meghatározott."
 
-#: common/nokde/nokde_kaboutdata.cpp:430
+#: common/nokde/nokde_tdeaboutdata.cpp:430
 msgid ""
 "No licensing terms for this program have been specified.\n"
 "Please check the documentation or the source for any\n"
@@ -4571,11 +4571,11 @@ msgstr ""
 msgid "Please provide your email address."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:654
+#: common/nokde/nokde_tdecmdlineargs.cpp:654
 msgid "Please use %1 to report bugs, do not mail the authors directly.\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:652
+#: common/nokde/nokde_tdecmdlineargs.cpp:652
 msgid "Please use http://bugs.kde.org to report bugs, do not mail the authors directly.\n"
 msgstr ""
 
@@ -5500,7 +5500,7 @@ msgstr "Keresem ..."
 msgid "Short"
 msgstr "USB Port"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:850
+#: common/nokde/nokde_tdecmdlineargs.cpp:850
 msgid "Show %1 specific options"
 msgstr "Show %1 specific options"
 
@@ -5508,11 +5508,11 @@ msgstr "Show %1 specific options"
 msgid "Show Program Counter"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:857
+#: common/nokde/nokde_tdecmdlineargs.cpp:857
 msgid "Show all options"
 msgstr "Minden beállítást mutass"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:858
+#: common/nokde/nokde_tdecmdlineargs.cpp:858
 msgid "Show author information"
 msgstr "Mutass a készítőről infót "
 
@@ -5525,15 +5525,15 @@ msgstr ""
 msgid "Show disassembly location"
 msgstr "Disassembly Listing"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:842
+#: common/nokde/nokde_tdecmdlineargs.cpp:842
 msgid "Show help about options"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:860
+#: common/nokde/nokde_tdecmdlineargs.cpp:860
 msgid "Show license information"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:859
+#: common/nokde/nokde_tdecmdlineargs.cpp:859
 msgid "Show version information"
 msgstr ""
 
@@ -5899,7 +5899,7 @@ msgstr ""
 msgid "The email address is optional. If you do not provide any, your comments will be sent anonymously. Just click OK in that case."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:1313
+#: common/nokde/nokde_tdecmdlineargs.cpp:1313
 msgid "The files/URLs opened by the application will be deleted after use"
 msgstr ""
 
@@ -6094,7 +6094,7 @@ msgid ""
 "Without device, it must follow the \"Data out\" pin (when powered on)."
 msgstr ""
 
-#: common/nokde/nokde_kaboutdata.cpp:437
+#: common/nokde/nokde_tdeaboutdata.cpp:437
 msgid "This program is distributed under the terms of the %1."
 msgstr ""
 
@@ -6297,7 +6297,7 @@ msgstr ""
 msgid "Unexpected answer (08) from ICD2 (%1)."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:674
+#: common/nokde/nokde_tdecmdlineargs.cpp:674
 msgid "Unexpected argument '%1'."
 msgstr ""
 
@@ -6380,8 +6380,8 @@ msgstr "Hex file format:"
 msgid "Unknown id returned by bootloader (%1 read and %2 expected)."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:521
-#: common/nokde/nokde_kcmdlineargs.cpp:537
+#: common/nokde/nokde_tdecmdlineargs.cpp:521
+#: common/nokde/nokde_tdecmdlineargs.cpp:537
 msgid "Unknown option '%1'."
 msgstr ""
 
@@ -6486,11 +6486,11 @@ msgstr "Olvasom..."
 msgid "Upper-128-byte Pointer"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:838
+#: common/nokde/nokde_tdecmdlineargs.cpp:838
 msgid "Usage: %1 %2\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:783
+#: common/nokde/nokde_tdecmdlineargs.cpp:783
 msgid "Use --help to get a list of available command line options."
 msgstr ""
 
@@ -6749,11 +6749,11 @@ msgstr ""
 msgid "Your email address (keep empty to post comments anonymously):"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:818
+#: common/nokde/nokde_tdecmdlineargs.cpp:818
 msgid "[%1-options]"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:811
+#: common/nokde/nokde_tdecmdlineargs.cpp:811
 msgid "[options] "
 msgstr "[beállítás]"
 
@@ -7034,7 +7034,7 @@ msgstr "megszakítás beállító rutin"
 msgid "relocatable code"
 msgstr ""
 
-#: common/nokde/nokde_kaboutdata.cpp:374
+#: common/nokde/nokde_tdeaboutdata.cpp:374
 msgid "replace this with information about your translation team"
 msgstr ""
 
@@ -7073,7 +7073,7 @@ msgstr "%1 bájtok"
 msgid "symbol \"%1\""
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:644
+#: common/nokde/nokde_tdecmdlineargs.cpp:644
 msgid "the 2nd argument is a list of name+address, one on each line"
 msgstr "a 2. argumentum név+cím lista, minden sorban egy"
 
diff --git a/po/it.po b/po/it.po
index 976fbde..1061106 100644
--- a/po/it.po
+++ b/po/it.po
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:802
+#: common/nokde/nokde_tdecmdlineargs.cpp:802
 msgid ""
 "\n"
 "%1:\n"
@@ -24,7 +24,7 @@ msgstr ""
 "\n"
 "%1:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:946
+#: common/nokde/nokde_tdecmdlineargs.cpp:946
 msgid ""
 "\n"
 "Arguments:\n"
@@ -32,7 +32,7 @@ msgstr ""
 "\n"
 "Argomenti:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:885
+#: common/nokde/nokde_tdecmdlineargs.cpp:885
 msgid ""
 "\n"
 "Options:\n"
@@ -237,11 +237,11 @@ msgstr "%1 byte"
 msgid "%1 for block %2"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:883
+#: common/nokde/nokde_tdecmdlineargs.cpp:883
 msgid "%1 options"
 msgstr "%1 opzioni"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:647
+#: common/nokde/nokde_tdecmdlineargs.cpp:647
 msgid "%1 was written by somebody who wants to remain anonymous."
 msgstr ""
 
@@ -375,7 +375,7 @@ msgstr "&Verifica"
 msgid "&Zero"
 msgstr "&Zero"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:545
+#: common/nokde/nokde_tdecmdlineargs.cpp:545
 msgid "'%1' missing."
 msgstr ""
 
@@ -2401,7 +2401,7 @@ msgstr "Mostra tutte le opzioni"
 msgid "End of command file reached."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:861
+#: common/nokde/nokde_tdecmdlineargs.cpp:861
 msgid "End of options"
 msgstr ""
 
@@ -3118,7 +3118,7 @@ msgstr "Aggiornamento del firmware non è supportato dal programmatore specifica
 msgid "Generic Pointer"
 msgstr "Opzioni generiche"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:841
+#: common/nokde/nokde_tdecmdlineargs.cpp:841
 msgid "Generic options"
 msgstr "Opzioni generiche"
 
@@ -4078,7 +4078,7 @@ msgstr "Nessun dispositivo selezionato"
 msgid "No device specified."
 msgstr "Nessun dispositivo specificato"
 
-#: common/nokde/nokde_kaboutdata.cpp:430
+#: common/nokde/nokde_tdeaboutdata.cpp:430
 msgid ""
 "No licensing terms for this program have been specified.\n"
 "Please check the documentation or the source for any\n"
@@ -4580,11 +4580,11 @@ msgstr ""
 msgid "Please provide your email address."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:654
+#: common/nokde/nokde_tdecmdlineargs.cpp:654
 msgid "Please use %1 to report bugs, do not mail the authors directly.\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:652
+#: common/nokde/nokde_tdecmdlineargs.cpp:652
 msgid "Please use http://bugs.kde.org to report bugs, do not mail the authors directly.\n"
 msgstr ""
 
@@ -5513,7 +5513,7 @@ msgstr "Rilevazione in corso ..."
 msgid "Short"
 msgstr "Porta USB"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:850
+#: common/nokde/nokde_tdecmdlineargs.cpp:850
 msgid "Show %1 specific options"
 msgstr ""
 
@@ -5521,11 +5521,11 @@ msgstr ""
 msgid "Show Program Counter"
 msgstr "Mostra Program Counter"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:857
+#: common/nokde/nokde_tdecmdlineargs.cpp:857
 msgid "Show all options"
 msgstr "Mostra tutte le opzioni"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:858
+#: common/nokde/nokde_tdecmdlineargs.cpp:858
 msgid "Show author information"
 msgstr ""
 
@@ -5538,15 +5538,15 @@ msgstr ""
 msgid "Show disassembly location"
 msgstr "Mostra tutte le opzioni"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:842
+#: common/nokde/nokde_tdecmdlineargs.cpp:842
 msgid "Show help about options"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:860
+#: common/nokde/nokde_tdecmdlineargs.cpp:860
 msgid "Show license information"
 msgstr "Mostra informazione sulla licenza"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:859
+#: common/nokde/nokde_tdecmdlineargs.cpp:859
 msgid "Show version information"
 msgstr "Mostra informazione sulla versione"
 
@@ -5910,7 +5910,7 @@ msgstr ""
 msgid "The email address is optional. If you do not provide any, your comments will be sent anonymously. Just click OK in that case."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:1313
+#: common/nokde/nokde_tdecmdlineargs.cpp:1313
 msgid "The files/URLs opened by the application will be deleted after use"
 msgstr ""
 
@@ -6108,7 +6108,7 @@ msgid ""
 "Without device, it must follow the \"Data out\" pin (when powered on)."
 msgstr ""
 
-#: common/nokde/nokde_kaboutdata.cpp:437
+#: common/nokde/nokde_tdeaboutdata.cpp:437
 msgid "This program is distributed under the terms of the %1."
 msgstr ""
 
@@ -6314,7 +6314,7 @@ msgstr ""
 msgid "Unexpected answer (08) from ICD2 (%1)."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:674
+#: common/nokde/nokde_tdecmdlineargs.cpp:674
 msgid "Unexpected argument '%1'."
 msgstr ""
 
@@ -6396,8 +6396,8 @@ msgstr "Formato esadecimale del file sconosciuto \"%1\"."
 msgid "Unknown id returned by bootloader (%1 read and %2 expected)."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:521
-#: common/nokde/nokde_kcmdlineargs.cpp:537
+#: common/nokde/nokde_tdecmdlineargs.cpp:521
+#: common/nokde/nokde_tdecmdlineargs.cpp:537
 msgid "Unknown option '%1'."
 msgstr "Opzione sconosciuta '%1'."
 
@@ -6505,11 +6505,11 @@ msgstr "Carica..."
 msgid "Upper-128-byte Pointer"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:838
+#: common/nokde/nokde_tdecmdlineargs.cpp:838
 msgid "Usage: %1 %2\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:783
+#: common/nokde/nokde_tdecmdlineargs.cpp:783
 msgid "Use --help to get a list of available command line options."
 msgstr ""
 
@@ -6772,11 +6772,11 @@ msgstr ""
 msgid "Your email address (keep empty to post comments anonymously):"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:818
+#: common/nokde/nokde_tdecmdlineargs.cpp:818
 msgid "[%1-options]"
 msgstr "[%1-opzioni]"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:811
+#: common/nokde/nokde_tdecmdlineargs.cpp:811
 msgid "[options] "
 msgstr "[opzioni] "
 
@@ -7052,7 +7052,7 @@ msgstr "Configurazione generale"
 msgid "relocatable code"
 msgstr ""
 
-#: common/nokde/nokde_kaboutdata.cpp:374
+#: common/nokde/nokde_tdeaboutdata.cpp:374
 msgid "replace this with information about your translation team"
 msgstr ""
 
@@ -7092,7 +7092,7 @@ msgstr "%1 byte"
 msgid "symbol \"%1\""
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:644
+#: common/nokde/nokde_tdecmdlineargs.cpp:644
 msgid "the 2nd argument is a list of name+address, one on each line"
 msgstr ""
 
diff --git a/po/piklab.pot b/po/piklab.pot
index b929c03..e8405c2 100644
--- a/po/piklab.pot
+++ b/po/piklab.pot
@@ -15,19 +15,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:802
+#: common/nokde/nokde_tdecmdlineargs.cpp:802
 msgid ""
 "\n"
 "%1:\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:946
+#: common/nokde/nokde_tdecmdlineargs.cpp:946
 msgid ""
 "\n"
 "Arguments:\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:885
+#: common/nokde/nokde_tdecmdlineargs.cpp:885
 msgid ""
 "\n"
 "Options:\n"
@@ -226,11 +226,11 @@ msgstr ""
 msgid "%1 for block %2"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:883
+#: common/nokde/nokde_tdecmdlineargs.cpp:883
 msgid "%1 options"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:647
+#: common/nokde/nokde_tdecmdlineargs.cpp:647
 msgid "%1 was written by somebody who wants to remain anonymous."
 msgstr ""
 
@@ -364,7 +364,7 @@ msgstr ""
 msgid "&Zero"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:545
+#: common/nokde/nokde_tdecmdlineargs.cpp:545
 msgid "'%1' missing."
 msgstr ""
 
@@ -2376,7 +2376,7 @@ msgstr ""
 msgid "End of command file reached."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:861
+#: common/nokde/nokde_tdecmdlineargs.cpp:861
 msgid "End of options"
 msgstr ""
 
@@ -3059,7 +3059,7 @@ msgstr ""
 msgid "Generic Pointer"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:841
+#: common/nokde/nokde_tdecmdlineargs.cpp:841
 msgid "Generic options"
 msgstr ""
 
@@ -3980,7 +3980,7 @@ msgstr ""
 msgid "No device specified."
 msgstr ""
 
-#: common/nokde/nokde_kaboutdata.cpp:430
+#: common/nokde/nokde_tdeaboutdata.cpp:430
 msgid ""
 "No licensing terms for this program have been specified.\n"
 "Please check the documentation or the source for any\n"
@@ -4462,11 +4462,11 @@ msgstr ""
 msgid "Please provide your email address."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:654
+#: common/nokde/nokde_tdecmdlineargs.cpp:654
 msgid "Please use %1 to report bugs, do not mail the authors directly.\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:652
+#: common/nokde/nokde_tdecmdlineargs.cpp:652
 msgid ""
 "Please use http://bugs.kde.org to report bugs, do not mail the authors "
 "directly.\n"
@@ -5355,7 +5355,7 @@ msgstr ""
 msgid "Short"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:850
+#: common/nokde/nokde_tdecmdlineargs.cpp:850
 msgid "Show %1 specific options"
 msgstr ""
 
@@ -5363,11 +5363,11 @@ msgstr ""
 msgid "Show Program Counter"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:857
+#: common/nokde/nokde_tdecmdlineargs.cpp:857
 msgid "Show all options"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:858
+#: common/nokde/nokde_tdecmdlineargs.cpp:858
 msgid "Show author information"
 msgstr ""
 
@@ -5379,15 +5379,15 @@ msgstr ""
 msgid "Show disassembly location"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:842
+#: common/nokde/nokde_tdecmdlineargs.cpp:842
 msgid "Show help about options"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:860
+#: common/nokde/nokde_tdecmdlineargs.cpp:860
 msgid "Show license information"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:859
+#: common/nokde/nokde_tdecmdlineargs.cpp:859
 msgid "Show version information"
 msgstr ""
 
@@ -5759,7 +5759,7 @@ msgid ""
 "be sent anonymously. Just click OK in that case."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:1313
+#: common/nokde/nokde_tdecmdlineargs.cpp:1313
 msgid "The files/URLs opened by the application will be deleted after use"
 msgstr ""
 
@@ -5971,7 +5971,7 @@ msgid ""
 "Without device, it must follow the \"Data out\" pin (when powered on)."
 msgstr ""
 
-#: common/nokde/nokde_kaboutdata.cpp:437
+#: common/nokde/nokde_tdeaboutdata.cpp:437
 msgid "This program is distributed under the terms of the %1."
 msgstr ""
 
@@ -6171,7 +6171,7 @@ msgstr ""
 msgid "Unexpected answer (08) from ICD2 (%1)."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:674
+#: common/nokde/nokde_tdecmdlineargs.cpp:674
 msgid "Unexpected argument '%1'."
 msgstr ""
 
@@ -6249,8 +6249,8 @@ msgstr ""
 msgid "Unknown id returned by bootloader (%1 read and %2 expected)."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:521
-#: common/nokde/nokde_kcmdlineargs.cpp:537
+#: common/nokde/nokde_tdecmdlineargs.cpp:521
+#: common/nokde/nokde_tdecmdlineargs.cpp:537
 msgid "Unknown option '%1'."
 msgstr ""
 
@@ -6347,11 +6347,11 @@ msgstr ""
 msgid "Upper-128-byte Pointer"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:838
+#: common/nokde/nokde_tdecmdlineargs.cpp:838
 msgid "Usage: %1 %2\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:783
+#: common/nokde/nokde_tdecmdlineargs.cpp:783
 msgid "Use --help to get a list of available command line options."
 msgstr ""
 
@@ -6610,11 +6610,11 @@ msgstr ""
 msgid "Your email address (keep empty to post comments anonymously):"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:818
+#: common/nokde/nokde_tdecmdlineargs.cpp:818
 msgid "[%1-options]"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:811
+#: common/nokde/nokde_tdecmdlineargs.cpp:811
 msgid "[options] "
 msgstr ""
 
@@ -6878,7 +6878,7 @@ msgstr ""
 msgid "relocatable code"
 msgstr ""
 
-#: common/nokde/nokde_kaboutdata.cpp:374
+#: common/nokde/nokde_tdeaboutdata.cpp:374
 msgid "replace this with information about your translation team"
 msgstr ""
 
@@ -6915,7 +6915,7 @@ msgstr ""
 msgid "symbol \"%1\""
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:644
+#: common/nokde/nokde_tdecmdlineargs.cpp:644
 msgid "the 2nd argument is a list of name+address, one on each line"
 msgstr ""
 
diff --git a/src/common/global/generic_config.cpp b/src/common/global/generic_config.cpp
index 48c705b..63f3f08 100644
--- a/src/common/global/generic_config.cpp
+++ b/src/common/global/generic_config.cpp
@@ -19,7 +19,7 @@ public:
   TQSettings _settings;
 };
 #else
-#  include <kapplication.h>
+#  include <tdeapplication.h>
 #  include <tdeconfig.h>
 class GenericConfigPrivate
 {
diff --git a/src/common/global/global.h b/src/common/global/global.h
index 0bc0b58..8dee015 100644
--- a/src/common/global/global.h
+++ b/src/common/global/global.h
@@ -26,14 +26,14 @@
 #  include "tqt_config.h"
 #  include "common/nokde/nokde_kurl.h"
 #  include "common/nokde/nokde_klocale.h"
-#  include "common/nokde/nokde_kaboutdata.h"
-#  include "common/nokde/nokde_kcmdlineargs.h"
+#  include "common/nokde/nokde_tdeaboutdata.h"
+#  include "common/nokde/nokde_tdecmdlineargs.h"
 #else
 #  include "config.h"
-#  include <kapplication.h>
+#  include <tdeapplication.h>
 #  include <klocale.h>
-#  include <kaboutdata.h>
-#  include <kcmdlineargs.h>
+#  include <tdeaboutdata.h>
+#  include <tdecmdlineargs.h>
 #  include <ktempfile.h>
 #  include <tdeconfigbackend.h>
 #endif
diff --git a/src/common/gui/editlistbox.cpp b/src/common/gui/editlistbox.cpp
index 432aacd..126f996 100644
--- a/src/common/gui/editlistbox.cpp
+++ b/src/common/gui/editlistbox.cpp
@@ -25,7 +25,7 @@
 
 #include <kdialog.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifyclient.h>
 #include <kiconloader.h>
 #include <kstdguiitem.h>
diff --git a/src/common/nokde/nokde.pro b/src/common/nokde/nokde.pro
index aa92599..ab37fbd 100644
--- a/src/common/nokde/nokde.pro
+++ b/src/common/nokde/nokde.pro
@@ -2,7 +2,7 @@ STOPDIR = ../../..
 include($${STOPDIR}/lib.pro)
 
 TARGET   = nokde
-HEADERS += nokde_klocale.h nokde_kaboutdata.h nokde_kcmdlineargs.h nokde_kprocess.h
-SOURCES += nokde_klocale.cpp nokde_kaboutdata.cpp nokde_kcmdlineargs.cpp nokde_kprocess.cpp
+HEADERS += nokde_klocale.h nokde_tdeaboutdata.h nokde_tdecmdlineargs.h nokde_kprocess.h
+SOURCES += nokde_klocale.cpp nokde_tdeaboutdata.cpp nokde_tdecmdlineargs.cpp nokde_kprocess.cpp
 win32:HEADERS += win32_utils.h
 win32:SOURCES += win32_utils.c
\ No newline at end of file
diff --git a/src/common/nokde/nokde_kaboutdata.cpp b/src/common/nokde/nokde_tdeaboutdata.cpp
index 8b0a4fe..d8edd5f 100644
--- a/src/common/nokde/nokde_kaboutdata.cpp
+++ b/src/common/nokde/nokde_tdeaboutdata.cpp
@@ -22,7 +22,7 @@
  */
 
 
-#include "nokde_kaboutdata.h"
+#include "nokde_tdeaboutdata.h"
 //#include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/src/common/nokde/nokde_kaboutdata.h b/src/common/nokde/nokde_tdeaboutdata.h
index 93a7768..93a7768 100644
--- a/src/common/nokde/nokde_kaboutdata.h
+++ b/src/common/nokde/nokde_tdeaboutdata.h
diff --git a/src/common/nokde/nokde_kcmdlineargs.cpp b/src/common/nokde/nokde_tdecmdlineargs.cpp
index 15fc238..4480077 100644
--- a/src/common/nokde/nokde_kcmdlineargs.cpp
+++ b/src/common/nokde/nokde_tdecmdlineargs.cpp
@@ -52,10 +52,10 @@
 #endif
 
 
-#include "nokde_kcmdlineargs.h"
-#include "nokde_kaboutdata.h"
+#include "nokde_tdecmdlineargs.h"
+#include "nokde_tdeaboutdata.h"
 #include "nokde_klocale.h"
-//#include <kapplication.h>
+//#include <tdeapplication.h>
 //#include <kglobal.h>
 //#include <kstringhandler.h>
 //#include <kstaticdeleter.h>
diff --git a/src/common/nokde/nokde_kcmdlineargs.h b/src/common/nokde/nokde_tdecmdlineargs.h
index 58931a6..58931a6 100644
--- a/src/common/nokde/nokde_kcmdlineargs.h
+++ b/src/common/nokde/nokde_tdecmdlineargs.h
diff --git a/src/libgui/global_config.cpp b/src/libgui/global_config.cpp
index 085f799..20d1ad3 100644
--- a/src/libgui/global_config.cpp
+++ b/src/libgui/global_config.cpp
@@ -9,7 +9,7 @@
  ***************************************************************************/
 #include "global_config.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 
diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index 80519e2..cdc3eef 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -18,11 +18,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp
index c2877f3..58c33e6 100644
--- a/src/libgui/project_manager.cpp
+++ b/src/libgui/project_manager.cpp
@@ -18,7 +18,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "project.h"
 #include "project_wizard.h"
diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp
index 89eb7c6..68857cd 100644
--- a/src/libgui/text_editor.cpp
+++ b/src/libgui/text_editor.cpp
@@ -18,7 +18,7 @@
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdetexteditor/markinterface.h>
 
 #include "main_global.h"
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index 32e56ff..b241ce4 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -23,10 +23,10 @@
 #include <kstatusbar.h>
 #include <klocale.h>
 #include <kedittoolbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeaction.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeio/observer.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>