Additional k => tde renaming and fixes

139 files changed, 3913 insertions, 3913 deletions

diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_cert.po b/tde-i18n-cy/messages/tdeaddons/tdefile_cert.po
index 32ad19034d8..4051ca41c30 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_cert.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_cert.po
@@ -9,54 +9,54 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_cert.cpp:53
+#: tdefile_cert.cpp:53
 msgid "Certificate Information"
 msgstr "Gwybodaeth Dystysgrif"
 
-#: kfile_cert.cpp:54
+#: tdefile_cert.cpp:54
 msgid "Valid From"
 msgstr ""
 
-#: kfile_cert.cpp:55
+#: tdefile_cert.cpp:55
 msgid "Valid Until"
 msgstr ""
 
-#: kfile_cert.cpp:56
+#: tdefile_cert.cpp:56
 msgid "State"
 msgstr "Cyflwr"
 
-#: kfile_cert.cpp:57
+#: tdefile_cert.cpp:57
 msgid "Serial Number"
 msgstr "Rhif Cyfresol"
 
-#: kfile_cert.cpp:59
+#: tdefile_cert.cpp:59
 msgid "Subject"
 msgstr "Pwnc"
 
-#: kfile_cert.cpp:60 kfile_cert.cpp:68
+#: tdefile_cert.cpp:60 tdefile_cert.cpp:68
 msgid "Organization"
 msgstr "Sefydliad"
 
-#: kfile_cert.cpp:61 kfile_cert.cpp:69
+#: tdefile_cert.cpp:61 tdefile_cert.cpp:69
 msgid "Organizational Unit"
 msgstr "Uned Drefnu"
 
-#: kfile_cert.cpp:62 kfile_cert.cpp:70
+#: tdefile_cert.cpp:62 tdefile_cert.cpp:70
 msgid "Locality"
 msgstr "Lleoliad"
 
-#: kfile_cert.cpp:63 kfile_cert.cpp:71
+#: tdefile_cert.cpp:63 tdefile_cert.cpp:71
 msgid "Country"
 msgstr "Gwlad"
 
-#: kfile_cert.cpp:64 kfile_cert.cpp:72
+#: tdefile_cert.cpp:64 tdefile_cert.cpp:72
 msgid "Common Name"
 msgstr "Enw Cyffredin"
 
-#: kfile_cert.cpp:65 kfile_cert.cpp:73
+#: tdefile_cert.cpp:65 tdefile_cert.cpp:73
 msgid "Email"
 msgstr "Ebost"
 
-#: kfile_cert.cpp:67
+#: tdefile_cert.cpp:67
 msgid "Issuer"
 msgstr "Cyhoeddwr"
diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_desktop.po b/tde-i18n-cy/messages/tdeaddons/tdefile_desktop.po
index 5dacf327ac6..e2c3a8f7cec 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_desktop.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_desktop.po
@@ -1,8 +1,8 @@
-# translation of kfile_desktop.po to Cymraeg
+# translation of tdefile_desktop.po to Cymraeg
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_desktop\n"
+"Project-Id-Version: tdefile_desktop\n"
 "POT-Creation-Date: 2004-10-12 01:18+0200\n"
 "PO-Revision-Date: 2004-02-27 12:01+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -12,54 +12,54 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kfile_desktop.cpp:44
+#: tdefile_desktop.cpp:44
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_desktop.cpp:46
+#: tdefile_desktop.cpp:46
 msgid "Name"
 msgstr "Enw"
 
-#: kfile_desktop.cpp:48
+#: tdefile_desktop.cpp:48
 msgid "Comment"
 msgstr "Sylwad"
 
-#: kfile_desktop.cpp:51
+#: tdefile_desktop.cpp:51
 msgid "Type"
 msgstr "Math"
 
-#: kfile_desktop.cpp:53 kfile_desktop.cpp:84
+#: tdefile_desktop.cpp:53 tdefile_desktop.cpp:84
 msgid "Device"
 msgstr "Dyfais"
 
-#: kfile_desktop.cpp:54
+#: tdefile_desktop.cpp:54
 msgid "Mount Point"
 msgstr "Man Clymu"
 
-#: kfile_desktop.cpp:55
+#: tdefile_desktop.cpp:55
 msgid "File System"
 msgstr "Cysawd Ffeiliau"
 
-#: kfile_desktop.cpp:56
+#: tdefile_desktop.cpp:56
 msgid "Writable"
 msgstr "Ysgrifenadwy"
 
-#: kfile_desktop.cpp:58
+#: tdefile_desktop.cpp:58
 msgid "File Type"
 msgstr "Math Ffeil"
 
-#: kfile_desktop.cpp:59
+#: tdefile_desktop.cpp:59
 msgid "Service Type"
 msgstr "Math Gwasanaeth"
 
-#: kfile_desktop.cpp:60
+#: tdefile_desktop.cpp:60
 msgid "Preferred Items"
 msgstr "Hoff Eitemau"
 
-#: kfile_desktop.cpp:61
+#: tdefile_desktop.cpp:61
 msgid "Link To"
 msgstr "Cysylltu I"
 
-#: kfile_desktop.cpp:101
+#: tdefile_desktop.cpp:101
 msgid "Service"
 msgstr "Gwasanaeth"
diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_folder.po b/tde-i18n-cy/messages/tdeaddons/tdefile_folder.po
index 45b1c7477f5..9ad5005dd6f 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_folder.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_folder.po
@@ -1,8 +1,8 @@
-# translation of kfile_folder.po to Cymraeg
+# translation of tdefile_folder.po to Cymraeg
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_folder\n"
+"Project-Id-Version: tdefile_folder\n"
 "POT-Creation-Date: 2004-10-12 01:18+0200\n"
 "PO-Revision-Date: 2004-02-27 11:21+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -12,14 +12,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kfile_folder.cpp:42
+#: tdefile_folder.cpp:42
 msgid "Folder Information"
 msgstr "Gwybodaeth Blygyll"
 
-#: kfile_folder.cpp:46
+#: tdefile_folder.cpp:46
 msgid "Items"
 msgstr "Eitemau"
 
-#: kfile_folder.cpp:47
+#: tdefile_folder.cpp:47
 msgid "Size"
 msgstr "Maint"
diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_html.po b/tde-i18n-cy/messages/tdeaddons/tdefile_html.po
index ae6eda2cd75..50675a60795 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_html.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_html.po
@@ -1,8 +1,8 @@
-# translation of kfile_html.po to Cymraeg
+# translation of tdefile_html.po to Cymraeg
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_html\n"
+"Project-Id-Version: tdefile_html\n"
 "POT-Creation-Date: 2006-11-26 03:48+0100\n"
 "PO-Revision-Date: 2004-02-27 11:21+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -12,22 +12,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kfile_html.cpp:48
+#: tdefile_html.cpp:48
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_html.cpp:49
+#: tdefile_html.cpp:49
 msgid "Document Type"
 msgstr "Math Dogfen"
 
-#: kfile_html.cpp:50
+#: tdefile_html.cpp:50
 msgid "JavaScript"
 msgstr "JavaScript"
 
-#: kfile_html.cpp:51
+#: tdefile_html.cpp:51
 msgid "Title"
 msgstr "Teitl"
 
-#: kfile_html.cpp:54
+#: tdefile_html.cpp:54
 msgid "Meta Tags"
 msgstr "Tagiau Meta"
diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_lnk.po b/tde-i18n-cy/messages/tdeaddons/tdefile_lnk.po
index e85d10db65c..f72cd78edfb 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_lnk.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_lnk.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdeaddons/kfile_lnk.po\n"
+"Project-Id-Version: ../cy/messages//tdeaddons/tdefile_lnk.po\n"
 "POT-Creation-Date: 2004-10-12 01:18+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,32 +9,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_lnk.cpp:46
+#: tdefile_lnk.cpp:46
 msgid "Windows Link File Information"
 msgstr ""
 
-#: kfile_lnk.cpp:51
+#: tdefile_lnk.cpp:51
 msgid "Size of Target"
 msgstr ""
 
-#: kfile_lnk.cpp:54
+#: tdefile_lnk.cpp:54
 msgid "Location"
 msgstr "Lleoliad"
 
-#: kfile_lnk.cpp:55
+#: tdefile_lnk.cpp:55
 msgid "Points To"
 msgstr ""
 
-#: kfile_lnk.cpp:56
+#: tdefile_lnk.cpp:56
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: kfile_lnk.cpp:78
+#: tdefile_lnk.cpp:78
 #, c-format
 msgid "on Windows disk: %1"
 msgstr ""
 
-#: kfile_lnk.cpp:83
+#: tdefile_lnk.cpp:83
 msgid "on network share"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_mhtml.po b/tde-i18n-cy/messages/tdeaddons/tdefile_mhtml.po
index 6971ad6f431..2a60d97c886 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_mhtml.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_mhtml.po
@@ -9,30 +9,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_mhtml.cpp:43
+#: tdefile_mhtml.cpp:43
 msgid "Document Information"
 msgstr "Gwybodaeth am y Ddogfen"
 
-#: kfile_mhtml.cpp:45
+#: tdefile_mhtml.cpp:45
 msgid "Subject"
 msgstr "Pwnc"
 
-#: kfile_mhtml.cpp:46
+#: tdefile_mhtml.cpp:46
 msgid "Sender"
 msgstr "Anfonwr"
 
-#: kfile_mhtml.cpp:47
+#: tdefile_mhtml.cpp:47
 msgid "Recipient"
 msgstr "Derbynnwr"
 
-#: kfile_mhtml.cpp:48
+#: tdefile_mhtml.cpp:48
 msgid "CC"
 msgstr "CC"
 
-#: kfile_mhtml.cpp:49
+#: tdefile_mhtml.cpp:49
 msgid "BCC"
 msgstr "CCD (BCC)"
 
-#: kfile_mhtml.cpp:50
+#: tdefile_mhtml.cpp:50
 msgid "Date"
 msgstr "Dyddiad"
diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_txt.po b/tde-i18n-cy/messages/tdeaddons/tdefile_txt.po
index 452b6593cff..b309f450e4f 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_txt.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_txt.po
@@ -1,8 +1,8 @@
-# translation of kfile_txt.po to Cymraeg
+# translation of tdefile_txt.po to Cymraeg
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_txt\n"
+"Project-Id-Version: tdefile_txt\n"
 "POT-Creation-Date: 2005-01-08 01:24+0100\n"
 "PO-Revision-Date: 2004-02-27 11:22+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -12,38 +12,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kfile_txt.cpp:45
+#: tdefile_txt.cpp:45
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_txt.cpp:48
+#: tdefile_txt.cpp:48
 msgid "Lines"
 msgstr "Llinellau"
 
-#: kfile_txt.cpp:50
+#: tdefile_txt.cpp:50
 msgid "Words"
 msgstr "Geiriau"
 
-#: kfile_txt.cpp:52
+#: tdefile_txt.cpp:52
 msgid "Characters"
 msgstr "Nodau"
 
-#: kfile_txt.cpp:54
+#: tdefile_txt.cpp:54
 msgid "Format"
 msgstr "Fformat"
 
-#: kfile_txt.cpp:95
+#: tdefile_txt.cpp:95
 msgid "DOS"
 msgstr "DOS"
 
-#: kfile_txt.cpp:97
+#: tdefile_txt.cpp:97
 msgid "UNIX"
 msgstr "UNIX"
 
-#: kfile_txt.cpp:100
+#: tdefile_txt.cpp:100
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: kfile_txt.cpp:110
+#: tdefile_txt.cpp:110
 msgid "Unknown"
 msgstr "Anhysbys"
diff --git a/tde-i18n-cy/messages/tdeaddons/tdehtmlsettingsplugin.po b/tde-i18n-cy/messages/tdeaddons/tdehtmlsettingsplugin.po
index 4a7bc316afe..31a00eda968 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdehtmlsettingsplugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdehtmlsettingsplugin.po
@@ -1,4 +1,4 @@
-# translation of khtmlsettingsplugin.po to Cymraeg
+# translation of tdehtmlsettingsplugin.po to Cymraeg
 # Bwrdd Gwaith yn Gymraeg.
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk<kyfieithu@dotmon.com>, www.gyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: khtmlsettingsplugin\n"
+"Project-Id-Version: tdehtmlsettingsplugin\n"
 "POT-Creation-Date: 2005-02-10 01:34+0100\n"
 "PO-Revision-Date: 2004-02-25 10:01+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -30,7 +30,7 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#. i18n: file khtmlsettingsplugin.rc line 8
+#. i18n: file tdehtmlsettingsplugin.rc line 8
 #: rc.cpp:6
 #, no-c-format
 msgid "Extra Toolbar"
diff --git a/tde-i18n-cy/messages/tdeadmin/knetworkconf.po b/tde-i18n-cy/messages/tdeadmin/knetworkconf.po
index f12db0a0034..95e263df87a 100644
--- a/tde-i18n-cy/messages/tdeadmin/knetworkconf.po
+++ b/tde-i18n-cy/messages/tdeadmin/knetworkconf.po
@@ -867,19 +867,19 @@ msgid ""
 "the changes can take effect."
 msgstr ""
 
-#. i18n: file kselectdistrodlg.ui line 16
+#. i18n: file tdeselectdistrodlg.ui line 16
 #: rc.cpp:374
 #, no-c-format
 msgid "Unsupported Platform"
 msgstr ""
 
-#. i18n: file kselectdistrodlg.ui line 69
+#. i18n: file tdeselectdistrodlg.ui line 69
 #: rc.cpp:383
 #, no-c-format
 msgid "Do not ask again"
 msgstr "Peidiwch a gofyn eto"
 
-#. i18n: file kselectdistrodlg.ui line 94
+#. i18n: file tdeselectdistrodlg.ui line 94
 #: rc.cpp:386
 #, no-c-format
 msgid ""
@@ -887,7 +887,7 @@ msgid ""
 "</font>"
 msgstr ""
 
-#. i18n: file kselectdistrodlg.ui line 102
+#. i18n: file tdeselectdistrodlg.ui line 102
 #: rc.cpp:389
 #, no-c-format
 msgid ""
diff --git a/tde-i18n-cy/messages/tdeadmin/kpackage.po b/tde-i18n-cy/messages/tdeadmin/kpackage.po
index 162cf85a631..8b24a02b9cc 100644
--- a/tde-i18n-cy/messages/tdeadmin/kpackage.po
+++ b/tde-i18n-cy/messages/tdeadmin/kpackage.po
@@ -466,16 +466,16 @@ msgid "File not found: %1"
 msgstr "Ni chafwyd ffeil: %1"
 
 #: kpackage.cpp:646
-msgid "Starting KIO"
-msgstr "Cychwyn KIO"
+msgid "Starting TDEIO"
+msgstr "Cychwyn TDEIO"
 
 #: kpackage.cpp:651
-msgid "KIO finished"
-msgstr "Mae KIO wedi gorffen"
+msgid "TDEIO finished"
+msgstr "Mae TDEIO wedi gorffen"
 
 #: kpackage.cpp:663
-msgid "KIO failed"
-msgstr "Methodd KIO"
+msgid "TDEIO failed"
+msgstr "Methodd TDEIO"
 
 #: kpackage.cpp:676
 msgid "Open location:"
diff --git a/tde-i18n-cy/messages/tdeadmin/tdefile_deb.po b/tde-i18n-cy/messages/tdeadmin/tdefile_deb.po
index 77671942e65..8f53862e814 100644
--- a/tde-i18n-cy/messages/tdeadmin/tdefile_deb.po
+++ b/tde-i18n-cy/messages/tdeadmin/tdefile_deb.po
@@ -1,8 +1,8 @@
-# translation of kfile_deb.po to Cymraeg
+# translation of tdefile_deb.po to Cymraeg
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_deb\n"
+"Project-Id-Version: tdefile_deb\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-02-27 12:12+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -12,22 +12,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kfile_deb.cpp:53
+#: tdefile_deb.cpp:53
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_deb.cpp:56
+#: tdefile_deb.cpp:56
 msgid "Name"
 msgstr "Enw"
 
-#: kfile_deb.cpp:57
+#: tdefile_deb.cpp:57
 msgid "Version"
 msgstr "Fersiwn"
 
-#: kfile_deb.cpp:58
+#: tdefile_deb.cpp:58
 msgid "Summary"
 msgstr "Crynodeb"
 
-#: kfile_deb.cpp:59
+#: tdefile_deb.cpp:59
 msgid "Size"
 msgstr "Maint"
diff --git a/tde-i18n-cy/messages/tdeadmin/tdefile_rpm.po b/tde-i18n-cy/messages/tdeadmin/tdefile_rpm.po
index e1d2dd3d084..f7c6991b9d2 100644
--- a/tde-i18n-cy/messages/tdeadmin/tdefile_rpm.po
+++ b/tde-i18n-cy/messages/tdeadmin/tdefile_rpm.po
@@ -1,8 +1,8 @@
-# translation of kfile_rpm.po to Cymraeg
+# translation of tdefile_rpm.po to Cymraeg
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_rpm\n"
+"Project-Id-Version: tdefile_rpm\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-02-27 12:13+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -12,50 +12,50 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kfile_rpm.cpp:46
+#: tdefile_rpm.cpp:46
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_rpm.cpp:49
+#: tdefile_rpm.cpp:49
 msgid "Name"
 msgstr "Enw"
 
-#: kfile_rpm.cpp:50
+#: tdefile_rpm.cpp:50
 msgid "Version"
 msgstr "Fersiwn"
 
-#: kfile_rpm.cpp:51
+#: tdefile_rpm.cpp:51
 msgid "Release"
 msgstr "Rhyddhad"
 
-#: kfile_rpm.cpp:52
+#: tdefile_rpm.cpp:52
 msgid "Summary"
 msgstr "Crynodeb"
 
-#: kfile_rpm.cpp:54
+#: tdefile_rpm.cpp:54
 msgid "Group"
 msgstr "Grŵp"
 
-#: kfile_rpm.cpp:55
+#: tdefile_rpm.cpp:55
 msgid "Size"
 msgstr "Maint"
 
-#: kfile_rpm.cpp:57
+#: tdefile_rpm.cpp:57
 msgid "Vendor"
 msgstr "Gwerthwr"
 
-#: kfile_rpm.cpp:58
+#: tdefile_rpm.cpp:58
 msgid "Packager"
 msgstr "Pecynnwr"
 
-#: kfile_rpm.cpp:59
+#: tdefile_rpm.cpp:59
 msgid "Archive Offset"
 msgstr "Atred Archif"
 
-#: kfile_rpm.cpp:60
+#: tdefile_rpm.cpp:60
 msgid "Comment"
 msgstr "Sylwad"
 
-#: kfile_rpm.cpp:63
+#: tdefile_rpm.cpp:63
 msgid "All tags"
 msgstr "Pob tag"
diff --git a/tde-i18n-cy/messages/tdeartwork/klock.po b/tde-i18n-cy/messages/tdeartwork/klock.po
index 15d6dee1194..a551ed20472 100644
--- a/tde-i18n-cy/messages/tdeartwork/klock.po
+++ b/tde-i18n-cy/messages/tdeartwork/klock.po
@@ -690,7 +690,7 @@ msgstr "Dechrau diogelydd-sgrîn mewn modd arddangos."
 
 #: xsavers/main.cpp:52
 #, fuzzy
-msgid "KLock"
+msgid "TDELock"
 msgstr "Cloc"
 
 #: xsavers/space.cpp:426
@@ -727,7 +727,7 @@ msgid ""
 "\n"
 "Copyright (c) 1991 by Patrick J. Naughton\n"
 "\n"
-"Ported to kscreensaver by Emanuel Pirker."
+"Ported to tdescreensaver by Emanuel Pirker."
 msgstr ""
 
 #: xsavers/swarm.cpp:418
diff --git a/tde-i18n-cy/messages/tdeartwork/tdepartsaver.po b/tde-i18n-cy/messages/tdeartwork/tdepartsaver.po
index 55591558a94..05d5a3ee3e0 100644
--- a/tde-i18n-cy/messages/tdeartwork/tdepartsaver.po
+++ b/tde-i18n-cy/messages/tdeartwork/tdepartsaver.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdeartwork/kpartsaver.po\n"
+"Project-Id-Version: ../cy/messages//tdeartwork/tdepartsaver.po\n"
 "POT-Creation-Date: 2007-02-26 02:46+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,19 +9,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kpartsaver.cpp:62
+#: tdepartsaver.cpp:62
 msgid "KPart Screen Saver"
 msgstr ""
 
-#: kpartsaver.cpp:124
+#: tdepartsaver.cpp:124
 msgid "The screen saver is not configured yet."
 msgstr ""
 
-#: kpartsaver.cpp:258
+#: tdepartsaver.cpp:258
 msgid "All of your files are unsupported"
 msgstr ""
 
-#: kpartsaver.cpp:341
+#: tdepartsaver.cpp:341
 msgid "Select Media Files"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmcgi.po b/tde-i18n-cy/messages/tdebase/kcmcgi.po
index 7c8f89479b5..75349875a8b 100644
--- a/tde-i18n-cy/messages/tdebase/kcmcgi.po
+++ b/tde-i18n-cy/messages/tdebase/kcmcgi.po
@@ -39,8 +39,8 @@ msgid "kcmcgi"
 msgstr "kcmcgi"
 
 #: kcmcgi.cpp:72
-msgid "CGI KIO Slave Control Module"
-msgstr "Modiwl Rheolaeth y Gwas KIO CGI"
+msgid "CGI TDEIO Slave Control Module"
+msgstr "Modiwl Rheolaeth y Gwas TDEIO CGI"
 
 #: kcmcgi.cpp:74
 msgid "(c) 2002 Cornelius Schumacher"
@@ -48,10 +48,10 @@ msgstr "(h) 2002 Cornelius Schumacher"
 
 #: kcmcgi.cpp:147
 msgid ""
-"<h1>CGI Scripts</h1> The CGI KIO slave lets you execute local CGI programs "
+"<h1>CGI Scripts</h1> The CGI TDEIO slave lets you execute local CGI programs "
 "without the need to run a web server. In this control module you can configure "
 "the paths that are searched for CGI scripts."
 msgstr ""
-"<h1>Sgriptiau CGS</h1> Mae'r gwas KIO CGI yn gadael i chi weithredu rhaglenni "
+"<h1>Sgriptiau CGS</h1> Mae'r gwas TDEIO CGI yn gadael i chi weithredu rhaglenni "
 "CGI lleol heb angen rhedeg gweinydd gwe.  Yn y modiwl rheolaeth yma gallwch "
 "ffurfweddu'r llwybrau lle bydd sgriptiau CGI yn cael eu chwilio amdanynt."
diff --git a/tde-i18n-cy/messages/tdebase/kcmkonqhtml.po b/tde-i18n-cy/messages/tdebase/kcmkonqhtml.po
index d9c574901a3..2afaef6d251 100644
--- a/tde-i18n-cy/messages/tdebase/kcmkonqhtml.po
+++ b/tde-i18n-cy/messages/tdebase/kcmkonqhtml.po
@@ -564,8 +564,8 @@ msgid "&Use security manager"
 msgstr "Defn&yddio rheolydd diogelwch"
 
 #: javaopts.cpp:89
-msgid "Use &KIO"
-msgstr "Defnyddio &KIO"
+msgid "Use &TDEIO"
+msgstr "Defnyddio &TDEIO"
 
 #: javaopts.cpp:93
 msgid "Shu&tdown applet server when inactive"
@@ -660,9 +660,9 @@ msgstr ""
 "ganiatadau i gôd a lawrlwythwyd o safleoedd penodol."
 
 #: javaopts.cpp:161
-msgid "Enabling this will cause the jvm to use KIO for network transport "
+msgid "Enabling this will cause the jvm to use TDEIO for network transport "
 msgstr ""
-"Bydd galluogi hwn yn achosi i'r jvm ddefnyddio KIO am gludiant rhwydwaith."
+"Bydd galluogi hwn yn achosi i'r jvm ddefnyddio TDEIO am gludiant rhwydwaith."
 
 #: javaopts.cpp:163
 msgid ""
diff --git a/tde-i18n-cy/messages/tdebase/kcmkurifilt.po b/tde-i18n-cy/messages/tdebase/kcmkurifilt.po
index 3a69dfcc557..cbe63d4e95f 100644
--- a/tde-i18n-cy/messages/tdebase/kcmkurifilt.po
+++ b/tde-i18n-cy/messages/tdebase/kcmkurifilt.po
@@ -318,19 +318,19 @@ msgstr ""
 msgid "Keep It"
 msgstr "Ei Gadw"
 
-#: plugins/shorturi/kshorturifilter.cpp:277
+#: plugins/shorturi/tdeshorturifilter.cpp:277
 msgid "<qt><b>%1</b> does not have a home folder.</qt>"
 msgstr "<qt>Nid oes gan <b>%1</b> blygell cartref.</qt>"
 
-#: plugins/shorturi/kshorturifilter.cpp:278
+#: plugins/shorturi/tdeshorturifilter.cpp:278
 msgid "<qt>There is no user called <b>%1</b>.</qt>"
 msgstr "<qt>Nid oes defnyddiwr o'r enw <b>%1</b>.</qt>"
 
-#: plugins/shorturi/kshorturifilter.cpp:504
+#: plugins/shorturi/tdeshorturifilter.cpp:504
 msgid "<qt>The file or folder <b>%1</b> does not exist."
 msgstr "<qt>Nid yw'r ffeil neu'r blygell<b>%1</b> yn bodoli."
 
-#: plugins/shorturi/kshorturifilter.cpp:521
+#: plugins/shorturi/tdeshorturifilter.cpp:521
 msgid "&ShortURLs"
 msgstr "URLau&Byr"
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmtdednssd.po b/tde-i18n-cy/messages/tdebase/kcmtdednssd.po
index ed206448469..24435f76849 100644
--- a/tde-i18n-cy/messages/tdebase/kcmtdednssd.po
+++ b/tde-i18n-cy/messages/tdebase/kcmtdednssd.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: kcmdnssd.cpp:53
-msgid "kcm_kdnssd"
+msgid "kcm_tdednssd"
 msgstr ""
 
 #: kcmdnssd.cpp:54
diff --git a/tde-i18n-cy/messages/tdebase/kcmkio.po b/tde-i18n-cy/messages/tdebase/kcmtdeio.po
index afbd5a482e9..ae72c05e02c 100644
--- a/tde-i18n-cy/messages/tdebase/kcmkio.po
+++ b/tde-i18n-cy/messages/tdebase/kcmtdeio.po
@@ -1988,13 +1988,13 @@ msgstr "Dileu'r testun dynodiad dewisiedig."
 msgid "Delete all identifiers."
 msgstr "Dileu pob dynodiad."
 
-#. i18n: file kio_ftprc.kcfg line 10
+#. i18n: file tdeio_ftprc.kcfg line 10
 #: rc.cpp:692
 #, no-c-format
 msgid "Disable Passive FTP"
 msgstr ""
 
-#. i18n: file kio_ftprc.kcfg line 11
+#. i18n: file tdeio_ftprc.kcfg line 11
 #: rc.cpp:695
 #, no-c-format
 msgid ""
@@ -2003,13 +2003,13 @@ msgid ""
 "may not support Passive FTP though."
 msgstr ""
 
-#. i18n: file kio_ftprc.kcfg line 16
+#. i18n: file tdeio_ftprc.kcfg line 16
 #: rc.cpp:698
 #, no-c-format
 msgid "Mark partially uploaded files"
 msgstr "Nodi ffeiliau a lwythwyd i fyny'n rhannol"
 
-#. i18n: file kio_ftprc.kcfg line 17
+#. i18n: file tdeio_ftprc.kcfg line 17
 #: rc.cpp:701
 #, no-c-format
 msgid ""
@@ -2177,8 +2177,8 @@ msgstr ""
 #~ msgid "<h1>SOCKS</h1><p>This module allows you to configure TDE support for a SOCKS server or proxy.</p><p>SOCKS is a protocol to traverse firewalls as described in <a href=\"http://rfc.net/rfc1928.html\">RFC 1928</a>. <p>If you have no idea what this is and if your system administrator doesn't tell you to use it, leave it disabled.</p>"
 #~ msgstr "<h1>SOCKS</h1><p>Galluoga'r modwl yma i chi ffurfweddu cynhaliaeth TDE am weinydd neu ddirprwy SOCKS.</p><p>Protocol yw SOCKS i groes muriau cadarn, disgrifir yn <a href=\"http://rfc.net/rfc1928.html\">RFC 1928</a>. <p>Os nad oes gennych syniad beth yw hwn ac os nad yw'ch rheolwr cysawd wedi dweud wrthych am ei ddefnyddio, gadewch yn analluog.</p>"
 
-#~ msgid "Note: kio_smb is a SMB client only. The server, if any, cannot be configured from here."
-#~ msgstr "Noder: Dibynnydd SMB yn unig yw kio_smb. Ni ellir ffurfweddu'r gweinydd yma, os oes un yn bod."
+#~ msgid "Note: tdeio_smb is a SMB client only. The server, if any, cannot be configured from here."
+#~ msgstr "Noder: Dibynnydd SMB yn unig yw tdeio_smb. Ni ellir ffurfweddu'r gweinydd yma, os oes un yn bod."
 
 #~ msgid "Network Settings"
 #~ msgstr "Gosodiadau Rhwydwaith"
diff --git a/tde-i18n-cy/messages/tdebase/kdebugdialog.po b/tde-i18n-cy/messages/tdebase/kdebugdialog.po
index 72967024602..ad571d7185a 100644
--- a/tde-i18n-cy/messages/tdebase/kdebugdialog.po
+++ b/tde-i18n-cy/messages/tdebase/kdebugdialog.po
@@ -28,7 +28,7 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: kdebugdialog.cpp:46 klistdebugdialog.cpp:37
+#: kdebugdialog.cpp:46 tdelistdebugdialog.cpp:37
 msgid "Debug Settings"
 msgstr "Gosodiadau Dad-namu"
 
@@ -70,11 +70,11 @@ msgstr "Gwall Angheuol"
 msgid "Abort on fatal errors"
 msgstr "Terfynu ar ôl gwall angheuol"
 
-#: klistdebugdialog.cpp:56
+#: tdelistdebugdialog.cpp:56
 msgid "&Select All"
 msgstr "&Dewis Popeth"
 
-#: klistdebugdialog.cpp:57
+#: tdelistdebugdialog.cpp:57
 msgid "&Deselect All"
 msgstr "Da&tddewis Popeth"
 
diff --git a/tde-i18n-cy/messages/tdebase/konqueror.po b/tde-i18n-cy/messages/tdebase/konqueror.po
index 9998b21766e..a6e4f569308 100644
--- a/tde-i18n-cy/messages/tdebase/konqueror.po
+++ b/tde-i18n-cy/messages/tdebase/konqueror.po
@@ -2931,7 +2931,7 @@ msgstr ""
 #~ msgstr "diwrnod"
 
 #~ msgid ""
-#~ "_: 'URLs expire after XX days.' Unfortunately the plural handling of KLocale does not work here, as I only need the word 'days' and not the entire sentence here. Sorry.\n"
+#~ "_: 'URLs expire after XX days.' Unfortunately the plural handling of TDELocale does not work here, as I only need the word 'days' and not the entire sentence here. Sorry.\n"
 #~ " days"
 #~ msgstr "o ddiwrnodau"
 
diff --git a/tde-i18n-cy/messages/tdebase/ktip.po b/tde-i18n-cy/messages/tdebase/ktip.po
index 09e415bb14d..40138dc0bf6 100644
--- a/tde-i18n-cy/messages/tdebase/ktip.po
+++ b/tde-i18n-cy/messages/tdebase/ktip.po
@@ -51,7 +51,7 @@ msgid ""
 "also useful sites for major applications like\n"
 "<A HREF=\"http://www.konqueror.org/\">Konqueror</A>,\n"
 "<A HREF=\"http://www.koffice.org/\">KOffice</A> and\n"
-"<A HREF=\"http://www.tdevelop.org/\">KDevelop</A>, or important\n"
+"<A HREF=\"http://www.kdevelop.org/\">KDevelop</A>, or important\n"
 "TDE utilities like\n"
 "<A HREF=\"http://printing.kde.org/\">TDEPrint</A>,\n"
 "which can be put to its full usage even outside TDE...\n"
@@ -67,7 +67,7 @@ msgstr ""
 " gwefannau gwerth eu gweld hefyd am gynhwysiadau bennaf tebyg i\n"
 " <A HREF=\"http://www.konqueror.org/\">Konqueror</A>, \n"
 " <A HREF=\"http://www.koffice.org/\">KSwyddfa</A> ac\n"
-" <A HREF=\"http://www.tdevelop.org/\">KDatblgyu</A>, neu defnyddioldebau pwysig "
+" <A HREF=\"http://www.kdevelop.org/\">KDatblgyu</A>, neu defnyddioldebau pwysig "
 "TDE fel\n"
 " <A HREF=\"http://printing.kde.org/\">TDEArgraffu</A>,\n"
 " a ellir ei ddefnyddio hyd yn oed tu allan o TDE...\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdefontinst.po b/tde-i18n-cy/messages/tdebase/tdefontinst.po
index f0f5fdcb498..934f783f17d 100644
--- a/tde-i18n-cy/messages/tdebase/tdefontinst.po
+++ b/tde-i18n-cy/messages/tdebase/tdefontinst.po
@@ -1,12 +1,12 @@
-# Cyfieithiad o kfontinst.po i Cymraeg
-# Translation of kfontinst.po to Cymraeg
+# Cyfieithiad o tdefontinst.po i Cymraeg
+# Translation of tdefontinst.po to Cymraeg
 # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # KD at Kyfieithu <kyfieithu@dotmon.com>, 2003, 2004.
 # Kevin Donnelly <kevin@dotmon.com>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfontinst\n"
+"Project-Id-Version: tdefontinst\n"
 "POT-Creation-Date: 2008-06-16 02:37+0200\n"
 "PO-Revision-Date: 2005-01-27 20:19+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
@@ -307,50 +307,50 @@ msgstr "Diweddaru"
 msgid "Do Not Update"
 msgstr ""
 
-#: kfile-plugin/KFileFont.cpp:287
+#: tdefile-plugin/KFileFont.cpp:287
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile-plugin/KFileFont.cpp:289
+#: tdefile-plugin/KFileFont.cpp:289
 msgid "Full Name"
 msgstr "Enw Llawn"
 
-#: kfile-plugin/KFileFont.cpp:290
+#: tdefile-plugin/KFileFont.cpp:290
 msgid "Family"
 msgstr "Teulu"
 
-#: kfile-plugin/KFileFont.cpp:291
+#: tdefile-plugin/KFileFont.cpp:291
 msgid "Foundry"
 msgstr "Ffowndri"
 
-#: kfile-plugin/KFileFont.cpp:292
+#: tdefile-plugin/KFileFont.cpp:292
 msgid "Weight"
 msgstr "Pwys"
 
-#: kfile-plugin/KFileFont.cpp:297
+#: tdefile-plugin/KFileFont.cpp:297
 msgid "Slant"
 msgstr "Goleddf"
 
-#: kio/KioFonts.cpp:905 kio/KioFonts.cpp:2371
+#: tdeio/KioFonts.cpp:905 tdeio/KioFonts.cpp:2371
 msgid "Please specify \"%1\" or \"%2\"."
 msgstr "Penodwch \"%1\" neu \"%2\"."
 
-#: kio/KioFonts.cpp:1101 kio/KioFonts.cpp:1153 kio/KioFonts.cpp:1168
-#: kio/KioFonts.cpp:1393 kio/KioFonts.cpp:1598 kio/KioFonts.cpp:1659
+#: tdeio/KioFonts.cpp:1101 tdeio/KioFonts.cpp:1153 tdeio/KioFonts.cpp:1168
+#: tdeio/KioFonts.cpp:1393 tdeio/KioFonts.cpp:1598 tdeio/KioFonts.cpp:1659
 msgid "Could not access \"%1\" folder."
 msgstr "Methu cyrchu'r blygell \"%1\"."
 
-#: kio/KioFonts.cpp:1515
+#: tdeio/KioFonts.cpp:1515
 msgid "Sorry, fonts cannot be renamed."
 msgstr "Ni ellir ail-enwi wynebfathau."
 
-#: kio/KioFonts.cpp:1920
+#: tdeio/KioFonts.cpp:1920
 msgid ""
 "Incorrect password.\n"
 msgstr ""
 "Cyfrinair anghywir.\n"
 
-#: kio/KioFonts.cpp:1963
+#: tdeio/KioFonts.cpp:1963
 msgid ""
 "Do you wish to install the font into \"%1\" (in which case the font will only "
 "be usable by you), or \"%2\" (the font will be usable by all users - but you "
@@ -360,26 +360,26 @@ msgstr ""
 "wynebfath ei ddefnyddio gennych chi yn unig), neu \"%2\" (gellir yr wynebfath "
 "ei ddefnyddio gan bawb - ond bydd angen i chi wybod cyfrinair y gweinyddwr)?"
 
-#: kio/KioFonts.cpp:1968
+#: tdeio/KioFonts.cpp:1968
 msgid "Where to Install"
 msgstr "Lle i Arsefydlu"
 
-#: kio/KioFonts.cpp:2067
+#: tdeio/KioFonts.cpp:2067
 msgid "Internal fontconfig error."
 msgstr "Gwall mewnol fontconfig."
 
-#: kio/KioFonts.cpp:2102
+#: tdeio/KioFonts.cpp:2102
 msgid "Could not access \"%1\"."
 msgstr "Methu cyrchu \"%1\"."
 
-#: kio/KioFonts.cpp:2146
+#: tdeio/KioFonts.cpp:2146
 msgid ""
 "<p>Only fonts may be installed.</p>"
 "<p>If installing a fonts package (*%1), then extract the components, and "
 "install individually.</p>"
 msgstr ""
 
-#: kio/KioFonts.cpp:2309
+#: tdeio/KioFonts.cpp:2309
 msgid ""
 "<p>This font is located in a file alongside other fonts; in order to proceed "
 "with the moving they will all have to be moved. The other affected fonts "
@@ -395,7 +395,7 @@ msgstr ""
 "<p>\n"
 "Ydychy eisiau eu symud nhw i gyd?</p>"
 
-#: kio/KioFonts.cpp:2314
+#: tdeio/KioFonts.cpp:2314
 msgid ""
 "<p>This font is located in a file alongside other fonts; in order to proceed "
 "with the copying they will all have to be copied. The other affected fonts "
@@ -411,7 +411,7 @@ msgstr ""
 "<p>\n"
 "Ydychy eisiau eu copïo nhw i gyd?</p>"
 
-#: kio/KioFonts.cpp:2318
+#: tdeio/KioFonts.cpp:2318
 msgid ""
 "<p>This font is located in a file alongside other fonts; in order to proceed "
 "with the deleting they will all have to be deleted. The other affected fonts "
@@ -427,7 +427,7 @@ msgstr ""
 "<p>\n"
 "Ydychy eisiau eu dileu nhw i gyd?</p>"
 
-#: kio/KioFonts.cpp:2391
+#: tdeio/KioFonts.cpp:2391
 msgid ""
 "Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\"."
 msgstr "Ni allwch ail-enwi, symud, copïo, neu ddileu unai \"%1\" neu \"%2\"."
diff --git a/tde-i18n-cy/messages/tdebase/tdehtmlkttsd.po b/tde-i18n-cy/messages/tdebase/tdehtmlkttsd.po
index f3d293b43fe..3d70661cb82 100644
--- a/tde-i18n-cy/messages/tdebase/tdehtmlkttsd.po
+++ b/tde-i18n-cy/messages/tdebase/tdehtmlkttsd.po
@@ -9,36 +9,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: khtmlkttsd.cpp:43
+#: tdehtmlkttsd.cpp:43
 msgid "&Speak Text"
 msgstr ""
 
-#: khtmlkttsd.cpp:60
+#: tdehtmlkttsd.cpp:60
 msgid "Cannot Read source"
 msgstr ""
 
-#: khtmlkttsd.cpp:61
+#: tdehtmlkttsd.cpp:61
 msgid ""
 "You cannot read anything except web pages with\n"
 "this plugin, sorry."
 msgstr ""
 
-#: khtmlkttsd.cpp:71
+#: tdehtmlkttsd.cpp:71
 msgid "Starting KTTSD Failed"
 msgstr ""
 
-#: khtmlkttsd.cpp:86 khtmlkttsd.cpp:125 khtmlkttsd.cpp:131
+#: tdehtmlkttsd.cpp:86 tdehtmlkttsd.cpp:125 tdehtmlkttsd.cpp:131
 msgid "DCOP Call Failed"
 msgstr "Methodd yr alwad DCOP"
 
-#: khtmlkttsd.cpp:87
+#: tdehtmlkttsd.cpp:87
 msgid "The DCOP call supportsMarkup failed."
 msgstr ""
 
-#: khtmlkttsd.cpp:126
+#: tdehtmlkttsd.cpp:126
 msgid "The DCOP call setText failed."
 msgstr ""
 
-#: khtmlkttsd.cpp:132
+#: tdehtmlkttsd.cpp:132
 msgid "The DCOP call startText failed."
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_finger.po b/tde-i18n-cy/messages/tdebase/tdeio_finger.po
index 7664ab07689..401f04cea26 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_finger.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_finger.po
@@ -1,10 +1,10 @@
-# translation of kio_finger.po to Cymraeg
+# translation of tdeio_finger.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_finger\n"
+"Project-Id-Version: tdeio_finger\n"
 "POT-Creation-Date: 2005-05-18 21:24+0200\n"
 "PO-Revision-Date: 2003-07-21 16:55+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -14,20 +14,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: kio_finger.cpp:180
+#: tdeio_finger.cpp:180
 msgid "Could not find the Perl program on your system, please install."
 msgstr ""
 "Methwyd canfod y rhaglen Perl ar eich cysawd, gosodwch os gwelwch yn dda."
 
-#: kio_finger.cpp:193
+#: tdeio_finger.cpp:193
 msgid "Could not find the Finger program on your system, please install."
 msgstr ""
 "Methwyd canfod y rhaglen Finger ar eich cysawd, gosodwch os gwelwch yn dda."
 
-#: kio_finger.cpp:206
-msgid "kio_finger Perl script not found."
-msgstr "Ni ganfuwyd y sgript Perl kio_finger."
+#: tdeio_finger.cpp:206
+msgid "tdeio_finger Perl script not found."
+msgstr "Ni ganfuwyd y sgript Perl tdeio_finger."
 
-#: kio_finger.cpp:218
-msgid "kio_finger CSS script not found. Output will look ugly."
-msgstr "Ni ganfuwyd y sgript CSS kio_finger. Bydd yr allbwn yn hyll."
+#: tdeio_finger.cpp:218
+msgid "tdeio_finger CSS script not found. Output will look ugly."
+msgstr "Ni ganfuwyd y sgript CSS tdeio_finger. Bydd yr allbwn yn hyll."
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_fish.po b/tde-i18n-cy/messages/tdebase/tdeio_fish.po
index 175f502721b..566ab7c41e7 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_fish.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_fish.po
@@ -1,10 +1,10 @@
-# translation of kio_fish.po to Cymraeg
+# translation of tdeio_fish.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_fish\n"
+"Project-Id-Version: tdeio_fish\n"
 "POT-Creation-Date: 2006-11-05 02:34+0100\n"
 "PO-Revision-Date: 2003-07-21 16:56+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_floppy.po b/tde-i18n-cy/messages/tdebase/tdeio_floppy.po
index 046563b836b..8e08f1a7149 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_floppy.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_floppy.po
@@ -1,11 +1,11 @@
-# translation of kio_floppy.po to Cymraeg
+# translation of tdeio_floppy.po to Cymraeg
 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003.
 # Kevin Donnelly <kevin@dotmon.com>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_floppy\n"
+"Project-Id-Version: tdeio_floppy\n"
 "POT-Creation-Date: 2005-09-21 02:57+0200\n"
 "PO-Revision-Date: 2005-09-03 17:09+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: kio_floppy.cpp:200
+#: tdeio_floppy.cpp:200
 msgid ""
 "Could not access drive %1.\n"
 "The drive is still busy.\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Mae'r gyrriant dal yn brysur.\n"
 "Arhoswch nes ei fod yn anweithredol a ceisiwch eto."
 
-#: kio_floppy.cpp:204 kio_floppy.cpp:1144
+#: tdeio_floppy.cpp:204 tdeio_floppy.cpp:1144
 msgid ""
 "Could not write to file %1.\n"
 "The disk in drive %2 is probably full."
@@ -33,7 +33,7 @@ msgstr ""
 "Methu ysgrifennu i ffeil %1.\n"
 "Mwy na thebyg mae'r ddisg yng ngyrriant %2 yn llawn."
 
-#: kio_floppy.cpp:214
+#: tdeio_floppy.cpp:214
 msgid ""
 "Could not access %1.\n"
 "There is probably no disk in the drive %2"
@@ -41,7 +41,7 @@ msgstr ""
 "Methu cyrchu %1.\n"
 "Mwy na thebyg nid oes disg yng ngyrriant %2"
 
-#: kio_floppy.cpp:218
+#: tdeio_floppy.cpp:218
 msgid ""
 "Could not access %1.\n"
 "There is probably no disk in the drive %2 or you do not have enough permissions "
@@ -51,7 +51,7 @@ msgstr ""
 "Mwy na thebyg nid oes disg yng ngyrriant %2, neu nid oes gennych ddigon o "
 "ganiatadau i gyrchu'r gyrriant."
 
-#: kio_floppy.cpp:222
+#: tdeio_floppy.cpp:222
 msgid ""
 "Could not access %1.\n"
 "The drive %2 is not supported."
@@ -59,7 +59,7 @@ msgstr ""
 "Methu cyrchu %1.\n"
 "Ni chynhelir y gyrriant %2."
 
-#: kio_floppy.cpp:227
+#: tdeio_floppy.cpp:227
 msgid ""
 "Could not access %1.\n"
 "Make sure the floppy in drive %2 is a DOS-formatted floppy disk \n"
@@ -72,7 +72,7 @@ msgstr ""
 "a bod caniatadau'r ffeil ddyfais (e.e. /dev/fd0) wedi'u gosod yn gywir (e.e. "
 "rwxrwxrwx)."
 
-#: kio_floppy.cpp:231
+#: tdeio_floppy.cpp:231
 msgid ""
 "Could not access %1.\n"
 "The disk in drive %2 is probably not a DOS-formatted floppy disk."
@@ -80,7 +80,7 @@ msgstr ""
 "Methu cyrchu %1.\n"
 "Mwy na thebyg nad disg llipa â ffurfweddiad DOS yw'r ddisg yng ngyrriant %2."
 
-#: kio_floppy.cpp:235
+#: tdeio_floppy.cpp:235
 msgid ""
 "Access denied.\n"
 "Could not write to %1.\n"
@@ -90,7 +90,7 @@ msgstr ""
 "Methu ysgrifennu i %1.\n"
 "Mwy na thebyg mae'r ddisg yng ngyrriant %2 wedi'i diogelu rhag ysgrifennu."
 
-#: kio_floppy.cpp:244
+#: tdeio_floppy.cpp:244
 msgid ""
 "Could not read boot sector for %1.\n"
 "There is probably not any disk in drive %2."
@@ -98,7 +98,7 @@ msgstr ""
 "Methu darllen yr adran ymgychwyn ar gyfer %1.\n"
 "Mwy na thebyg nid oes disg yng ngyrriant %2."
 
-#: kio_floppy.cpp:368
+#: tdeio_floppy.cpp:368
 msgid ""
 "Could not start program \"%1\".\n"
 "Ensure that the mtools package is installed correctly on your system."
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_home.po b/tde-i18n-cy/messages/tdebase/tdeio_home.po
index 62162597eeb..4d8de4b4070 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_home.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_home.po
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kio_home.cpp:34
+#: tdeio_home.cpp:34
 msgid "Protocol name"
 msgstr "Enw protocol"
 
-#: kio_home.cpp:35 kio_home.cpp:36
+#: tdeio_home.cpp:35 tdeio_home.cpp:36
 msgid "Socket name"
 msgstr "Enw soced"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_ldap.po b/tde-i18n-cy/messages/tdebase/tdeio_ldap.po
index 5c91665d55a..85c5b321ff7 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_ldap.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_ldap.po
@@ -1,8 +1,8 @@
-# translation of kio_ldap.po to Cymraeg
+# translation of tdeio_ldap.po to Cymraeg
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_ldap\n"
+"Project-Id-Version: tdeio_ldap\n"
 "POT-Creation-Date: 2007-11-01 01:14+0100\n"
 "PO-Revision-Date: 2004-07-04 12:02+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -12,53 +12,53 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kio_ldap.cpp:86
+#: tdeio_ldap.cpp:86
 msgid ""
 "\n"
 "Additional info: "
 msgstr ""
 
-#: kio_ldap.cpp:159
+#: tdeio_ldap.cpp:159
 #, fuzzy
 msgid ""
 "LDAP server returned the error: %1 %2\n"
 "The LDAP URL was: %3"
 msgstr "Dychwelodd y gweinydd LDAP y gwall dilynnol: %1"
 
-#: kio_ldap.cpp:521
+#: tdeio_ldap.cpp:521
 msgid "LDAP Login"
 msgstr "Mewngofnodi LDAP"
 
-#: kio_ldap.cpp:524
+#: tdeio_ldap.cpp:524
 msgid "site:"
 msgstr "safle:"
 
-#: kio_ldap.cpp:551 kio_ldap.cpp:686
+#: tdeio_ldap.cpp:551 tdeio_ldap.cpp:686
 msgid "Invalid authorization information."
 msgstr "Gwybodaeth ddilysiant annilys."
 
-#: kio_ldap.cpp:629
+#: tdeio_ldap.cpp:629
 #, c-format
 msgid "Cannot set LDAP protocol version %1"
 msgstr "Methu gosod protocol LDAP fersiwn %1"
 
-#: kio_ldap.cpp:646
+#: tdeio_ldap.cpp:646
 msgid "Cannot set size limit."
 msgstr "Methu gosod cyfwng maint"
 
-#: kio_ldap.cpp:656
+#: tdeio_ldap.cpp:656
 msgid "Cannot set time limit."
 msgstr "Methu gosod cyfwng amser"
 
-#: kio_ldap.cpp:665
+#: tdeio_ldap.cpp:665
 msgid "SASL authentication not compiled into the ldap ioslave."
 msgstr "Ni chrynhowyd dilysiant SASL i mewn i'r ioslave ldap."
 
-#: kio_ldap.cpp:942 kio_ldap.cpp:1023
+#: tdeio_ldap.cpp:942 tdeio_ldap.cpp:1023
 msgid "The LDIF parser failed."
 msgstr "Methodd y dadansoddydd LDIF."
 
-#: kio_ldap.cpp:1033
+#: tdeio_ldap.cpp:1033
 #, c-format
 msgid "Invalid LDIF file in line %1."
 msgstr "Ffeil LDIF annilys yn llinell %1."
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_mac.po b/tde-i18n-cy/messages/tdebase/tdeio_mac.po
index d2db8673faf..3442f29e967 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_mac.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_mac.po
@@ -1,10 +1,10 @@
-# translation of kio_mac.po to Cymraeg
+# translation of tdeio_mac.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_mac\n"
+"Project-Id-Version: tdeio_mac\n"
 "POT-Creation-Date: 2005-09-21 02:57+0200\n"
 "PO-Revision-Date: 2003-07-21 17:13+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -14,38 +14,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: kio_mac.cpp:94
+#: tdeio_mac.cpp:94
 msgid "Unknown mode"
 msgstr "Modd anhysbys"
 
-#: kio_mac.cpp:115
+#: tdeio_mac.cpp:115
 msgid "There was an error with hpcopy - please ensure it is installed"
 msgstr ""
 "Roedd gwall gyda hpcopy - gwiriwch ei fod wedi'i osod os gwelwch yn dda"
 
-#: kio_mac.cpp:131
+#: tdeio_mac.cpp:131
 #, fuzzy
 msgid "No filename was found"
 msgstr "Ni ganfuwyd enw ffeil"
 
-#: kio_mac.cpp:144
+#: tdeio_mac.cpp:144
 #, fuzzy
 msgid "There was an error with hpls - please ensure it is installed"
 msgstr "Roedd gwall gyda hpls - gwiriwch ei fod wedi'i osod os gwelwch yn dda"
 
-#: kio_mac.cpp:187
+#: tdeio_mac.cpp:187
 #, fuzzy
 msgid "No filename was found in the URL"
 msgstr "Ni ganfuwyd enw ffeil yn yr URL"
 
-#: kio_mac.cpp:201
+#: tdeio_mac.cpp:201
 #, fuzzy
 msgid ""
 "hpls did not exit normally - please ensure you have installed the hfsplus tools"
 msgstr ""
 "ni derfynodd hpls yn arferol - gwiriwch eich bod wedi gosod yr erfynnau hfsplus"
 
-#: kio_mac.cpp:288
+#: tdeio_mac.cpp:288
 msgid ""
 "hpmount did not exit normally - please ensure that hfsplus utils are "
 "installed,\n"
@@ -59,18 +59,18 @@ msgstr ""
 "a'ch bod wedi penodi'r rhaniad cywir.\n"
 "Gallwch benodi rhaniadau drwy ychwanegu ?dev=/dev/hda2 i'r URL."
 
-#: kio_mac.cpp:320
+#: tdeio_mac.cpp:320
 msgid "hpcd did not exit normally - please ensure it is installed"
 msgstr "ni derfynodd hpcd yn arferol - gwiriwch ei fod wedi'i osod"
 
-#: kio_mac.cpp:407
+#: tdeio_mac.cpp:407
 msgid "hpls output was not matched"
 msgstr ""
 
-#: kio_mac.cpp:450
+#: tdeio_mac.cpp:450
 msgid "Month output from hpls -l not matched"
 msgstr ""
 
-#: kio_mac.cpp:479
+#: tdeio_mac.cpp:479
 msgid "Could not parse a valid date from hpls"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_man.po b/tde-i18n-cy/messages/tdebase/tdeio_man.po
index ed0bed9c15f..851ce409720 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_man.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_man.po
@@ -1,10 +1,10 @@
-# translation of kio_man.po to Cymraeg
+# translation of tdeio_man.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_man\n"
+"Project-Id-Version: tdeio_man\n"
 "POT-Creation-Date: 2007-05-29 02:15+0200\n"
 "PO-Revision-Date: 2003-07-22 14:28+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -26,7 +26,7 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: kio_man.cpp:465
+#: tdeio_man.cpp:465
 msgid ""
 "No man page matching to %1 found."
 "<br>"
@@ -37,96 +37,96 @@ msgid ""
 "file in the directory /etc ."
 msgstr ""
 
-#: kio_man.cpp:496
+#: tdeio_man.cpp:496
 msgid "Open of %1 failed."
 msgstr "Methodd agor %1."
 
-#: kio_man.cpp:600 kio_man.cpp:618
+#: tdeio_man.cpp:600 tdeio_man.cpp:618
 msgid "Man output"
 msgstr "Allbwn llawlyfr"
 
-#: kio_man.cpp:604
+#: tdeio_man.cpp:604
 #, fuzzy
 msgid "<body><h1>TDE Man Viewer Error</h1>"
 msgstr "<body bgcolor=#ffffff><h1>Gwall Gwelydd Llawlyfr TDE</h1>"
 
-#: kio_man.cpp:622
+#: tdeio_man.cpp:622
 msgid "There is more than one matching man page."
 msgstr "Mae mwy nag un dudalen llawlyfr yn cydweddu."
 
-#: kio_man.cpp:633
+#: tdeio_man.cpp:633
 msgid ""
 "Note: if you read a man page in your language, be aware it can contain some "
 "mistakes or be obsolete. In case of doubt, you should have a look at the "
 "English version."
 msgstr ""
 
-#: kio_man.cpp:723
+#: tdeio_man.cpp:723
 msgid "User Commands"
 msgstr "Gorchmynion Defnyddiwr"
 
-#: kio_man.cpp:725
+#: tdeio_man.cpp:725
 msgid "System Calls"
 msgstr "Galwadau Cysawd"
 
-#: kio_man.cpp:727
+#: tdeio_man.cpp:727
 msgid "Subroutines"
 msgstr "Is-reolweithiau"
 
-#: kio_man.cpp:729
+#: tdeio_man.cpp:729
 msgid "Perl Modules"
 msgstr "Modylau Perl"
 
-#: kio_man.cpp:731
+#: tdeio_man.cpp:731
 msgid "Network Functions"
 msgstr "Ffwythiannau Rhwydwaith"
 
-#: kio_man.cpp:733
+#: tdeio_man.cpp:733
 msgid "Devices"
 msgstr "Dyfeisiau"
 
-#: kio_man.cpp:735
+#: tdeio_man.cpp:735
 msgid "File Formats"
 msgstr "Fformadau Ffeil"
 
-#: kio_man.cpp:737
+#: tdeio_man.cpp:737
 msgid "Games"
 msgstr "Gêmau"
 
-#: kio_man.cpp:741
+#: tdeio_man.cpp:741
 msgid "System Administration"
 msgstr "Gweinyddiaeth Cysawd"
 
-#: kio_man.cpp:743
+#: tdeio_man.cpp:743
 msgid "Kernel"
 msgstr "Cnewyllyn"
 
-#: kio_man.cpp:745
+#: tdeio_man.cpp:745
 msgid "Local Documentation"
 msgstr "Dogfennaeth Lleol"
 
-#: kio_man.cpp:747
+#: tdeio_man.cpp:747
 msgid "New"
 msgstr "Newydd"
 
-#: kio_man.cpp:782 kio_man.cpp:786 kio_man.cpp:1209
+#: tdeio_man.cpp:782 tdeio_man.cpp:786 tdeio_man.cpp:1209
 msgid "UNIX Manual Index"
 msgstr "Mynegai Llawlyfr UNIX"
 
-#: kio_man.cpp:801
+#: tdeio_man.cpp:801
 msgid "Section "
 msgstr "Adran "
 
-#: kio_man.cpp:1214
+#: tdeio_man.cpp:1214
 #, fuzzy
 msgid "Index for Section %1: %2"
 msgstr "<body bgcolor=#ffffff><h1>Mynegai Adran %1: %2</h1>"
 
-#: kio_man.cpp:1219
+#: tdeio_man.cpp:1219
 msgid "Generating Index"
 msgstr "Yn Creu Mynegai"
 
-#: kio_man.cpp:1529
+#: tdeio_man.cpp:1529
 msgid ""
 "Could not find the sgml2roff program on your system. Please install it, if "
 "necessary, and extend the search path by adjusting the environment variable "
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_media.po b/tde-i18n-cy/messages/tdebase/tdeio_media.po
index 21760c549c6..03a339283ea 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_media.po
@@ -1,11 +1,11 @@
-# translation of kio_devices.po to Cymraeg
+# translation of tdeio_devices.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_devices\n"
+"Project-Id-Version: tdeio_devices\n"
 "POT-Creation-Date: 2008-07-08 01:18+0200\n"
 "PO-Revision-Date: 2003-12-28 11:06+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -27,17 +27,17 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: kio_media.cpp:35
+#: tdeio_media.cpp:35
 msgid "Protocol name"
 msgstr "Enw protocol"
 
-#: kio_media.cpp:36 kio_media.cpp:37
+#: tdeio_media.cpp:36 tdeio_media.cpp:37
 msgid "Socket name"
 msgstr "Enw soced"
 
 #: mediaimpl.cpp:86 mediaimpl.cpp:113 mediaimpl.cpp:139 mediaimpl.cpp:173
 #: mediaimpl.cpp:193 mediaimpl.cpp:214
-#: mounthelper/kio_media_mounthelper.cpp:45
+#: mounthelper/tdeio_media_mounthelper.cpp:45
 msgid "The TDE mediamanager is not running."
 msgstr ""
 
@@ -51,7 +51,7 @@ msgstr ""
 
 #: mediaimpl.cpp:259 mediamanager/halbackend.cpp:972
 #: mediamanager/halbackend.cpp:981 mediamanager/halbackend.cpp:1285
-#: mediamanager/halbackend.cpp:1296 mounthelper/kio_media_mounthelper.cpp:53
+#: mediamanager/halbackend.cpp:1296 mounthelper/tdeio_media_mounthelper.cpp:53
 msgid "Internal Error"
 msgstr "Gwall Mewnol"
 
@@ -292,45 +292,45 @@ msgstr "Cymysg"
 msgid "Filesystem: iso9660"
 msgstr ""
 
-#: kfile-plugin/kfilemediaplugin.cpp:173
+#: tdefile-plugin/tdefilemediaplugin.cpp:173
 #, fuzzy
 msgid "Medium Information"
 msgstr "Gwybodaeth am y Ddyfais"
 
-#: kfile-plugin/kfilemediaplugin.cpp:176
+#: tdefile-plugin/tdefilemediaplugin.cpp:176
 msgid "Free"
 msgstr "Rhydd"
 
-#: kfile-plugin/kfilemediaplugin.cpp:179
+#: tdefile-plugin/tdefilemediaplugin.cpp:179
 msgid "Used"
 msgstr "Defnyddiwyd"
 
-#: kfile-plugin/kfilemediaplugin.cpp:182
+#: tdefile-plugin/tdefilemediaplugin.cpp:182
 msgid "Total"
 msgstr "Cyfanswm"
 
-#: kfile-plugin/kfilemediaplugin.cpp:185
+#: tdefile-plugin/tdefilemediaplugin.cpp:185
 msgid "Base URL"
 msgstr "URL Sylfaenol"
 
-#: kfile-plugin/kfilemediaplugin.cpp:186
+#: tdefile-plugin/tdefilemediaplugin.cpp:186
 msgid "Mount Point"
 msgstr "Man Clymu"
 
-#: kfile-plugin/kfilemediaplugin.cpp:187
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
 #, fuzzy
 msgid "Device Node"
 msgstr "Dyfeisiau"
 
-#: kfile-plugin/kfilemediaplugin.cpp:189
+#: tdefile-plugin/tdefilemediaplugin.cpp:189
 msgid "Medium Summary"
 msgstr ""
 
-#: kfile-plugin/kfilemediaplugin.cpp:191
+#: tdefile-plugin/tdefilemediaplugin.cpp:191
 msgid "Usage"
 msgstr ""
 
-#: kfile-plugin/kfilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
 msgid "Bar Graph"
 msgstr ""
 
@@ -451,40 +451,40 @@ msgstr ""
 msgid "Feature only available with HAL"
 msgstr ""
 
-#: mounthelper/kio_media_mounthelper.cpp:74
+#: mounthelper/tdeio_media_mounthelper.cpp:74
 msgid "%1 cannot be found."
 msgstr ""
 
-#: mounthelper/kio_media_mounthelper.cpp:81
+#: mounthelper/tdeio_media_mounthelper.cpp:81
 #, fuzzy
 msgid "%1 is not a mountable media."
 msgstr "%1%2 (heb ei osod)"
 
-#: mounthelper/kio_media_mounthelper.cpp:166
+#: mounthelper/tdeio_media_mounthelper.cpp:166
 msgid "The device was successfully unmounted, but the tray could not be opened"
 msgstr ""
 
-#: mounthelper/kio_media_mounthelper.cpp:168
+#: mounthelper/tdeio_media_mounthelper.cpp:168
 msgid "The device was successfully unmounted, but could not be ejected"
 msgstr ""
 
-#: mounthelper/kio_media_mounthelper.cpp:182
+#: mounthelper/tdeio_media_mounthelper.cpp:182
 msgid "Unmount given URL"
 msgstr "Datosod yr URL a roddwyd"
 
-#: mounthelper/kio_media_mounthelper.cpp:183
+#: mounthelper/tdeio_media_mounthelper.cpp:183
 msgid "Mount given URL (default)"
 msgstr "Gosod yr URL a roddwyd (rhagosod)"
 
-#: mounthelper/kio_media_mounthelper.cpp:184
+#: mounthelper/tdeio_media_mounthelper.cpp:184
 msgid "Eject given URL via kdeeject"
 msgstr "Allfwrw'r URL a roddwyd drwy kdeeject"
 
-#: mounthelper/kio_media_mounthelper.cpp:185
+#: mounthelper/tdeio_media_mounthelper.cpp:185
 msgid "Unmount and Eject given URL (necessary for some USB devices)"
 msgstr ""
 
-#: mounthelper/kio_media_mounthelper.cpp:186
+#: mounthelper/tdeio_media_mounthelper.cpp:186
 #, fuzzy
 msgid "media:/ URL to mount/unmount/eject/remove"
 msgstr "dyfeisiau:/ URL i'w osod/ddatosod/allfwrw."
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_nfs.po b/tde-i18n-cy/messages/tdebase/tdeio_nfs.po
index 08f92ac7c8c..241ffa5a479 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_nfs.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_nfs.po
@@ -1,10 +1,10 @@
-# translation of kio_nfs.po to Cymraeg
+# translation of tdeio_nfs.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_nfs\n"
+"Project-Id-Version: tdeio_nfs\n"
 "POT-Creation-Date: 2005-06-10 01:24+0200\n"
 "PO-Revision-Date: 2003-07-22 14:30+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -14,23 +14,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: kio_nfs.cpp:1020
+#: tdeio_nfs.cpp:1020
 msgid "An RPC error occurred."
 msgstr "Digwyddodd gwall RPC."
 
-#: kio_nfs.cpp:1064
+#: tdeio_nfs.cpp:1064
 msgid "No space left on device"
 msgstr "Dim lle ar ôl ar y ddyfais"
 
-#: kio_nfs.cpp:1067
+#: tdeio_nfs.cpp:1067
 msgid "Read only file system"
 msgstr "Cysawd ffeil darllen-yn-unig"
 
-#: kio_nfs.cpp:1070
+#: tdeio_nfs.cpp:1070
 #, fuzzy
 msgid "Filename too long"
 msgstr "Enw ffeil rhy hir"
 
-#: kio_nfs.cpp:1077
+#: tdeio_nfs.cpp:1077
 msgid "Disk quota exceeded"
 msgstr "Aethpwyd dros y ddogn ddisg"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_nntp.po b/tde-i18n-cy/messages/tdebase/tdeio_nntp.po
index ceda57990aa..e0284847dc8 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_nntp.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_nntp.po
@@ -1,10 +1,10 @@
-# translation of kio_nntp.po to Cymraeg
+# translation of tdeio_nntp.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_nntp\n"
+"Project-Id-Version: tdeio_nntp\n"
 "POT-Creation-Date: 2005-06-20 01:29+0200\n"
 "PO-Revision-Date: 2003-07-22 14:33+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_print.po b/tde-i18n-cy/messages/tdebase/tdeio_print.po
index 7cbefee8101..d3b4ca12aec 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_print.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_print.po
@@ -1,4 +1,4 @@
-# translation of kio_print.po to Cymraeg
+# translation of tdeio_print.po to Cymraeg
 # Bwrdd Gwaith yn Gymraeg.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk<kyfieithu@dotmon.com>, www.gyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_print\n"
+"Project-Id-Version: tdeio_print\n"
 "POT-Creation-Date: 2005-05-18 21:24+0200\n"
 "PO-Revision-Date: 2003-12-27 15:06+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -31,204 +31,204 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: kio_print.cpp:243 kio_print.cpp:399
+#: tdeio_print.cpp:243 tdeio_print.cpp:399
 msgid "Classes"
 msgstr "Dosbarthiadau"
 
-#: kio_print.cpp:247 kio_print.cpp:401
+#: tdeio_print.cpp:247 tdeio_print.cpp:401
 msgid "Printers"
 msgstr "Argraffyddion"
 
-#: kio_print.cpp:251 kio_print.cpp:403
+#: tdeio_print.cpp:251 tdeio_print.cpp:403
 msgid "Specials"
 msgstr "Arbenigion"
 
-#: kio_print.cpp:256 kio_print.cpp:405
+#: tdeio_print.cpp:256 tdeio_print.cpp:405
 msgid "Manager"
 msgstr "Rheolydd"
 
-#: kio_print.cpp:260 kio_print.cpp:407
+#: tdeio_print.cpp:260 tdeio_print.cpp:407
 msgid "Jobs"
 msgstr "Swyddi"
 
-#: kio_print.cpp:365
+#: tdeio_print.cpp:365
 msgid "Empty data received (%1)."
 msgstr "Derbynnwyd data gwag (%1)."
 
-#: kio_print.cpp:367
+#: tdeio_print.cpp:367
 msgid "Corrupted/incomplete data or server error (%1)."
 msgstr "Data llygredig/anghyflawn neu wall gweinydd (%1)."
 
-#: kio_print.cpp:395
+#: tdeio_print.cpp:395
 msgid "Print System"
 msgstr "Cysawd Argraffu"
 
-#: kio_print.cpp:439
+#: tdeio_print.cpp:439
 msgid "Printer driver"
 msgstr "Gyrrydd argraffydd"
 
-#: kio_print.cpp:441
+#: tdeio_print.cpp:441
 msgid "On-line printer driver database"
 msgstr "Cronfa ddata ar-lein o yrryddion argraffydd"
 
-#: kio_print.cpp:621
+#: tdeio_print.cpp:621
 #, c-format
 msgid "Unable to determine object type for %1."
 msgstr "Methu pennu math y gwrthrych am %1."
 
-#: kio_print.cpp:626
+#: tdeio_print.cpp:626
 #, c-format
 msgid "Unable to determine source type for %1."
 msgstr "Methu pennu math y tarddiad am %1."
 
-#: kio_print.cpp:632
+#: tdeio_print.cpp:632
 #, c-format
 msgid "Unable to retrieve printer information for %1."
 msgstr "Methu nôl gwybodaeth argraffyddion am %1."
 
-#: kio_print.cpp:640 kio_print.cpp:681 kio_print.cpp:724 kio_print.cpp:825
-#: kio_print.cpp:896
+#: tdeio_print.cpp:640 tdeio_print.cpp:681 tdeio_print.cpp:724 tdeio_print.cpp:825
+#: tdeio_print.cpp:896
 #, c-format
 msgid "Unable to load template %1"
 msgstr "Methu llwytho patrymlun %1 "
 
-#: kio_print.cpp:645 kio_print.cpp:646 kio_print.cpp:696 kio_print.cpp:697
-#: kio_print.cpp:735 kio_print.cpp:736
+#: tdeio_print.cpp:645 tdeio_print.cpp:646 tdeio_print.cpp:696 tdeio_print.cpp:697
+#: tdeio_print.cpp:735 tdeio_print.cpp:736
 #, c-format
 msgid "Properties of %1"
 msgstr "Priodweddau %1"
 
-#: kio_print.cpp:647 kio_print.cpp:838 kio_print.cpp:904
+#: tdeio_print.cpp:647 tdeio_print.cpp:838 tdeio_print.cpp:904
 msgid "General|Driver|Active jobs|Completed jobs"
 msgstr "Cyffredinol|Gyrrydd|Swyddi gweithredol|Swyddi wedi'u gorffen"
 
-#: kio_print.cpp:653 kio_print.cpp:704 kio_print.cpp:743
+#: tdeio_print.cpp:653 tdeio_print.cpp:704 tdeio_print.cpp:743
 msgid "General Properties"
 msgstr "Priodweddau Cyffredinol"
 
-#: kio_print.cpp:654 kio_print.cpp:705
+#: tdeio_print.cpp:654 tdeio_print.cpp:705
 msgid "Type"
 msgstr "Math"
 
-#: kio_print.cpp:654 kio_print.cpp:693
+#: tdeio_print.cpp:654 tdeio_print.cpp:693
 msgid "Remote"
 msgstr "Pell"
 
-#: kio_print.cpp:654 kio_print.cpp:693
+#: tdeio_print.cpp:654 tdeio_print.cpp:693
 msgid "Local"
 msgstr "Lleol"
 
-#: kio_print.cpp:655 kio_print.cpp:706 kio_print.cpp:855
+#: tdeio_print.cpp:655 tdeio_print.cpp:706 tdeio_print.cpp:855
 msgid "State"
 msgstr "Cyflwr"
 
-#: kio_print.cpp:656 kio_print.cpp:707 kio_print.cpp:744
+#: tdeio_print.cpp:656 tdeio_print.cpp:707 tdeio_print.cpp:744
 msgid "Location"
 msgstr "Lleoliad"
 
-#: kio_print.cpp:657 kio_print.cpp:708 kio_print.cpp:745
+#: tdeio_print.cpp:657 tdeio_print.cpp:708 tdeio_print.cpp:745
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: kio_print.cpp:658 kio_print.cpp:709
+#: tdeio_print.cpp:658 tdeio_print.cpp:709
 msgid "URI"
 msgstr "URI"
 
-#: kio_print.cpp:659
+#: tdeio_print.cpp:659
 msgid "Interface (Backend)"
 msgstr "Rhyngwyneb (Ôl-wyneb)"
 
-#: kio_print.cpp:660
+#: tdeio_print.cpp:660
 msgid "Driver"
 msgstr "Gyrrydd"
 
-#: kio_print.cpp:661
+#: tdeio_print.cpp:661
 msgid "Manufacturer"
 msgstr "Gwneuthurwr"
 
-#: kio_print.cpp:662
+#: tdeio_print.cpp:662
 msgid "Model"
 msgstr "Model"
 
-#: kio_print.cpp:663
+#: tdeio_print.cpp:663
 msgid "Driver Information"
 msgstr "Gwybodaeth Gyrrydd"
 
-#: kio_print.cpp:673
+#: tdeio_print.cpp:673
 #, c-format
 msgid "Unable to retrieve class information for %1."
 msgstr "Methu nôl gwybodaeth dosbarth i %1."
 
-#: kio_print.cpp:693
+#: tdeio_print.cpp:693
 msgid "Implicit"
 msgstr "Ymhlyg"
 
-#: kio_print.cpp:698 kio_print.cpp:835
+#: tdeio_print.cpp:698 tdeio_print.cpp:835
 msgid "General|Active jobs|Completed jobs"
 msgstr "Cyffredinol|Swyddi gweithredol|Swyddi wedi'u gorffen"
 
-#: kio_print.cpp:710
+#: tdeio_print.cpp:710
 msgid "Members"
 msgstr "Aelodau"
 
-#: kio_print.cpp:737
+#: tdeio_print.cpp:737
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kio_print.cpp:746
+#: tdeio_print.cpp:746
 msgid "Requirements"
 msgstr "Anghenion"
 
-#: kio_print.cpp:747
+#: tdeio_print.cpp:747
 msgid "Command Properties"
 msgstr "Priodweddau Gorchymyn"
 
-#: kio_print.cpp:748
+#: tdeio_print.cpp:748
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: kio_print.cpp:749
+#: tdeio_print.cpp:749
 msgid "Use Output File"
 msgstr "Defnyddio Ffeil Allbwn"
 
-#: kio_print.cpp:750
+#: tdeio_print.cpp:750
 msgid "Default Extension"
 msgstr "Estyniad Rhagosod"
 
-#: kio_print.cpp:832 kio_print.cpp:833
+#: tdeio_print.cpp:832 tdeio_print.cpp:833
 #, c-format
 msgid "Jobs of %1"
 msgstr "Swyddi o %1"
 
-#: kio_print.cpp:848 kio_print.cpp:853
+#: tdeio_print.cpp:848 tdeio_print.cpp:853
 msgid "All jobs"
 msgstr "Pob swydd"
 
-#: kio_print.cpp:849
+#: tdeio_print.cpp:849
 msgid "Active jobs|Completed jobs"
 msgstr "Swyddi gweithredol|Swyddi wedi'u gorffen"
 
-#: kio_print.cpp:855
+#: tdeio_print.cpp:855
 msgid "ID"
 msgstr "ID"
 
-#: kio_print.cpp:855
+#: tdeio_print.cpp:855
 msgid "Owner"
 msgstr "Perchennog"
 
-#: kio_print.cpp:855
+#: tdeio_print.cpp:855
 msgid "Printer"
 msgstr "Argraffydd"
 
-#: kio_print.cpp:855
+#: tdeio_print.cpp:855
 msgid "Name"
 msgstr "Enw"
 
-#: kio_print.cpp:902 kio_print.cpp:903
+#: tdeio_print.cpp:902 tdeio_print.cpp:903
 #, c-format
 msgid "Driver of %1"
 msgstr "Gyrrydd o %1"
 
-#: kio_print.cpp:909
+#: tdeio_print.cpp:909
 msgid "No driver found"
 msgstr "Ni chanfuwyd gyrrydd "
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_remote.po b/tde-i18n-cy/messages/tdebase/tdeio_remote.po
index 2941fd3ae91..1325ad6bf92 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_remote.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_remote.po
@@ -9,11 +9,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kio_remote.cpp:34
+#: tdeio_remote.cpp:34
 msgid "Protocol name"
 msgstr "Enw protocol"
 
-#: kio_remote.cpp:35 kio_remote.cpp:36
+#: tdeio_remote.cpp:35 tdeio_remote.cpp:36
 msgid "Socket name"
 msgstr "Enw soced"
 
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_settings.po b/tde-i18n-cy/messages/tdebase/tdeio_settings.po
index 6071266000f..1b17679db5f 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_settings.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_settings.po
@@ -1,10 +1,10 @@
-# translation of kio_settings.po to Cymraeg
+# translation of tdeio_settings.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_settings\n"
+"Project-Id-Version: tdeio_settings\n"
 "POT-Creation-Date: 2005-05-18 21:24+0200\n"
 "PO-Revision-Date: 2003-12-27 15:03+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -14,18 +14,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kio_settings.cc:194
+#: tdeio_settings.cc:194
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: kio_settings.cc:194
+#: tdeio_settings.cc:194
 msgid "Applications"
 msgstr "Cymhwysiadau"
 
-#: kio_settings.cc:194
+#: tdeio_settings.cc:194
 msgid "Programs"
 msgstr "Rhaglenni"
 
-#: kio_settings.cc:206 kio_settings.cc:230
+#: tdeio_settings.cc:206 tdeio_settings.cc:230
 msgid "Unknown settings folder"
 msgstr "Plygell osodiadau anhysbys"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_sftp.po b/tde-i18n-cy/messages/tdebase/tdeio_sftp.po
index c6ca9815f07..b59e2e46f73 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_sftp.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_sftp.po
@@ -1,10 +1,10 @@
-# translation of kio_sftp.po to Cymraeg
+# translation of tdeio_sftp.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_sftp\n"
+"Project-Id-Version: tdeio_sftp\n"
 "POT-Creation-Date: 2005-05-18 21:24+0200\n"
 "PO-Revision-Date: 2003-07-22 15:01+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -14,126 +14,126 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: kio_sftp.cpp:427
+#: tdeio_sftp.cpp:427
 msgid "An internal error occurred. Please retry the request again."
 msgstr ""
 
-#: kio_sftp.cpp:510
+#: tdeio_sftp.cpp:510
 msgid "Opening SFTP connection to host <b>%1:%2</b>"
 msgstr "Yn agor cysylltiad SFTP i'r gwesteiwr <b>%1:%2</b>"
 
-#: kio_sftp.cpp:514
+#: tdeio_sftp.cpp:514
 msgid "No hostname specified"
 msgstr "Nid yw enw'r gwesteiwr wedi'i benodi"
 
-#: kio_sftp.cpp:526
+#: tdeio_sftp.cpp:526
 msgid "SFTP Login"
 msgstr "Mewngofnod SFTP"
 
-#: kio_sftp.cpp:528
+#: tdeio_sftp.cpp:528
 msgid "site:"
 msgstr "safle:"
 
-#: kio_sftp.cpp:629
+#: tdeio_sftp.cpp:629
 #, fuzzy
 msgid "Please enter your username and key passphrase."
 msgstr ""
 "Rhowch eich enw defnyddiwr a'ch cyfrinosodiad allweddol os gwelwch yn dda."
 
-#: kio_sftp.cpp:631
+#: tdeio_sftp.cpp:631
 #, fuzzy
 msgid "Please enter your username and password."
 msgstr "Rhowch eich enw defnyddiwr a'ch cyfrinair os gwelwch yn dda."
 
-#: kio_sftp.cpp:639
+#: tdeio_sftp.cpp:639
 #, fuzzy
 msgid "Incorrect username or password"
 msgstr "Enw defnyddiwr neu gyfrinair anghywir"
 
-#: kio_sftp.cpp:644
+#: tdeio_sftp.cpp:644
 #, fuzzy
 msgid "Please enter a username and password"
 msgstr "Rhowch enw defnyddiwr a chyfrinair"
 
-#: kio_sftp.cpp:703
+#: tdeio_sftp.cpp:703
 #, fuzzy
 msgid "Warning: Cannot verify host's identity."
 msgstr "Rhybydd: Methu gwirio dynodiad y gwesteiwr!"
 
-#: kio_sftp.cpp:714
+#: tdeio_sftp.cpp:714
 #, fuzzy
 msgid "Warning: Host's identity changed."
 msgstr "Rhybydd: Newidodd dynodiad y gwesteiwr!"
 
-#: kio_sftp.cpp:725 kio_sftp.cpp:726
+#: tdeio_sftp.cpp:725 tdeio_sftp.cpp:726
 msgid "Authentication failed."
 msgstr "Methodd dilysiant."
 
-#: kio_sftp.cpp:740 kio_sftp.cpp:755
+#: tdeio_sftp.cpp:740 tdeio_sftp.cpp:755
 msgid "Connection failed."
 msgstr "Methodd y cysylltiad."
 
-#: kio_sftp.cpp:741 ksshprocess.cpp:810 ksshprocess.cpp:957
+#: tdeio_sftp.cpp:741 ksshprocess.cpp:810 ksshprocess.cpp:957
 msgid "Connection closed by remote host."
 msgstr "Ceuwyd y cysylltiad gan y gwesteiwr pell."
 
-#: kio_sftp.cpp:756
+#: tdeio_sftp.cpp:756
 #, c-format
 msgid "Unexpected SFTP error: %1"
 msgstr "Gwall SFTP annisgwyl: %1"
 
-#: kio_sftp.cpp:800
+#: tdeio_sftp.cpp:800
 #, c-format
 msgid "SFTP version %1"
 msgstr "SFTP fersiwn %1"
 
-#: kio_sftp.cpp:806
+#: tdeio_sftp.cpp:806
 msgid "Protocol error."
 msgstr "Gwall protocol."
 
-#: kio_sftp.cpp:812
+#: tdeio_sftp.cpp:812
 #, c-format
 msgid "Successfully connected to %1"
 msgstr "Cysylltwyd â %1 yn llwyddiannus"
 
-#: kio_sftp.cpp:1047
+#: tdeio_sftp.cpp:1047
 msgid "An internal error occurred. Please try again."
 msgstr ""
 
-#: kio_sftp.cpp:1068
+#: tdeio_sftp.cpp:1068
 msgid ""
 "Unknown error was encountered while copying the file to '%1'. Please try again."
 msgstr ""
 
-#: kio_sftp.cpp:1318
+#: tdeio_sftp.cpp:1318
 msgid "The remote host does not support renaming files."
 msgstr "Nid yw'r gwesteiwr pell yn cynnal ail-enwi ffeiliau."
 
-#: kio_sftp.cpp:1367
+#: tdeio_sftp.cpp:1367
 msgid "The remote host does not support creating symbolic links."
 msgstr "Nid yw'r gwesteiwr pell yn cynnal creu cysylltau symbolaidd."
 
-#: kio_sftp.cpp:1492
+#: tdeio_sftp.cpp:1492
 msgid "Connection closed"
 msgstr "Ceuwyd y cysylltiad"
 
-#: kio_sftp.cpp:1494
+#: tdeio_sftp.cpp:1494
 msgid "Could not read SFTP packet"
 msgstr "Methwyd darllen y pecyn SFTP"
 
-#: kio_sftp.cpp:1611
+#: tdeio_sftp.cpp:1611
 msgid "SFTP command failed for an unknown reason."
 msgstr "Methodd y gorchymyn SFTP am reswm anhysbys."
 
-#: kio_sftp.cpp:1615
+#: tdeio_sftp.cpp:1615
 msgid "The SFTP server received a bad message."
 msgstr "Derbynnodd y gweinydd SFTP neges wael."
 
-#: kio_sftp.cpp:1619
+#: tdeio_sftp.cpp:1619
 msgid "You attempted an operation unsupported by the SFTP server."
 msgstr "Fe geisioch weithred nas cynhelir gan y gweinydd SFTP."
 
-#: kio_sftp.cpp:1623
+#: tdeio_sftp.cpp:1623
 #, c-format
 msgid "Error code: %1"
 msgstr "Cod gwall: %1"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_smb.po b/tde-i18n-cy/messages/tdebase/tdeio_smb.po
index c55d9c82de2..857e035cd92 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_smb.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_smb.po
@@ -1,11 +1,11 @@
-# translation of kio_smb.po to Cymraeg
+# translation of tdeio_smb.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_smb\n"
+"Project-Id-Version: tdeio_smb\n"
 "POT-Creation-Date: 2005-11-08 02:45+0100\n"
 "PO-Revision-Date: 2003-12-27 15:02+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kio_smb_auth.cpp:131
+#: tdeio_smb_auth.cpp:131
 #, fuzzy
 msgid "<qt>Please enter authentication information for <b>%1</b></qt>"
 msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
 "Gweinydd = %1\n"
 "Rhaniad = %2"
 
-#: kio_smb_auth.cpp:135
+#: tdeio_smb_auth.cpp:135
 msgid ""
 "Please enter authentication information for:\n"
 "Server = %1\n"
@@ -33,21 +33,21 @@ msgstr ""
 "Gweinydd = %1\n"
 "Rhaniad = %2"
 
-#: kio_smb_auth.cpp:175
+#: tdeio_smb_auth.cpp:175
 msgid "libsmbclient failed to initialize"
 msgstr "methodd libsmbclient ymgychwyn"
 
-#: kio_smb_auth.cpp:181
+#: tdeio_smb_auth.cpp:181
 #, fuzzy
 msgid "libsmbclient failed to create context"
 msgstr "methodd libsmbclient ymgychwyn"
 
-#: kio_smb_auth.cpp:191
+#: tdeio_smb_auth.cpp:191
 #, fuzzy
 msgid "libsmbclient failed to initialize context"
 msgstr "methodd libsmbclient ymgychwyn"
 
-#: kio_smb_browse.cpp:67
+#: tdeio_smb_browse.cpp:67
 msgid ""
 "%1:\n"
 "Unknown file type, neither directory or file."
@@ -55,49 +55,49 @@ msgstr ""
 "%1:\n"
 "Math ffeil anhysbys, nid cyfeiriadur na ffeil."
 
-#: kio_smb_browse.cpp:126
+#: tdeio_smb_browse.cpp:126
 #, c-format
 msgid "File does not exist: %1"
 msgstr "Nid yw'r ffeil yn bodoli: %1"
 
-#: kio_smb_browse.cpp:242
+#: tdeio_smb_browse.cpp:242
 #, fuzzy
 msgid ""
 "Unable to find any workgroups in your local network. This might be caused by an "
 "enabled firewall."
 msgstr "Methu canfod unrhyw grŵp gwaith ar eich rhwydwaith lleol."
 
-#: kio_smb_browse.cpp:249
+#: tdeio_smb_browse.cpp:249
 #, c-format
 msgid "No media in device for %1"
 msgstr ""
 
-#: kio_smb_browse.cpp:257
+#: tdeio_smb_browse.cpp:257
 #, c-format
 msgid "Could not connect to host for %1"
 msgstr ""
 
-#: kio_smb_browse.cpp:273
+#: tdeio_smb_browse.cpp:273
 #, c-format
 msgid "Error while connecting to server responsible for %1"
 msgstr ""
 
-#: kio_smb_browse.cpp:281
+#: tdeio_smb_browse.cpp:281
 msgid "Share could not be found on given server"
 msgstr "Methwyd canfod rhaniad ar y gweinydd a benodwyd"
 
-#: kio_smb_browse.cpp:284
+#: tdeio_smb_browse.cpp:284
 msgid "BAD File descriptor"
 msgstr "Disgrifydd Ffeil BAD (llygredig)"
 
-#: kio_smb_browse.cpp:291
+#: tdeio_smb_browse.cpp:291
 msgid ""
 "The given name could not be resolved to a unique server. Make sure your network "
 "is setup without any name conflicts between names used by Windows and by UNIX "
 "name resolution."
 msgstr ""
 
-#: kio_smb_browse.cpp:297
+#: tdeio_smb_browse.cpp:297
 #, fuzzy
 msgid ""
 "libsmbclient reported an error, but did not specify what the problem is. This "
@@ -116,12 +116,12 @@ msgstr ""
 "hysbysu os ydych yn ansicr ynglyn â hynny - gallwch ei anfon yn breifat i'r "
 "datblygwyr os byddent yn gofyn amdano)."
 
-#: kio_smb_browse.cpp:308
+#: tdeio_smb_browse.cpp:308
 #, c-format
 msgid "Unknown error condition in stat: %1"
 msgstr "Cyflwr gwall anhysbys yn stat: %1"
 
-#: kio_smb_mount.cpp:125 kio_smb_mount.cpp:166
+#: tdeio_smb_mount.cpp:125 tdeio_smb_mount.cpp:166
 msgid ""
 "\n"
 "Make sure that the samba package is installed properly on your system."
@@ -129,13 +129,13 @@ msgstr ""
 "\n"
 "Gwiriwch fod y pecyn samba wedi'i osod yn gywir ar eich cysawd."
 
-#: kio_smb_mount.cpp:135
+#: tdeio_smb_mount.cpp:135
 msgid ""
 "Mounting of share \"%1\" from host \"%2\" by user \"%3\" failed.\n"
 "%4"
 msgstr ""
 
-#: kio_smb_mount.cpp:176
+#: tdeio_smb_mount.cpp:176
 msgid ""
 "Unmounting of mountpoint \"%1\" failed.\n"
 "%2"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_smtp.po b/tde-i18n-cy/messages/tdebase/tdeio_smtp.po
index b3b3d652f3d..26ec2789a6a 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_smtp.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_smtp.po
@@ -1,10 +1,10 @@
-# translation of kio_smtp.po to Cymraeg
+# translation of tdeio_smtp.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_smtp\n"
+"Project-Id-Version: tdeio_smtp\n"
 "POT-Creation-Date: 2007-07-17 01:45+0200\n"
 "PO-Revision-Date: 2003-07-22 15:21+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -53,7 +53,7 @@ msgid "Connection Failed"
 msgstr "Methodd y Cysylltiad"
 
 #: command.cc:242
-msgid "Authentication support is not compiled into kio_smtp."
+msgid "Authentication support is not compiled into tdeio_smtp."
 msgstr ""
 
 #: command.cc:271
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_system.po b/tde-i18n-cy/messages/tdebase/tdeio_system.po
index 95f5b1389b4..e4e7b0844bb 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_system.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_system.po
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kio_system.cpp:35
+#: tdeio_system.cpp:35
 msgid "Protocol name"
 msgstr "Enw protocol"
 
-#: kio_system.cpp:36 kio_system.cpp:37
+#: tdeio_system.cpp:36 tdeio_system.cpp:37
 msgid "Socket name"
 msgstr "Enw soced"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_trash.po b/tde-i18n-cy/messages/tdebase/tdeio_trash.po
index b69fff713f0..ac234ead4e4 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_trash.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_trash.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdebase/kio_trash.po\n"
+"Project-Id-Version: ../cy/messages//tdebase/tdeio_trash.po\n"
 "POT-Creation-Date: 2006-11-07 02:35+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -32,39 +32,39 @@ msgid ""
 "trash:/\""
 msgstr ""
 
-#: kio_trash.cpp:46
+#: tdeio_trash.cpp:46
 msgid "Protocol name"
 msgstr "Enw protocol"
 
-#: kio_trash.cpp:47 kio_trash.cpp:48
+#: tdeio_trash.cpp:47 tdeio_trash.cpp:48
 msgid "Socket name"
 msgstr "Enw soced"
 
-#: kio_trash.cpp:97 kio_trash.cpp:160 kio_trash.cpp:317 kio_trash.cpp:349
-#: kio_trash.cpp:511 kio_trash.cpp:523
+#: tdeio_trash.cpp:97 tdeio_trash.cpp:160 tdeio_trash.cpp:317 tdeio_trash.cpp:349
+#: tdeio_trash.cpp:511 tdeio_trash.cpp:523
 #, c-format
 msgid "Malformed URL %1"
 msgstr "URL annilys %1"
 
-#: kio_trash.cpp:116
+#: tdeio_trash.cpp:116
 msgid ""
 "The directory %1 does not exist anymore, so it is not possible to restore this "
 "item to its original location. You can either recreate that directory and use "
 "the restore operation again, or drag the item anywhere else to restore it."
 msgstr ""
 
-#: kio_trash.cpp:145
+#: tdeio_trash.cpp:145
 msgid "This file is already in the trash bin."
 msgstr ""
 
-#: kfile-plugin/kfile_trash.cpp:52
+#: tdefile-plugin/tdefile_trash.cpp:52
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile-plugin/kfile_trash.cpp:55
+#: tdefile-plugin/tdefile_trash.cpp:55
 msgid "Original Path"
 msgstr ""
 
-#: kfile-plugin/kfile_trash.cpp:56
+#: tdefile-plugin/tdefile_trash.cpp:56
 msgid "Date of Deletion"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdebase/tderandr.po b/tde-i18n-cy/messages/tdebase/tderandr.po
index 6b3ffb424d4..822837e3dd5 100644
--- a/tde-i18n-cy/messages/tdebase/tderandr.po
+++ b/tde-i18n-cy/messages/tdebase/tderandr.po
@@ -1,10 +1,10 @@
-# translation of krandr.po to Cymraeg
+# translation of tderandr.po to Cymraeg
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: krandr\n"
+"Project-Id-Version: tderandr\n"
 "POT-Creation-Date: 2006-11-08 02:34+0100\n"
 "PO-Revision-Date: 2004-01-05 14:58+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -26,7 +26,7 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: krandrmodule.cpp:82
+#: tderandrmodule.cpp:82
 #, fuzzy
 msgid ""
 "<qt>Your X server does not support resizing and rotating the display. Please "
@@ -37,16 +37,16 @@ msgstr ""
 "Diweddarwch i fersiwn 4.3 neu uwch.  Mae angen yr estyniad X Resize And Rotate "
 "(RANDR) fersiwn 1.1 neu uwch i ddefnyddio'r nodwedd yma.  Côd gwall: %1</qt>"
 
-#: krandrmodule.cpp:91
+#: tderandrmodule.cpp:91
 msgid "Settings for screen:"
 msgstr "Gosodiadau ar gyfer y sgrîn:"
 
-#: krandrmodule.cpp:95 krandrtray.cpp:83
+#: tderandrmodule.cpp:95 tderandrtray.cpp:83
 #, c-format
 msgid "Screen %1"
 msgstr "Sgrîn %1"
 
-#: krandrmodule.cpp:100
+#: tderandrmodule.cpp:100
 msgid ""
 "The screen whose settings you would like to change can be selected using this "
 "drop-down list."
@@ -54,40 +54,40 @@ msgstr ""
 "Gellir ddewis y sgrîn y dymunwch newid y gosodiadau ohono gan ddefnyddio'r "
 "llam-restr."
 
-#: krandrmodule.cpp:109
+#: tderandrmodule.cpp:109
 msgid "Screen size:"
 msgstr "Maint y sgrîn:"
 
-#: krandrmodule.cpp:111
+#: tderandrmodule.cpp:111
 msgid ""
 "The size, otherwise known as the resolution, of your screen can be selected "
 "from this drop-down list."
 msgstr ""
 "Gellir dewis maint, neu fel arall cydraniad, eich sgrîn o'r llam-restr yma."
 
-#: krandrmodule.cpp:117
+#: tderandrmodule.cpp:117
 msgid "Refresh rate:"
 msgstr "Graddfa adfywio:"
 
-#: krandrmodule.cpp:119
+#: tderandrmodule.cpp:119
 msgid ""
 "The refresh rate of your screen can be selected from this drop-down list."
 msgstr "Gellir dewis graddfa adfywio eich sgrîn o'r llam-restr yma."
 
-#: krandrmodule.cpp:123
+#: tderandrmodule.cpp:123
 msgid "Orientation (degrees counterclockwise)"
 msgstr "Cyfeiriadaeth (graddau wrthglocwedd)"
 
-#: krandrmodule.cpp:126
+#: tderandrmodule.cpp:126
 msgid ""
 "The options in this section allow you to change the rotation of your screen."
 msgstr "Caniata'r dewisiadau yn yr adran yma i chi newid cylchdro eich sgrîn."
 
-#: krandrmodule.cpp:128
+#: tderandrmodule.cpp:128
 msgid "Apply settings on TDE startup"
 msgstr "Gweithredu'r gosodiadau wrth ymgychwyn TDE"
 
-#: krandrmodule.cpp:130
+#: tderandrmodule.cpp:130
 msgid ""
 "If this option is enabled the size and orientation settings will be used when "
 "TDE starts."
@@ -95,11 +95,11 @@ msgstr ""
 "Os alluogir y dewisiad yma, defnyddir y gosodiadau maint a chyfeiriadaeth wrth "
 "ymgychwyn TDE."
 
-#: krandrmodule.cpp:135
+#: tderandrmodule.cpp:135
 msgid "Allow tray application to change startup settings"
 msgstr "Caniatáu i gymhwysiad cafn newid gosodiadau ymgychwyn"
 
-#: krandrmodule.cpp:137
+#: tderandrmodule.cpp:137
 msgid ""
 "If this option is enabled, options set by the system tray applet will be saved "
 "and loaded when TDE starts instead of being temporary."
@@ -107,36 +107,36 @@ msgstr ""
 "Os alluogir y dewisiad yma, cedwir dewisiadau a osodir gan y cymhwysiad cafn "
 "cysawd a'u llwythir wrth ymgychwyn TDE yn lle bod yn dros-dro."
 
-#: krandrmodule.cpp:174 krandrtray.cpp:149
+#: tderandrmodule.cpp:174 tderandrtray.cpp:149
 msgid "%1 x %2"
 msgstr "%1 x %2"
 
-#: krandrtray.cpp:45
+#: tderandrtray.cpp:45
 #, fuzzy
 msgid "Screen resize & rotate"
 msgstr "Newid Maint a Cylchdroi"
 
-#: krandrtray.cpp:69
+#: tderandrtray.cpp:69
 msgid "Required X Extension Not Available"
 msgstr "Nid yw'r Estyniad X Gofynnol ar Gael"
 
-#: krandrtray.cpp:94
+#: tderandrtray.cpp:94
 msgid "Configure Display..."
 msgstr "Ffurfweddu Dangosydd..."
 
-#: krandrtray.cpp:117
+#: tderandrtray.cpp:117
 msgid "Screen configuration has changed"
 msgstr "Newidwyd ffurfweddiad y sgrîn"
 
-#: krandrtray.cpp:128
+#: tderandrtray.cpp:128
 msgid "Screen Size"
 msgstr "Maint y Sgrîn"
 
-#: krandrtray.cpp:181
+#: tderandrtray.cpp:181
 msgid "Refresh Rate"
 msgstr "Graddfa Ailfywio"
 
-#: krandrtray.cpp:251
+#: tderandrtray.cpp:251
 msgid "Configure Display"
 msgstr "Ffurfweddu Dangosydd"
 
diff --git a/tde-i18n-cy/messages/tdebase/tdescreensaver.po b/tde-i18n-cy/messages/tdebase/tdescreensaver.po
index aa61e340830..26f3c4bb7b4 100644
--- a/tde-i18n-cy/messages/tdebase/tdescreensaver.po
+++ b/tde-i18n-cy/messages/tdebase/tdescreensaver.po
@@ -1,11 +1,11 @@
-# translation of kscreensaver.po to Cymraeg
+# translation of tdescreensaver.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kscreensaver\n"
+"Project-Id-Version: tdescreensaver\n"
 "POT-Creation-Date: 2007-01-26 02:37+0100\n"
 "PO-Revision-Date: 2003-12-27 12:19+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/tdebase/useraccount.po b/tde-i18n-cy/messages/tdebase/useraccount.po
index af116fc3de4..f7ce9c55f71 100644
--- a/tde-i18n-cy/messages/tdebase/useraccount.po
+++ b/tde-i18n-cy/messages/tdebase/useraccount.po
@@ -259,8 +259,8 @@ msgstr "Delwedd fewngofnodi y defnyddiwr"
 #. i18n: file kcm_useraccount.kcfg line 40
 #: rc.cpp:54
 #, no-c-format
-msgid "Sort key for KIconViewItems"
-msgstr "Bysell drefnu ar gyfer KIconViewItems"
+msgid "Sort key for TDEIconViewItems"
+msgstr "Bysell drefnu ar gyfer TDEIconViewItems"
 
 #. i18n: file kcm_useraccount_pass.kcfg line 9
 #: rc.cpp:57
diff --git a/tde-i18n-cy/messages/tdeedu/tdefile_drgeo.po b/tde-i18n-cy/messages/tdeedu/tdefile_drgeo.po
index c03dbaf739b..8acadb84a82 100644
--- a/tde-i18n-cy/messages/tdeedu/tdefile_drgeo.po
+++ b/tde-i18n-cy/messages/tdeedu/tdefile_drgeo.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdeedu/kfile_drgeo.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/tdefile_drgeo.po\n"
 "POT-Creation-Date: 2005-05-08 12:46+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,37 +9,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile/kfile_drgeo.cpp:37
+#: tdefile/tdefile_drgeo.cpp:37
 msgid "Summary"
 msgstr "Crynodeb"
 
-#: kfile/kfile_drgeo.cpp:39
+#: tdefile/tdefile_drgeo.cpp:39
 msgid "Figures"
 msgstr ""
 
-#: kfile/kfile_drgeo.cpp:40
+#: tdefile/tdefile_drgeo.cpp:40
 msgid "Texts"
 msgstr ""
 
-#: kfile/kfile_drgeo.cpp:41
+#: tdefile/tdefile_drgeo.cpp:41
 msgid "Macros"
 msgstr "Macros"
 
-#: kfile/kfile_drgeo.cpp:44
+#: tdefile/tdefile_drgeo.cpp:44
 msgid ""
 "_: Translators: what this drgeo file contains\n"
 "Contents"
 msgstr "Cynnwys"
 
-#: kfile/kfile_drgeo.cpp:71
+#: tdefile/tdefile_drgeo.cpp:71
 msgid "Figure"
 msgstr ""
 
-#: kfile/kfile_drgeo.cpp:78
+#: tdefile/tdefile_drgeo.cpp:78
 msgid "Text"
 msgstr "Testun"
 
-#: kfile/kfile_drgeo.cpp:85
+#: tdefile/tdefile_drgeo.cpp:85
 msgid "Macro"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdeedu/tdefile_kig.po b/tde-i18n-cy/messages/tdeedu/tdefile_kig.po
index 8f4d376ad2d..1e4503f11ab 100644
--- a/tde-i18n-cy/messages/tdeedu/tdefile_kig.po
+++ b/tde-i18n-cy/messages/tdeedu/tdefile_kig.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdeedu/kfile_kig.po\n"
+"Project-Id-Version: ../cy/messages//tdeedu/tdefile_kig.po\n"
 "POT-Creation-Date: 2005-05-25 08:18+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,41 +9,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile/kfile_kig.cpp:45
+#: tdefile/tdefile_kig.cpp:45
 msgid "Summary"
 msgstr "Crynodeb"
 
-#: kfile/kfile_kig.cpp:46
+#: tdefile/tdefile_kig.cpp:46
 msgid "Version"
 msgstr "Fersiwn"
 
-#: kfile/kfile_kig.cpp:47
+#: tdefile/tdefile_kig.cpp:47
 msgid "Compatibility Version"
 msgstr ""
 
-#: kfile/kfile_kig.cpp:48
+#: tdefile/tdefile_kig.cpp:48
 msgid "Coordinate System"
 msgstr ""
 
-#: kfile/kfile_kig.cpp:49
+#: tdefile/tdefile_kig.cpp:49
 msgid "Grid"
 msgstr "Grid"
 
-#: kfile/kfile_kig.cpp:50
+#: tdefile/tdefile_kig.cpp:50
 msgid "Axes"
 msgstr "Echelinau"
 
-#: kfile/kfile_kig.cpp:51
+#: tdefile/tdefile_kig.cpp:51
 msgid "Compressed"
 msgstr ""
 
-#: kfile/kfile_kig.cpp:110
+#: tdefile/tdefile_kig.cpp:110
 msgid ""
 "_: Translators: Not Available\n"
 "n/a"
 msgstr "amherthnasol"
 
-#: kfile/kfile_kig.cpp:117
+#: tdefile/tdefile_kig.cpp:117
 msgid ""
 "_: %1 represents Kig version\n"
 "%1 (as the version)"
diff --git a/tde-i18n-cy/messages/tdegraphics/kiconedit.po b/tde-i18n-cy/messages/tdegraphics/kiconedit.po
index 562f22f07c2..8ef25ab501a 100644
--- a/tde-i18n-cy/messages/tdegraphics/kiconedit.po
+++ b/tde-i18n-cy/messages/tdegraphics/kiconedit.po
@@ -30,7 +30,7 @@ msgid "Icon file(s) to open"
 msgstr ""
 
 #: main.cpp:45
-msgid "KIconEdit"
+msgid "TDEIconEdit"
 msgstr "KGolyguEicon"
 
 #: main.cpp:55
diff --git a/tde-i18n-cy/messages/tdegraphics/kviewshell.po b/tde-i18n-cy/messages/tdegraphics/kviewshell.po
index f6a754f4140..71b64e8f6ca 100644
--- a/tde-i18n-cy/messages/tdegraphics/kviewshell.po
+++ b/tde-i18n-cy/messages/tdegraphics/kviewshell.po
@@ -34,92 +34,92 @@ msgstr ""
 msgid "Copyright (c) 2005 Wilfried Huss"
 msgstr ""
 
-#: kmultipage.cpp:70
+#: tdemultipage.cpp:70
 msgid "Thumbnails"
 msgstr "Rhagolygon cryno"
 
-#: kmultipage.cpp:158
+#: tdemultipage.cpp:158
 msgid "Save File As"
 msgstr ""
 
-#: kmultipage.cpp:169
+#: tdemultipage.cpp:169
 msgid ""
 "The file %1\n"
 "exists. Shall I overwrite that file?"
 msgstr ""
 
-#: kmultipage.cpp:170 kmultipage.cpp:1916
+#: tdemultipage.cpp:170 tdemultipage.cpp:1916
 msgid "Overwrite File"
 msgstr "Trosysgrifo Ffeil"
 
-#: kmultipage.cpp:170 kmultipage.cpp:1916
+#: tdemultipage.cpp:170 tdemultipage.cpp:1916
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
-#: kmultipage.cpp:770
+#: tdemultipage.cpp:770
 #, c-format
 msgid "Print %1"
 msgstr "Argraffu %1"
 
-#: kmultipage.cpp:1422 kmultipage.cpp:1564
+#: tdemultipage.cpp:1422 tdemultipage.cpp:1564
 msgid "Search interrupted"
 msgstr ""
 
-#: kmultipage.cpp:1430 kmultipage.cpp:1572
+#: tdemultipage.cpp:1430 tdemultipage.cpp:1572
 msgid "Search page %1 of %2"
 msgstr ""
 
-#: kmultipage.cpp:1475
+#: tdemultipage.cpp:1475
 msgid ""
 "<qt>The search string <strong>%1</strong> could not be found by the end of the "
 "document. Should the search be restarted from the beginning of the "
 "document?</qt>"
 msgstr ""
 
-#: kmultipage.cpp:1478 kmultipage.cpp:1620
+#: tdemultipage.cpp:1478 tdemultipage.cpp:1620
 msgid "Text Not Found"
 msgstr ""
 
-#: kmultipage.cpp:1502 kmultipage.cpp:1644
+#: tdemultipage.cpp:1502 tdemultipage.cpp:1644
 msgid "<qt>The search string <strong>%1</strong> could not be found.</qt>"
 msgstr ""
 
-#: kmultipage.cpp:1617
+#: tdemultipage.cpp:1617
 msgid ""
 "<qt>The search string <strong>%1</strong> could not be found by the beginning "
 "of the document. Should the search be restarted from the end of the "
 "document?</qt>"
 msgstr ""
 
-#: kmultipage.cpp:1713
+#: tdemultipage.cpp:1713
 #, c-format
 msgid "Reloading file %1"
 msgstr ""
 
-#: kmultipage.cpp:1749
+#: tdemultipage.cpp:1749
 #, c-format
 msgid "Loading file %1"
 msgstr "Llwytho ffeil %1"
 
-#: kmultipage.cpp:1906
+#: tdemultipage.cpp:1906
 msgid "*.txt|Plain Text (Latin 1) (*.txt)"
 msgstr ""
 
-#: kmultipage.cpp:1906
+#: tdemultipage.cpp:1906
 msgid "Export File As"
 msgstr "Allforio Ffeil Fel"
 
-#: kmultipage.cpp:1915
+#: tdemultipage.cpp:1915
 msgid ""
 "The file %1\n"
 "exists. Do you want to overwrite that file?"
 msgstr ""
 
-#: kmultipage.cpp:1926
+#: tdemultipage.cpp:1926
 msgid "Exporting to text..."
 msgstr ""
 
-#: kmultipage.cpp:1926
+#: tdemultipage.cpp:1926
 msgid "Abort"
 msgstr "Erthylu"
 
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_bmp.po b/tde-i18n-cy/messages/tdegraphics/tdefile_bmp.po
index 25a31aafbe3..eec0562f834 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_bmp.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_bmp.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_bmp.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_bmp.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,66 +9,66 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_bmp.cpp:55
+#: tdefile_bmp.cpp:55
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_bmp.cpp:59
+#: tdefile_bmp.cpp:59
 msgid "Type"
 msgstr "Math"
 
-#: kfile_bmp.cpp:61
+#: tdefile_bmp.cpp:61
 msgid "Dimensions"
 msgstr "Dimensiynau"
 
-#: kfile_bmp.cpp:65
+#: tdefile_bmp.cpp:65
 msgid "Bit Depth"
 msgstr ""
 
-#: kfile_bmp.cpp:68
+#: tdefile_bmp.cpp:68
 msgid "Compression"
 msgstr "Cywasgu"
 
-#: kfile_bmp.cpp:104
+#: tdefile_bmp.cpp:104
 msgid "Windows Bitmap"
 msgstr ""
 
-#: kfile_bmp.cpp:106
+#: tdefile_bmp.cpp:106
 msgid "OS/2 Bitmap Array"
 msgstr ""
 
-#: kfile_bmp.cpp:108
+#: tdefile_bmp.cpp:108
 msgid "OS/2 Color Icon"
 msgstr ""
 
-#: kfile_bmp.cpp:110
+#: tdefile_bmp.cpp:110
 msgid "OS/2 Color Pointer"
 msgstr ""
 
-#: kfile_bmp.cpp:112
+#: tdefile_bmp.cpp:112
 msgid "OS/2 Icon"
 msgstr ""
 
-#: kfile_bmp.cpp:114
+#: tdefile_bmp.cpp:114
 msgid "OS/2 Pointer"
 msgstr ""
 
-#: kfile_bmp.cpp:156
+#: tdefile_bmp.cpp:156
 msgid "None"
 msgstr "Dim"
 
-#: kfile_bmp.cpp:159
+#: tdefile_bmp.cpp:159
 msgid "RLE 8bit/pixel"
 msgstr ""
 
-#: kfile_bmp.cpp:162
+#: tdefile_bmp.cpp:162
 msgid "RLE 4bit/pixel"
 msgstr ""
 
-#: kfile_bmp.cpp:165
+#: tdefile_bmp.cpp:165
 msgid "Bitfields"
 msgstr ""
 
-#: kfile_bmp.cpp:168
+#: tdefile_bmp.cpp:168
 msgid "Unknown"
 msgstr "Anhysbys"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_dds.po b/tde-i18n-cy/messages/tdegraphics/tdefile_dds.po
index c2024f03e24..0d433d9e81f 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_dds.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_dds.po
@@ -9,50 +9,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_dds.cpp:192
+#: tdefile_dds.cpp:192
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_dds.cpp:196
+#: tdefile_dds.cpp:196
 msgid "Dimensions"
 msgstr "Dimensiynau"
 
-#: kfile_dds.cpp:200
+#: tdefile_dds.cpp:200
 msgid "Depth"
 msgstr "Dyfnder"
 
-#: kfile_dds.cpp:203
+#: tdefile_dds.cpp:203
 msgid "Bit Depth"
 msgstr ""
 
-#: kfile_dds.cpp:206
+#: tdefile_dds.cpp:206
 msgid "Mipmap Count"
 msgstr ""
 
-#: kfile_dds.cpp:208
+#: tdefile_dds.cpp:208
 msgid "Type"
 msgstr "Math"
 
-#: kfile_dds.cpp:209
+#: tdefile_dds.cpp:209
 msgid "Color Mode"
 msgstr "Modd Lliw"
 
-#: kfile_dds.cpp:210
+#: tdefile_dds.cpp:210
 msgid "Compression"
 msgstr "Cywasgu"
 
-#: kfile_dds.cpp:251
+#: tdefile_dds.cpp:251
 msgid "Cube Map Texture"
 msgstr ""
 
-#: kfile_dds.cpp:254
+#: tdefile_dds.cpp:254
 msgid "Volume Texture"
 msgstr ""
 
-#: kfile_dds.cpp:258
+#: tdefile_dds.cpp:258
 msgid "2D Texture"
 msgstr ""
 
-#: kfile_dds.cpp:264
+#: tdefile_dds.cpp:264
 msgid "Uncompressed"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_dvi.po b/tde-i18n-cy/messages/tdegraphics/tdefile_dvi.po
index ac1021e2674..5b6e3da4ee4 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_dvi.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_dvi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_dvi.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_dvi.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,18 +9,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_dvi.cpp:53
+#: tdefile_dvi.cpp:53
 msgid "Created"
 msgstr "Crëwyd"
 
-#: kfile_dvi.cpp:54
+#: tdefile_dvi.cpp:54
 msgid "Comment"
 msgstr "Sylwad"
 
-#: kfile_dvi.cpp:55
+#: tdefile_dvi.cpp:55
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: kfile_dvi.cpp:142
+#: tdefile_dvi.cpp:142
 msgid "TeX Device Independent file"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_exr.po b/tde-i18n-cy/messages/tdegraphics/tdefile_exr.po
index fe12953ea3c..28b3e4af549 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_exr.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_exr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_exr.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_exr.po\n"
 "POT-Creation-Date: 2007-08-23 01:13+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,236 +9,236 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_exr.cpp:75
+#: tdefile_exr.cpp:75
 msgid "Format Version"
 msgstr ""
 
-#: kfile_exr.cpp:76
+#: tdefile_exr.cpp:76
 msgid "Tiled Image"
 msgstr ""
 
-#: kfile_exr.cpp:77
+#: tdefile_exr.cpp:77
 msgid "Dimensions"
 msgstr "Dimensiynau"
 
-#: kfile_exr.cpp:81
+#: tdefile_exr.cpp:81
 msgid "Thumbnail Dimensions"
 msgstr ""
 
-#: kfile_exr.cpp:84
+#: tdefile_exr.cpp:84
 msgid "Comment"
 msgstr "Sylwad"
 
-#: kfile_exr.cpp:85
+#: tdefile_exr.cpp:85
 msgid "Thumbnail"
 msgstr ""
 
-#: kfile_exr.cpp:89
+#: tdefile_exr.cpp:89
 msgid "Standard Attributes"
 msgstr ""
 
-#: kfile_exr.cpp:90
+#: tdefile_exr.cpp:90
 msgid "Owner"
 msgstr "Perchennog"
 
-#: kfile_exr.cpp:91
+#: tdefile_exr.cpp:91
 msgid "Comments"
 msgstr "Sylwadau"
 
-#: kfile_exr.cpp:92
+#: tdefile_exr.cpp:92
 msgid "Capture Date"
 msgstr ""
 
-#: kfile_exr.cpp:93
+#: tdefile_exr.cpp:93
 msgid "UTC Offset"
 msgstr ""
 
-#: kfile_exr.cpp:94
+#: tdefile_exr.cpp:94
 msgid "Exposure Time"
 msgstr ""
 
-#: kfile_exr.cpp:96
+#: tdefile_exr.cpp:96
 msgid "Focus"
 msgstr "Canolbwynt"
 
-#: kfile_exr.cpp:97 kfile_exr.cpp:105
+#: tdefile_exr.cpp:97 tdefile_exr.cpp:105
 msgid ""
 "_: Metres\n"
 "m"
 msgstr "m"
 
-#: kfile_exr.cpp:98
+#: tdefile_exr.cpp:98
 msgid "X Density"
 msgstr ""
 
-#: kfile_exr.cpp:99
+#: tdefile_exr.cpp:99
 msgid ""
 "_: Pixels Per Inch\n"
 " ppi"
 msgstr ""
 
-#: kfile_exr.cpp:100
+#: tdefile_exr.cpp:100
 msgid "White Luminance"
 msgstr ""
 
-#: kfile_exr.cpp:101
+#: tdefile_exr.cpp:101
 msgid ""
 "_: Candelas per square metre\n"
 " Nits"
 msgstr ""
 
-#: kfile_exr.cpp:102
+#: tdefile_exr.cpp:102
 msgid "Longitude"
 msgstr "Hydred"
 
-#: kfile_exr.cpp:103
+#: tdefile_exr.cpp:103
 msgid "Latitude"
 msgstr "Lledred"
 
-#: kfile_exr.cpp:104
+#: tdefile_exr.cpp:104
 msgid "Altitude"
 msgstr "Uchder"
 
-#: kfile_exr.cpp:106
+#: tdefile_exr.cpp:106
 msgid "ISO Speed"
 msgstr ""
 
-#: kfile_exr.cpp:107
+#: tdefile_exr.cpp:107
 msgid "Aperture"
 msgstr ""
 
-#: kfile_exr.cpp:110
+#: tdefile_exr.cpp:110
 msgid "Channels"
 msgstr "Sianeli"
 
-#: kfile_exr.cpp:111
+#: tdefile_exr.cpp:111
 msgid "A"
 msgstr "A"
 
-#: kfile_exr.cpp:112 kfile_exr.cpp:119
+#: tdefile_exr.cpp:112 tdefile_exr.cpp:119
 msgid "R"
 msgstr "R"
 
-#: kfile_exr.cpp:113
+#: tdefile_exr.cpp:113
 msgid "G"
 msgstr "G"
 
-#: kfile_exr.cpp:114
+#: tdefile_exr.cpp:114
 msgid "B"
 msgstr "B"
 
-#: kfile_exr.cpp:115
+#: tdefile_exr.cpp:115
 msgid "Z"
 msgstr ""
 
-#: kfile_exr.cpp:116
+#: tdefile_exr.cpp:116
 msgid "NX"
 msgstr ""
 
-#: kfile_exr.cpp:117
+#: tdefile_exr.cpp:117
 msgid "NY"
 msgstr ""
 
-#: kfile_exr.cpp:118
+#: tdefile_exr.cpp:118
 msgid "NZ"
 msgstr ""
 
-#: kfile_exr.cpp:120
+#: tdefile_exr.cpp:120
 msgid "U"
 msgstr ""
 
-#: kfile_exr.cpp:121
+#: tdefile_exr.cpp:121
 msgid "V"
 msgstr "V"
 
-#: kfile_exr.cpp:122
+#: tdefile_exr.cpp:122
 msgid "materialID"
 msgstr ""
 
-#: kfile_exr.cpp:123
+#: tdefile_exr.cpp:123
 msgid "objectID"
 msgstr ""
 
-#: kfile_exr.cpp:124
+#: tdefile_exr.cpp:124
 msgid "renderID"
 msgstr ""
 
-#: kfile_exr.cpp:125
+#: tdefile_exr.cpp:125
 msgid "pixelCover"
 msgstr ""
 
-#: kfile_exr.cpp:126
+#: tdefile_exr.cpp:126
 msgid "velX"
 msgstr ""
 
-#: kfile_exr.cpp:127
+#: tdefile_exr.cpp:127
 msgid "velY"
 msgstr ""
 
-#: kfile_exr.cpp:128
+#: tdefile_exr.cpp:128
 msgid "packedRGBA"
 msgstr ""
 
-#: kfile_exr.cpp:132
+#: tdefile_exr.cpp:132
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_exr.cpp:133
+#: tdefile_exr.cpp:133
 msgid "Compression"
 msgstr "Cywasgu"
 
-#: kfile_exr.cpp:134
+#: tdefile_exr.cpp:134
 msgid "Line Order"
 msgstr ""
 
-#: kfile_exr.cpp:138
+#: tdefile_exr.cpp:138
 msgid "3dsMax Details"
 msgstr ""
 
-#: kfile_exr.cpp:139
+#: tdefile_exr.cpp:139
 msgid "Local Time"
 msgstr ""
 
-#: kfile_exr.cpp:140
+#: tdefile_exr.cpp:140
 msgid "System Time"
 msgstr ""
 
-#: kfile_exr.cpp:141
+#: tdefile_exr.cpp:141
 msgid "Plugin Version"
 msgstr ""
 
-#: kfile_exr.cpp:142
+#: tdefile_exr.cpp:142
 msgid "EXR Version"
 msgstr ""
 
-#: kfile_exr.cpp:143
+#: tdefile_exr.cpp:143
 msgid "Computer Name"
 msgstr ""
 
-#: kfile_exr.cpp:306
+#: tdefile_exr.cpp:306
 msgid "No compression"
 msgstr ""
 
-#: kfile_exr.cpp:309
+#: tdefile_exr.cpp:309
 msgid "Run Length Encoding"
 msgstr ""
 
-#: kfile_exr.cpp:312
+#: tdefile_exr.cpp:312
 msgid "zip, individual scanlines"
 msgstr ""
 
-#: kfile_exr.cpp:315
+#: tdefile_exr.cpp:315
 msgid "zip, multi-scanline blocks"
 msgstr ""
 
-#: kfile_exr.cpp:318
+#: tdefile_exr.cpp:318
 msgid "piz compression"
 msgstr ""
 
-#: kfile_exr.cpp:327
+#: tdefile_exr.cpp:327
 msgid "increasing Y"
 msgstr ""
 
-#: kfile_exr.cpp:330
+#: tdefile_exr.cpp:330
 msgid "decreasing Y"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_gif.po b/tde-i18n-cy/messages/tdegraphics/tdefile_gif.po
index 9848e2485c4..d0aeefceffc 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_gif.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_gif.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_gif.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_gif.po\n"
 "POT-Creation-Date: 2005-03-14 01:33+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,31 +9,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_gif.cpp:55
+#: tdefile_gif.cpp:55
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_gif.cpp:59
+#: tdefile_gif.cpp:59
 msgid "Version"
 msgstr "Fersiwn"
 
-#: kfile_gif.cpp:61
+#: tdefile_gif.cpp:61
 msgid "Dimensions"
 msgstr "Dimensiynau"
 
-#: kfile_gif.cpp:65
+#: tdefile_gif.cpp:65
 msgid "Bit Depth"
 msgstr ""
 
-#: kfile_gif.cpp:103
+#: tdefile_gif.cpp:103
 msgid "GIF Version 89a"
 msgstr ""
 
-#: kfile_gif.cpp:105
+#: tdefile_gif.cpp:105
 msgid "GIF Version 87a"
 msgstr ""
 
-#: kfile_gif.cpp:108
+#: tdefile_gif.cpp:108
 msgid "Unknown"
 msgstr "Anhysbys"
 
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_ico.po b/tde-i18n-cy/messages/tdegraphics/tdefile_ico.po
index b240366f6e4..45388607d03 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_ico.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_ico.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_ico.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_ico.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,26 +9,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_ico.cpp:56
+#: tdefile_ico.cpp:56
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_ico.cpp:60
+#: tdefile_ico.cpp:60
 msgid "Number of Icons"
 msgstr ""
 
-#: kfile_ico.cpp:62
+#: tdefile_ico.cpp:62
 msgid "Dimensions"
 msgstr "Dimensiynau"
 
-#: kfile_ico.cpp:63
+#: tdefile_ico.cpp:63
 msgid "Colors"
 msgstr "Lliwiau"
 
-#: kfile_ico.cpp:65
+#: tdefile_ico.cpp:65
 msgid "Dimensions (1st icon)"
 msgstr ""
 
-#: kfile_ico.cpp:66
+#: tdefile_ico.cpp:66
 msgid "Colors (1st icon)"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_jpeg.po b/tde-i18n-cy/messages/tdegraphics/tdefile_jpeg.po
index 5944c0df08b..1c6ce57207c 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_jpeg.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_jpeg.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_jpeg.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_jpeg.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,287 +9,287 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_jpeg.cpp:58
+#: tdefile_jpeg.cpp:58
 msgid "JPEG Exif"
 msgstr ""
 
-#: kfile_jpeg.cpp:61
+#: tdefile_jpeg.cpp:61
 msgid "Comment"
 msgstr "Sylwad"
 
-#: kfile_jpeg.cpp:67
+#: tdefile_jpeg.cpp:67
 msgid "Camera Manufacturer"
 msgstr ""
 
-#: kfile_jpeg.cpp:70
+#: tdefile_jpeg.cpp:70
 msgid "Camera Model"
 msgstr ""
 
-#: kfile_jpeg.cpp:73
+#: tdefile_jpeg.cpp:73
 msgid "Date/Time"
 msgstr "Dyddiad/Amser"
 
-#: kfile_jpeg.cpp:76
+#: tdefile_jpeg.cpp:76
 msgid "Creation Date"
 msgstr "Dyddiad Creu"
 
-#: kfile_jpeg.cpp:79
+#: tdefile_jpeg.cpp:79
 msgid "Creation Time"
 msgstr "Amser Creu"
 
-#: kfile_jpeg.cpp:82
+#: tdefile_jpeg.cpp:82
 msgid "Dimensions"
 msgstr "Dimensiynau"
 
-#: kfile_jpeg.cpp:90
+#: tdefile_jpeg.cpp:90
 msgid "Color Mode"
 msgstr "Modd Lliw"
 
-#: kfile_jpeg.cpp:93
+#: tdefile_jpeg.cpp:93
 msgid "Flash Used"
 msgstr ""
 
-#: kfile_jpeg.cpp:95
+#: tdefile_jpeg.cpp:95
 msgid "Focal Length"
 msgstr ""
 
-#: kfile_jpeg.cpp:99
+#: tdefile_jpeg.cpp:99
 msgid "35mm Equivalent"
 msgstr ""
 
-#: kfile_jpeg.cpp:103
+#: tdefile_jpeg.cpp:103
 msgid "CCD Width"
 msgstr ""
 
-#: kfile_jpeg.cpp:107
+#: tdefile_jpeg.cpp:107
 msgid "Exposure Time"
 msgstr ""
 
-#: kfile_jpeg.cpp:111
+#: tdefile_jpeg.cpp:111
 msgid "Aperture"
 msgstr ""
 
-#: kfile_jpeg.cpp:114
+#: tdefile_jpeg.cpp:114
 msgid "Focus Dist."
 msgstr ""
 
-#: kfile_jpeg.cpp:117
+#: tdefile_jpeg.cpp:117
 msgid "Exposure Bias"
 msgstr ""
 
-#: kfile_jpeg.cpp:120
+#: tdefile_jpeg.cpp:120
 msgid "Whitebalance"
 msgstr ""
 
-#: kfile_jpeg.cpp:123
+#: tdefile_jpeg.cpp:123
 msgid "Metering Mode"
 msgstr ""
 
-#: kfile_jpeg.cpp:126
+#: tdefile_jpeg.cpp:126
 msgid "Exposure"
 msgstr "Dadleniad"
 
-#: kfile_jpeg.cpp:129
+#: tdefile_jpeg.cpp:129
 msgid "ISO Equiv."
 msgstr ""
 
-#: kfile_jpeg.cpp:132
+#: tdefile_jpeg.cpp:132
 msgid "JPEG Quality"
 msgstr ""
 
-#: kfile_jpeg.cpp:135
+#: tdefile_jpeg.cpp:135
 msgid "User Comment"
 msgstr "Enw'r defnyddiwr"
 
-#: kfile_jpeg.cpp:139
+#: tdefile_jpeg.cpp:139
 msgid "JPEG Process"
 msgstr ""
 
-#: kfile_jpeg.cpp:142
+#: tdefile_jpeg.cpp:142
 msgid "Thumbnail"
 msgstr ""
 
-#: kfile_jpeg.cpp:248
+#: tdefile_jpeg.cpp:248
 msgid "Color"
 msgstr "Lliw"
 
-#: kfile_jpeg.cpp:248
+#: tdefile_jpeg.cpp:248
 msgid "Black and white"
 msgstr "Du a Gwyn"
 
-#: kfile_jpeg.cpp:252
+#: tdefile_jpeg.cpp:252
 msgid ""
 "_: Flash\n"
 "(unknown)"
 msgstr "(anhysbys)"
 
-#: kfile_jpeg.cpp:254
+#: tdefile_jpeg.cpp:254
 msgid ""
 "_: Flash\n"
 "No"
 msgstr "Nage"
 
-#: kfile_jpeg.cpp:259
+#: tdefile_jpeg.cpp:259
 msgid ""
 "_: Flash\n"
 "Fired"
 msgstr ""
 
-#: kfile_jpeg.cpp:264
+#: tdefile_jpeg.cpp:264
 msgid ""
 "_: Flash\n"
 "Fill Fired"
 msgstr ""
 
-#: kfile_jpeg.cpp:267
+#: tdefile_jpeg.cpp:267
 msgid ""
 "_: Flash\n"
 "Off"
 msgstr "I ffwrdd"
 
-#: kfile_jpeg.cpp:270
+#: tdefile_jpeg.cpp:270
 msgid ""
 "_: Flash\n"
 "Auto Off"
 msgstr ""
 
-#: kfile_jpeg.cpp:275
+#: tdefile_jpeg.cpp:275
 msgid ""
 "_: Flash\n"
 "Auto Fired"
 msgstr ""
 
-#: kfile_jpeg.cpp:278
+#: tdefile_jpeg.cpp:278
 msgid ""
 "_: Flash\n"
 "Not Available"
 msgstr "Dim ar gael"
 
-#: kfile_jpeg.cpp:319
+#: tdefile_jpeg.cpp:319
 msgid "Infinite"
 msgstr ""
 
-#: kfile_jpeg.cpp:335 kfile_jpeg.cpp:370 kfile_jpeg.cpp:378 kfile_jpeg.cpp:403
-#: kfile_jpeg.cpp:439 kfile_jpeg.cpp:462
+#: tdefile_jpeg.cpp:335 tdefile_jpeg.cpp:370 tdefile_jpeg.cpp:378 tdefile_jpeg.cpp:403
+#: tdefile_jpeg.cpp:439 tdefile_jpeg.cpp:462
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: kfile_jpeg.cpp:338
+#: tdefile_jpeg.cpp:338
 msgid "Daylight"
 msgstr ""
 
-#: kfile_jpeg.cpp:341
+#: tdefile_jpeg.cpp:341
 msgid "Fluorescent"
 msgstr ""
 
-#: kfile_jpeg.cpp:345
+#: tdefile_jpeg.cpp:345
 msgid "Tungsten"
 msgstr ""
 
-#: kfile_jpeg.cpp:348
+#: tdefile_jpeg.cpp:348
 msgid "Standard light A"
 msgstr ""
 
-#: kfile_jpeg.cpp:351
+#: tdefile_jpeg.cpp:351
 msgid "Standard light B"
 msgstr ""
 
-#: kfile_jpeg.cpp:354
+#: tdefile_jpeg.cpp:354
 msgid "Standard light C"
 msgstr ""
 
-#: kfile_jpeg.cpp:357
+#: tdefile_jpeg.cpp:357
 msgid "D55"
 msgstr ""
 
-#: kfile_jpeg.cpp:360
+#: tdefile_jpeg.cpp:360
 msgid "D65"
 msgstr ""
 
-#: kfile_jpeg.cpp:363
+#: tdefile_jpeg.cpp:363
 msgid "D75"
 msgstr ""
 
-#: kfile_jpeg.cpp:366 kfile_jpeg.cpp:399
+#: tdefile_jpeg.cpp:366 tdefile_jpeg.cpp:399
 msgid "Other"
 msgstr "Arall"
 
-#: kfile_jpeg.cpp:381
+#: tdefile_jpeg.cpp:381
 msgid "Average"
 msgstr "Cyfartaledd"
 
-#: kfile_jpeg.cpp:384
+#: tdefile_jpeg.cpp:384
 msgid "Center weighted average"
 msgstr ""
 
-#: kfile_jpeg.cpp:387
+#: tdefile_jpeg.cpp:387
 msgid "Spot"
 msgstr ""
 
-#: kfile_jpeg.cpp:390
+#: tdefile_jpeg.cpp:390
 msgid "MultiSpot"
 msgstr ""
 
-#: kfile_jpeg.cpp:393
+#: tdefile_jpeg.cpp:393
 msgid "Pattern"
 msgstr "Patrwm"
 
-#: kfile_jpeg.cpp:396
+#: tdefile_jpeg.cpp:396
 msgid "Partial"
 msgstr "Rhannol"
 
-#: kfile_jpeg.cpp:411
+#: tdefile_jpeg.cpp:411
 msgid "Not defined"
 msgstr "Heb ddiffinio"
 
-#: kfile_jpeg.cpp:414
+#: tdefile_jpeg.cpp:414
 msgid "Manual"
 msgstr "Â llaw"
 
-#: kfile_jpeg.cpp:417
+#: tdefile_jpeg.cpp:417
 msgid "Normal program"
 msgstr ""
 
-#: kfile_jpeg.cpp:420
+#: tdefile_jpeg.cpp:420
 msgid "Aperture priority"
 msgstr ""
 
-#: kfile_jpeg.cpp:423
+#: tdefile_jpeg.cpp:423
 msgid "Shutter priority"
 msgstr ""
 
-#: kfile_jpeg.cpp:426
+#: tdefile_jpeg.cpp:426
 msgid ""
 "Creative program\n"
 "(biased toward fast shutter speed)"
 msgstr ""
 
-#: kfile_jpeg.cpp:429
+#: tdefile_jpeg.cpp:429
 msgid ""
 "Action program\n"
 "(biased toward fast shutter speed)"
 msgstr ""
 
-#: kfile_jpeg.cpp:432
+#: tdefile_jpeg.cpp:432
 msgid ""
 "Portrait mode\n"
 "(for closeup photos with the background out of focus)"
 msgstr ""
 
-#: kfile_jpeg.cpp:435
+#: tdefile_jpeg.cpp:435
 msgid ""
 "Landscape mode\n"
 "(for landscape photos with the background in focus)"
 msgstr ""
 
-#: kfile_jpeg.cpp:453
+#: tdefile_jpeg.cpp:453
 msgid "Basic"
 msgstr "Sylfaenol"
 
-#: kfile_jpeg.cpp:456
+#: tdefile_jpeg.cpp:456
 msgid "Normal"
 msgstr "Arferol"
 
-#: kfile_jpeg.cpp:459
+#: tdefile_jpeg.cpp:459
 msgid "Fine"
 msgstr "Main"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_pcx.po b/tde-i18n-cy/messages/tdegraphics/tdefile_pcx.po
index c20e7d77435..6e9dbdee24b 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_pcx.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_pcx.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_pcx.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_pcx.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,30 +9,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_pcx.cpp:66
+#: tdefile_pcx.cpp:66
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_pcx.cpp:69
+#: tdefile_pcx.cpp:69
 msgid "Dimensions"
 msgstr "Dimensiynau"
 
-#: kfile_pcx.cpp:73
+#: tdefile_pcx.cpp:73
 msgid "Bit Depth"
 msgstr ""
 
-#: kfile_pcx.cpp:76
+#: tdefile_pcx.cpp:76
 msgid "Resolution"
 msgstr "Cydraniad"
 
-#: kfile_pcx.cpp:79
+#: tdefile_pcx.cpp:79
 msgid "Compression"
 msgstr "Cywasgu"
 
-#: kfile_pcx.cpp:109
+#: tdefile_pcx.cpp:109
 msgid "Yes (RLE)"
 msgstr ""
 
-#: kfile_pcx.cpp:111
+#: tdefile_pcx.cpp:111
 msgid "None"
 msgstr "Dim"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_pdf.po b/tde-i18n-cy/messages/tdegraphics/tdefile_pdf.po
index dbe9466df99..75c442368ac 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_pdf.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_pdf.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_pdf.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_pdf.po\n"
 "POT-Creation-Date: 2005-04-20 15:05+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,59 +9,59 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_pdf.cpp:39
+#: tdefile_pdf.cpp:39
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_pdf.cpp:43
+#: tdefile_pdf.cpp:43
 msgid "Title"
 msgstr "Teitl"
 
-#: kfile_pdf.cpp:45
+#: tdefile_pdf.cpp:45
 msgid "Subject"
 msgstr "Pwnc"
 
-#: kfile_pdf.cpp:47
+#: tdefile_pdf.cpp:47
 msgid "Author"
 msgstr "Awdur"
 
-#: kfile_pdf.cpp:49
+#: tdefile_pdf.cpp:49
 msgid "Key Words"
 msgstr ""
 
-#: kfile_pdf.cpp:50
+#: tdefile_pdf.cpp:50
 msgid "Creator"
 msgstr "Creuwr"
 
-#: kfile_pdf.cpp:51
+#: tdefile_pdf.cpp:51
 msgid "Producer"
 msgstr ""
 
-#: kfile_pdf.cpp:52
+#: tdefile_pdf.cpp:52
 msgid "Creation Date"
 msgstr "Dyddiad Creu"
 
-#: kfile_pdf.cpp:53
+#: tdefile_pdf.cpp:53
 msgid "Modified"
 msgstr "Addaswyd"
 
-#: kfile_pdf.cpp:54
+#: tdefile_pdf.cpp:54
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: kfile_pdf.cpp:55
+#: tdefile_pdf.cpp:55
 msgid "Protected"
 msgstr "Gwarchodir"
 
-#: kfile_pdf.cpp:56
+#: tdefile_pdf.cpp:56
 msgid "Linearized"
 msgstr ""
 
-#: kfile_pdf.cpp:57
+#: tdefile_pdf.cpp:57
 msgid "Version"
 msgstr "Fersiwn"
 
-#: kfile_pdf.cpp:85
+#: tdefile_pdf.cpp:85
 msgid "Yes (Can Print:%1 Can Copy:%2 Can Change:%3 Can Add notes:%4)"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_png.po b/tde-i18n-cy/messages/tdegraphics/tdefile_png.po
index 66bdccf62a3..7a848c3c32e 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_png.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_png.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_png.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_png.po\n"
 "POT-Creation-Date: 2004-12-16 01:20+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,99 +9,99 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_png.cpp:51
+#: tdefile_png.cpp:51
 msgid "Title"
 msgstr "Teitl"
 
-#: kfile_png.cpp:52
+#: tdefile_png.cpp:52
 msgid "Author"
 msgstr "Awdur"
 
-#: kfile_png.cpp:53
+#: tdefile_png.cpp:53
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: kfile_png.cpp:54
+#: tdefile_png.cpp:54
 msgid "Copyright"
 msgstr "Hawlfraint"
 
-#: kfile_png.cpp:55
+#: tdefile_png.cpp:55
 msgid "Creation Time"
 msgstr "Amser Creu"
 
-#: kfile_png.cpp:56
+#: tdefile_png.cpp:56
 msgid "Software"
 msgstr ""
 
-#: kfile_png.cpp:57
+#: tdefile_png.cpp:57
 msgid "Disclaimer"
 msgstr "Ymwadiad"
 
-#: kfile_png.cpp:59
+#: tdefile_png.cpp:59
 msgid "Source"
 msgstr "Tarddiad"
 
-#: kfile_png.cpp:60 kfile_png.cpp:103
+#: tdefile_png.cpp:60 tdefile_png.cpp:103
 msgid "Comment"
 msgstr "Sylwad"
 
-#: kfile_png.cpp:65
+#: tdefile_png.cpp:65
 msgid "Grayscale"
 msgstr "Graddlwyd"
 
-#: kfile_png.cpp:66 kfile_png.cpp:70 kfile_png.cpp:183 kfile_png.cpp:187
-#: kfile_png.cpp:191
+#: tdefile_png.cpp:66 tdefile_png.cpp:70 tdefile_png.cpp:183 tdefile_png.cpp:187
+#: tdefile_png.cpp:191
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: kfile_png.cpp:67
+#: tdefile_png.cpp:67
 msgid "RGB"
 msgstr "CGwGl (RGB)"
 
-#: kfile_png.cpp:68
+#: tdefile_png.cpp:68
 msgid "Palette"
 msgstr ""
 
-#: kfile_png.cpp:69
+#: tdefile_png.cpp:69
 msgid "Grayscale/Alpha"
 msgstr ""
 
-#: kfile_png.cpp:71
+#: tdefile_png.cpp:71
 msgid "RGB/Alpha"
 msgstr ""
 
-#: kfile_png.cpp:77
+#: tdefile_png.cpp:77
 msgid "Deflate"
 msgstr "Dadchwythu"
 
-#: kfile_png.cpp:82
+#: tdefile_png.cpp:82
 msgid "None"
 msgstr "Dim"
 
-#: kfile_png.cpp:83
+#: tdefile_png.cpp:83
 msgid "Adam7"
 msgstr ""
 
-#: kfile_png.cpp:107
+#: tdefile_png.cpp:107
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_png.cpp:109
+#: tdefile_png.cpp:109
 msgid "Dimensions"
 msgstr "Dimensiynau"
 
-#: kfile_png.cpp:113
+#: tdefile_png.cpp:113
 msgid "Bit Depth"
 msgstr ""
 
-#: kfile_png.cpp:116
+#: tdefile_png.cpp:116
 msgid "Color Mode"
 msgstr "Modd Lliw"
 
-#: kfile_png.cpp:117
+#: tdefile_png.cpp:117
 msgid "Compression"
 msgstr "Cywasgu"
 
-#: kfile_png.cpp:118
+#: tdefile_png.cpp:118
 msgid "Interlace Mode"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_pnm.po b/tde-i18n-cy/messages/tdegraphics/tdefile_pnm.po
index 56240d064a8..a6a317c9780 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_pnm.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_pnm.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_pnm.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_pnm.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,30 +9,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_pnm.cpp:28
+#: tdefile_pnm.cpp:28
 msgid "plain"
 msgstr "plaen"
 
-#: kfile_pnm.cpp:29
+#: tdefile_pnm.cpp:29
 msgid "raw"
 msgstr "amrwd"
 
-#: kfile_pnm.cpp:50
+#: tdefile_pnm.cpp:50
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_pnm.cpp:52
+#: tdefile_pnm.cpp:52
 msgid "Format"
 msgstr "Fformat"
 
-#: kfile_pnm.cpp:54
+#: tdefile_pnm.cpp:54
 msgid "Dimensions"
 msgstr "Dimensiynau"
 
-#: kfile_pnm.cpp:57
+#: tdefile_pnm.cpp:57
 msgid "Bit Depth"
 msgstr ""
 
-#: kfile_pnm.cpp:60
+#: tdefile_pnm.cpp:60
 msgid "Comment"
 msgstr "Sylwad"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_ps.po b/tde-i18n-cy/messages/tdegraphics/tdefile_ps.po
index 2aa5fefe535..7af46bce952 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_ps.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_ps.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_ps.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_ps.po\n"
 "POT-Creation-Date: 2005-03-29 01:16+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,26 +9,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_ps.cpp:49
+#: tdefile_ps.cpp:49
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_ps.cpp:50
+#: tdefile_ps.cpp:50
 msgid "Title"
 msgstr "Teitl"
 
-#: kfile_ps.cpp:51
+#: tdefile_ps.cpp:51
 msgid "Creator"
 msgstr "Creuwr"
 
-#: kfile_ps.cpp:52
+#: tdefile_ps.cpp:52
 msgid "Creation Date"
 msgstr "Dyddiad Creu"
 
-#: kfile_ps.cpp:53
+#: tdefile_ps.cpp:53
 msgid "For"
 msgstr "Ar gyfer"
 
-#: kfile_ps.cpp:54
+#: tdefile_ps.cpp:54
 msgid "Pages"
 msgstr "Tudalennau"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_rgb.po b/tde-i18n-cy/messages/tdegraphics/tdefile_rgb.po
index a3d6251f61d..b967aebdb1c 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_rgb.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_rgb.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_rgb.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_rgb.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,68 +9,68 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_rgb.cpp:44
+#: tdefile_rgb.cpp:44
 msgid "Comment"
 msgstr "Sylwad"
 
-#: kfile_rgb.cpp:46
+#: tdefile_rgb.cpp:46
 msgid "Name"
 msgstr "Enw"
 
-#: kfile_rgb.cpp:51
+#: tdefile_rgb.cpp:51
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_rgb.cpp:53
+#: tdefile_rgb.cpp:53
 msgid "Dimensions"
 msgstr "Dimensiynau"
 
-#: kfile_rgb.cpp:57
+#: tdefile_rgb.cpp:57
 msgid "Bit Depth"
 msgstr ""
 
-#: kfile_rgb.cpp:60
+#: tdefile_rgb.cpp:60
 msgid "Color Mode"
 msgstr "Modd Lliw"
 
-#: kfile_rgb.cpp:61
+#: tdefile_rgb.cpp:61
 msgid "Compression"
 msgstr "Cywasgu"
 
-#: kfile_rgb.cpp:64
+#: tdefile_rgb.cpp:64
 msgid ""
 "_: percentage of avoided vertical redundancy (the higher the better)\n"
 "Shared Rows"
 msgstr ""
 
-#: kfile_rgb.cpp:123
+#: tdefile_rgb.cpp:123
 msgid "Grayscale"
 msgstr "Graddlwyd"
 
-#: kfile_rgb.cpp:125
+#: tdefile_rgb.cpp:125
 msgid "Grayscale/Alpha"
 msgstr ""
 
-#: kfile_rgb.cpp:127
+#: tdefile_rgb.cpp:127
 msgid "RGB"
 msgstr "CGwGl (RGB)"
 
-#: kfile_rgb.cpp:129
+#: tdefile_rgb.cpp:129
 msgid "RGB/Alpha"
 msgstr ""
 
-#: kfile_rgb.cpp:132
+#: tdefile_rgb.cpp:132
 msgid "Uncompressed"
 msgstr ""
 
-#: kfile_rgb.cpp:136
+#: tdefile_rgb.cpp:136
 msgid "Runlength Encoded"
 msgstr ""
 
-#: kfile_rgb.cpp:158
+#: tdefile_rgb.cpp:158
 msgid "None"
 msgstr "Dim"
 
-#: kfile_rgb.cpp:160
+#: tdefile_rgb.cpp:160
 msgid "Unknown"
 msgstr "Anhysbys"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_tga.po b/tde-i18n-cy/messages/tdegraphics/tdefile_tga.po
index 8bf7d3e44ff..e5eb36afca1 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_tga.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_tga.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_tga.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_tga.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,54 +9,54 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_tga.cpp:56
+#: tdefile_tga.cpp:56
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_tga.cpp:60
+#: tdefile_tga.cpp:60
 msgid "Dimensions"
 msgstr "Dimensiynau"
 
-#: kfile_tga.cpp:64
+#: tdefile_tga.cpp:64
 msgid "Bit Depth"
 msgstr ""
 
-#: kfile_tga.cpp:67
+#: tdefile_tga.cpp:67
 msgid "Color Mode"
 msgstr "Modd Lliw"
 
-#: kfile_tga.cpp:68
+#: tdefile_tga.cpp:68
 msgid "Compression"
 msgstr "Cywasgu"
 
-#: kfile_tga.cpp:126
+#: tdefile_tga.cpp:126
 msgid "Color-Mapped"
 msgstr ""
 
-#: kfile_tga.cpp:131
+#: tdefile_tga.cpp:131
 msgid "RGB"
 msgstr "CGwGl (RGB)"
 
-#: kfile_tga.cpp:135
+#: tdefile_tga.cpp:135
 msgid "Black and White"
 msgstr "Du a Gwyn"
 
-#: kfile_tga.cpp:138 kfile_tga.cpp:159
+#: tdefile_tga.cpp:138 tdefile_tga.cpp:159
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: kfile_tga.cpp:145
+#: tdefile_tga.cpp:145
 msgid "Uncompressed"
 msgstr ""
 
-#: kfile_tga.cpp:150
+#: tdefile_tga.cpp:150
 msgid "Runlength Encoded"
 msgstr ""
 
-#: kfile_tga.cpp:153
+#: tdefile_tga.cpp:153
 msgid "Huffman, Delta & RLE"
 msgstr ""
 
-#: kfile_tga.cpp:156
+#: tdefile_tga.cpp:156
 msgid "Huffman, Delta, RLE (4-pass quadtree)"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_tiff.po b/tde-i18n-cy/messages/tdegraphics/tdefile_tiff.po
index 9933446d5a0..6a0d86b37d8 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_tiff.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_tiff.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_tiff.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_tiff.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,198 +9,198 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_tiff.cpp:44
+#: tdefile_tiff.cpp:44
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_tiff.cpp:47
+#: tdefile_tiff.cpp:47
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: kfile_tiff.cpp:50
+#: tdefile_tiff.cpp:50
 msgid "Copyright"
 msgstr "Hawlfraint"
 
-#: kfile_tiff.cpp:52
+#: tdefile_tiff.cpp:52
 msgid "Color Mode"
 msgstr "Modd Lliw"
 
-#: kfile_tiff.cpp:54
+#: tdefile_tiff.cpp:54
 msgid "Dimensions"
 msgstr "Dimensiynau"
 
-#: kfile_tiff.cpp:58
+#: tdefile_tiff.cpp:58
 msgid "Resolution"
 msgstr "Cydraniad"
 
-#: kfile_tiff.cpp:61
+#: tdefile_tiff.cpp:61
 msgid "Bit Depth"
 msgstr ""
 
-#: kfile_tiff.cpp:64
+#: tdefile_tiff.cpp:64
 msgid "Compression"
 msgstr "Cywasgu"
 
-#: kfile_tiff.cpp:66
+#: tdefile_tiff.cpp:66
 msgid "Software"
 msgstr ""
 
-#: kfile_tiff.cpp:68
+#: tdefile_tiff.cpp:68
 msgid "Date/Time"
 msgstr "Dyddiad/Amser"
 
-#: kfile_tiff.cpp:70
+#: tdefile_tiff.cpp:70
 msgid "Artist"
 msgstr "Artist"
 
-#: kfile_tiff.cpp:73
+#: tdefile_tiff.cpp:73
 msgid "Fax Pages"
 msgstr ""
 
-#: kfile_tiff.cpp:76
+#: tdefile_tiff.cpp:76
 msgid "Scanner"
 msgstr "Sganiwr"
 
-#: kfile_tiff.cpp:78
+#: tdefile_tiff.cpp:78
 msgid "Make"
 msgstr "Make"
 
-#: kfile_tiff.cpp:79
+#: tdefile_tiff.cpp:79
 msgid "Model"
 msgstr "Model"
 
-#: kfile_tiff.cpp:85 kfile_tiff.cpp:87
+#: tdefile_tiff.cpp:85 tdefile_tiff.cpp:87
 msgid "Monochrome"
 msgstr "Unlliw"
 
-#: kfile_tiff.cpp:89
+#: tdefile_tiff.cpp:89
 msgid "RGB"
 msgstr "CGwGl (RGB)"
 
-#: kfile_tiff.cpp:91
+#: tdefile_tiff.cpp:91
 msgid "Palette color"
 msgstr ""
 
-#: kfile_tiff.cpp:93
+#: tdefile_tiff.cpp:93
 msgid "Transparency mask"
 msgstr ""
 
-#: kfile_tiff.cpp:95
+#: tdefile_tiff.cpp:95
 msgid "Color separations"
 msgstr ""
 
-#: kfile_tiff.cpp:97
+#: tdefile_tiff.cpp:97
 msgid "YCbCr"
 msgstr ""
 
-#: kfile_tiff.cpp:99
+#: tdefile_tiff.cpp:99
 msgid "CIE Lab"
 msgstr ""
 
-#: kfile_tiff.cpp:102
+#: tdefile_tiff.cpp:102
 msgid "ITU Lab"
 msgstr ""
 
-#: kfile_tiff.cpp:105
+#: tdefile_tiff.cpp:105
 msgid "LOGL"
 msgstr ""
 
-#: kfile_tiff.cpp:107
+#: tdefile_tiff.cpp:107
 msgid "LOGLUV"
 msgstr ""
 
-#: kfile_tiff.cpp:110
+#: tdefile_tiff.cpp:110
 msgid "None"
 msgstr "Dim"
 
-#: kfile_tiff.cpp:112
+#: tdefile_tiff.cpp:112
 msgid "RLE"
 msgstr ""
 
-#: kfile_tiff.cpp:114
+#: tdefile_tiff.cpp:114
 msgid "G3 Fax"
 msgstr ""
 
-#: kfile_tiff.cpp:116
+#: tdefile_tiff.cpp:116
 msgid "G4 Fax"
 msgstr ""
 
-#: kfile_tiff.cpp:118
+#: tdefile_tiff.cpp:118
 msgid "LZW"
 msgstr ""
 
-#: kfile_tiff.cpp:120
+#: tdefile_tiff.cpp:120
 msgid "JPEG"
 msgstr "JPEG"
 
-#: kfile_tiff.cpp:122
+#: tdefile_tiff.cpp:122
 msgid "JPEG DCT"
 msgstr ""
 
-#: kfile_tiff.cpp:125
+#: tdefile_tiff.cpp:125
 msgid "Adobe Deflate"
 msgstr ""
 
-#: kfile_tiff.cpp:128
+#: tdefile_tiff.cpp:128
 msgid "NeXT 2-bit RLE"
 msgstr ""
 
-#: kfile_tiff.cpp:130
+#: tdefile_tiff.cpp:130
 msgid "RLE Word"
 msgstr ""
 
-#: kfile_tiff.cpp:132
+#: tdefile_tiff.cpp:132
 msgid "Packbits"
 msgstr ""
 
-#: kfile_tiff.cpp:134
+#: tdefile_tiff.cpp:134
 msgid "Thunderscan RLE"
 msgstr ""
 
-#: kfile_tiff.cpp:136
+#: tdefile_tiff.cpp:136
 msgid "IT8 CT w/padding"
 msgstr ""
 
-#: kfile_tiff.cpp:138
+#: tdefile_tiff.cpp:138
 msgid "IT8 linework RLE"
 msgstr ""
 
-#: kfile_tiff.cpp:140
+#: tdefile_tiff.cpp:140
 msgid "IT8 monochrome"
 msgstr ""
 
-#: kfile_tiff.cpp:142
+#: tdefile_tiff.cpp:142
 msgid "IT8 binary lineart"
 msgstr ""
 
-#: kfile_tiff.cpp:144
+#: tdefile_tiff.cpp:144
 msgid "Pixar 10-bit LZW"
 msgstr ""
 
-#: kfile_tiff.cpp:146
+#: tdefile_tiff.cpp:146
 msgid "Pixar 11-bit ZIP"
 msgstr ""
 
-#: kfile_tiff.cpp:148
+#: tdefile_tiff.cpp:148
 msgid "Pixar deflate"
 msgstr ""
 
-#: kfile_tiff.cpp:150
+#: tdefile_tiff.cpp:150
 msgid "Kodak DCS"
 msgstr ""
 
-#: kfile_tiff.cpp:152
+#: tdefile_tiff.cpp:152
 msgid "ISO JBIG"
 msgstr ""
 
-#: kfile_tiff.cpp:154
+#: tdefile_tiff.cpp:154
 msgid "SGI log luminance RLE"
 msgstr ""
 
-#: kfile_tiff.cpp:156
+#: tdefile_tiff.cpp:156
 msgid "SGI log 24-bit packed"
 msgstr ""
 
-#: kfile_tiff.cpp:251
+#: tdefile_tiff.cpp:251
 msgid "RGBA"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_xbm.po b/tde-i18n-cy/messages/tdegraphics/tdefile_xbm.po
index 8f85cc5fd16..4199a047cfa 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_xbm.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_xbm.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdegraphics/kfile_xbm.po\n"
+"Project-Id-Version: ../cy/messages//tdegraphics/tdefile_xbm.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_xbm.cpp:54
+#: tdefile_xbm.cpp:54
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_xbm.cpp:58
+#: tdefile_xbm.cpp:58
 msgid "Dimensions"
 msgstr "Dimensiynau"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_xpm.po b/tde-i18n-cy/messages/tdegraphics/tdefile_xpm.po
index e7c26012e63..70ecf5e5fc0 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_xpm.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_xpm.po
@@ -9,14 +9,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_xpm.cpp:42
+#: tdefile_xpm.cpp:42
 msgid "X PixMap File Information"
 msgstr ""
 
-#: kfile_xpm.cpp:47
+#: tdefile_xpm.cpp:47
 msgid "Dimension"
 msgstr ""
 
-#: kfile_xpm.cpp:51
+#: tdefile_xpm.cpp:51
 msgid "Bit Depth"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdelibs/kabc_dir.po b/tde-i18n-cy/messages/tdelibs/tdeabc_dir.po
index fa1d5ff48dd..a81957a8b43 100644
--- a/tde-i18n-cy/messages/tdelibs/kabc_dir.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeabc_dir.po
@@ -1,4 +1,4 @@
-# translation of kabc_dir.po to Cymraeg
+# translation of tdeabc_dir.po to Cymraeg
 # TDE yn Gymraeg.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kabc_dir\n"
+"Project-Id-Version: tdeabc_dir\n"
 "POT-Creation-Date: 2005-05-18 21:23+0200\n"
 "PO-Revision-Date: 2003-11-12 14:05+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/tdelibs/kabc_file.po b/tde-i18n-cy/messages/tdelibs/tdeabc_file.po
index 05ffe128113..dfad4770b22 100644
--- a/tde-i18n-cy/messages/tdelibs/kabc_file.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeabc_file.po
@@ -1,5 +1,5 @@
-# translation of kabc_file.po to Cymraeg
-# Translation of kabc_file.po to Cymraeg
+# translation of tdeabc_file.po to Cymraeg
+# Translation of tdeabc_file.po to Cymraeg
 # TDE yn Gymraeg.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kabc_file\n"
+"Project-Id-Version: tdeabc_file\n"
 "POT-Creation-Date: 2006-06-20 03:54+0200\n"
 "PO-Revision-Date: 2003-11-12 14:09+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/tdelibs/kabc_ldapkio.po b/tde-i18n-cy/messages/tdelibs/tdeabc_ldaptdeio.po
index e59d343f822..32ae988507b 100644
--- a/tde-i18n-cy/messages/tdelibs/kabc_ldapkio.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeabc_ldaptdeio.po
@@ -1,10 +1,10 @@
-# translation of kabc_ldapkio.po to Cymraeg
+# translation of tdeabc_ldapkio.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kabc_ldapkio\n"
+"Project-Id-Version: tdeabc_ldapkio\n"
 "POT-Creation-Date: 2005-05-18 21:23+0200\n"
 "PO-Revision-Date: 2003-11-20 20:07+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/tdelibs/kabc_net.po b/tde-i18n-cy/messages/tdelibs/tdeabc_net.po
index fa68aa7c03a..4858a5a4c1c 100644
--- a/tde-i18n-cy/messages/tdelibs/kabc_net.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeabc_net.po
@@ -1,5 +1,5 @@
-# translation of kabc_net.po to Cymraeg
-# Translation of kabc_net.po to Cymraeg
+# translation of tdeabc_net.po to Cymraeg
+# Translation of tdeabc_net.po to Cymraeg
 # TDE yn Gymraeg.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kabc_net\n"
+"Project-Id-Version: tdeabc_net\n"
 "POT-Creation-Date: 2007-03-05 02:37+0100\n"
 "PO-Revision-Date: 2003-11-12 14:10+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/tdelibs/kabc_sql.po b/tde-i18n-cy/messages/tdelibs/tdeabc_sql.po
index 2a960933255..3f03d51dbf6 100644
--- a/tde-i18n-cy/messages/tdelibs/kabc_sql.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeabc_sql.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdelibs/kabc_sql.po\n"
+"Project-Id-Version: ../cy/messages//tdelibs/tdeabc_sql.po\n"
 "POT-Creation-Date: 2005-05-18 21:23+0200\n"
 "PO-Revision-Date: 2003-05-08 21:18+0000\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/tdelibs/kabcformat_binary.po b/tde-i18n-cy/messages/tdelibs/tdeabcformat_binary.po
index 0372f7e1f3d..f65f4b31596 100644
--- a/tde-i18n-cy/messages/tdelibs/kabcformat_binary.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeabcformat_binary.po
@@ -1,4 +1,4 @@
-# Translation of kabcformat_binary.po to Cymraeg
+# Translation of tdeabcformat_binary.po to Cymraeg
 # TDE yn Gymraeg.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kabcformat_binary\n"
+"Project-Id-Version: tdeabcformat_binary\n"
 "POT-Creation-Date: 2005-05-18 21:23+0200\n"
 "PO-Revision-Date: 2003-07-16 18:24+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdefileaudiopreview.po b/tde-i18n-cy/messages/tdelibs/tdefileaudiopreview.po
index 3793ef971a4..3f5ad55e044 100644
--- a/tde-i18n-cy/messages/tdelibs/tdefileaudiopreview.po
+++ b/tde-i18n-cy/messages/tdelibs/tdefileaudiopreview.po
@@ -1,10 +1,10 @@
-# translation of kfileaudiopreview.po to Cymraeg
+# translation of tdefileaudiopreview.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KGyfieithu <kyfieithu@dotmon.com>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfileaudiopreview\n"
+"Project-Id-Version: tdefileaudiopreview\n"
 "POT-Creation-Date: 2006-10-03 02:33+0200\n"
 "PO-Revision-Date: 2003-07-18 17:00+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: kfileaudiopreview.cpp:67
+#: tdefileaudiopreview.cpp:67
 msgid "Media Player"
 msgstr "Chwaraewr Cyfryngau"
 
-#: kfileaudiopreview.cpp:93
+#: tdefileaudiopreview.cpp:93
 msgid "Play &automatically"
 msgstr "Chwarae'n &ymysgogol"
diff --git a/tde-i18n-cy/messages/tdelibs/kio.po b/tde-i18n-cy/messages/tdelibs/tdeio.po
index 2391b88e1b5..a821cd47072 100644
--- a/tde-i18n-cy/messages/tdelibs/kio.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeio.po
@@ -1,4 +1,4 @@
-# translation of kio.po to Cymraeg
+# translation of tdeio.po to Cymraeg
 # Translation of tdelibs.po to Cymraeg
 # Translation of clearfuzzytest.po to Cymraeg
 # translation of clearfuzzytest.po to Cymraeg
@@ -13,7 +13,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio\n"
+"Project-Id-Version: tdeio\n"
 "POT-Creation-Date: 2008-07-08 01:16+0200\n"
 "PO-Revision-Date: 2004-01-16 09:20+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -24,70 +24,70 @@ msgstr ""
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: kio/netaccess.cpp:67
+#: tdeio/netaccess.cpp:67
 msgid "File '%1' is not readable"
 msgstr "Nid yw'r ffeil '%1' yn ddarllenadwy"
 
-#: kio/netaccess.cpp:438
+#: tdeio/netaccess.cpp:438
 #, fuzzy
 msgid "ERROR: Unknown protocol '%1'"
 msgstr ""
 "Protocol anhysbys '%1'. \n"
 
-#: kio/global.cpp:729 kio/job.cpp:1761 kio/job.cpp:3228 kio/job.cpp:3745
-#: kio/paste.cpp:65
+#: tdeio/global.cpp:729 tdeio/job.cpp:1761 tdeio/job.cpp:3228 tdeio/job.cpp:3745
+#: tdeio/paste.cpp:65
 msgid "File Already Exists"
 msgstr "Ffeil yn Bodoli'n Barod"
 
-#: kio/global.cpp:739 kio/job.cpp:2938
+#: tdeio/global.cpp:739 tdeio/job.cpp:2938
 msgid "Folder Already Exists"
 msgstr "Plygell yn Bodoli'n Barod"
 
-#: kio/job.cpp:3228 kio/job.cpp:3745
+#: tdeio/job.cpp:3228 tdeio/job.cpp:3745
 msgid "Already Exists as Folder"
 msgstr "Yn Bodoli'n Barod fel Plygell"
 
-#: kio/kimageio.cpp:231
+#: tdeio/kimageio.cpp:231
 msgid "All Pictures"
 msgstr "Pob Delwedd"
 
-#: kio/pastedialog.cpp:49
+#: tdeio/pastedialog.cpp:49
 msgid "Data format:"
 msgstr "Fformat data :"
 
-#: kio/renamedlg.cpp:119
+#: tdeio/renamedlg.cpp:119
 msgid "&Rename"
 msgstr "&Ail-enwi"
 
-#: kio/renamedlg.cpp:121
+#: tdeio/renamedlg.cpp:121
 msgid "Suggest New &Name"
 msgstr "Awgrymu Enw &Newydd"
 
-#: kio/renamedlg.cpp:127
+#: tdeio/renamedlg.cpp:127
 msgid "&Skip"
 msgstr "&Hepgor"
 
-#: kio/renamedlg.cpp:130
+#: tdeio/renamedlg.cpp:130
 msgid "&Auto Skip"
 msgstr "Aw&to Hepgor"
 
-#: kio/renamedlg.cpp:135
+#: tdeio/renamedlg.cpp:135
 msgid "&Overwrite"
 msgstr "&Dros-ysgrifennu"
 
-#: kio/renamedlg.cpp:139
+#: tdeio/renamedlg.cpp:139
 msgid "O&verwrite All"
 msgstr "D&ros-ysgrifennu Popeth"
 
-#: kio/renamedlg.cpp:145
+#: tdeio/renamedlg.cpp:145
 msgid "&Resume"
 msgstr "Ai&l-ddechrau"
 
-#: kio/renamedlg.cpp:150
+#: tdeio/renamedlg.cpp:150
 msgid "R&esume All"
 msgstr "Ail-ddech&rau Popeth"
 
-#: kio/renamedlg.cpp:161
+#: tdeio/renamedlg.cpp:161
 msgid ""
 "This action would overwrite '%1' with itself.\n"
 "Please enter a new file name:"
@@ -95,43 +95,43 @@ msgstr ""
 "Buasai'r gweithrediad yma yn ysgrifennu '%1' dros ei hun.\n"
 "Mewnosodwch enw ffeil newydd:"
 
-#: kio/renamedlg.cpp:163
+#: tdeio/renamedlg.cpp:163
 msgid "C&ontinue"
 msgstr "&Mynd ymlaen"
 
-#: kio/renamedlg.cpp:232 kio/renamedlg.cpp:311
+#: tdeio/renamedlg.cpp:232 tdeio/renamedlg.cpp:311
 msgid "An older item named '%1' already exists."
 msgstr "Mae eitem hyn o'r enw '%1' mewn bod yn barod."
 
-#: kio/renamedlg.cpp:234 kio/renamedlg.cpp:313
+#: tdeio/renamedlg.cpp:234 tdeio/renamedlg.cpp:313
 msgid "A similar file named '%1' already exists."
 msgstr "Mae ffeil tebyg o'r enw '%1' mewn bod yn barod."
 
-#: kio/renamedlg.cpp:236 kio/renamedlg.cpp:315
+#: tdeio/renamedlg.cpp:236 tdeio/renamedlg.cpp:315
 msgid "A newer item named '%1' already exists."
 msgstr "Mae eitem iau o'r enw '%1' mewn bod yn barod."
 
-#: kio/renamedlg.cpp:248 kio/renamedlg.cpp:284
+#: tdeio/renamedlg.cpp:248 tdeio/renamedlg.cpp:284
 #, c-format
 msgid "size %1"
 msgstr "maint : %1"
 
-#: kio/renamedlg.cpp:256 kio/renamedlg.cpp:291
+#: tdeio/renamedlg.cpp:256 tdeio/renamedlg.cpp:291
 #, c-format
 msgid "created on %1"
 msgstr "creuwyd ar %1"
 
-#: kio/renamedlg.cpp:263 kio/renamedlg.cpp:298
+#: tdeio/renamedlg.cpp:263 tdeio/renamedlg.cpp:298
 #, c-format
 msgid "modified on %1"
 msgstr "newidwyd ar %1"
 
-#: kio/renamedlg.cpp:273
+#: tdeio/renamedlg.cpp:273
 msgid "The source file is '%1'"
 msgstr "Mae'r ffeil tarddiad yn '%1'"
 
-#: kio/kdirlister.cpp:282 kio/kdirlister.cpp:293 kio/krun.cpp:864
-#: kio/paste.cpp:213 kio/renamedlg.cpp:431
+#: tdeio/kdirlister.cpp:282 tdeio/kdirlister.cpp:293 tdeio/krun.cpp:864
+#: tdeio/paste.cpp:213 tdeio/renamedlg.cpp:431
 #, c-format
 msgid ""
 "Malformed URL\n"
@@ -140,26 +140,26 @@ msgstr ""
 "URL Annilys \n"
 " %1"
 
-#: kio/paste.cpp:49 kio/paste.cpp:115
+#: tdeio/paste.cpp:49 tdeio/paste.cpp:115
 #, fuzzy
 msgid "Filename for clipboard content:"
 msgstr "Enw ffeil i gynnwys gludfwrdd:"
 
-#: kio/paste.cpp:108
+#: tdeio/paste.cpp:108
 msgid "%1 (%2)"
 msgstr "%1(%2)"
 
-#: kio/paste.cpp:123
+#: tdeio/paste.cpp:123
 msgid ""
 "The clipboard has changed since you used 'paste': the chosen data format is no "
 "longer applicable. Please copy again what you wanted to paste."
 msgstr ""
 
-#: kio/paste.cpp:201 kio/paste.cpp:224 kio/paste.cpp:251
+#: tdeio/paste.cpp:201 tdeio/paste.cpp:224 tdeio/paste.cpp:251
 msgid "The clipboard is empty"
 msgstr "Mae'r gludfwrdd yn wag "
 
-#: kio/paste.cpp:299
+#: tdeio/paste.cpp:299
 #, fuzzy, c-format
 msgid ""
 "_n: &Paste File\n"
@@ -168,27 +168,27 @@ msgstr ""
 "%n ffeil\n"
 "%n o ffeiliau"
 
-#: kio/paste.cpp:301
+#: tdeio/paste.cpp:301
 #, c-format
 msgid ""
 "_n: &Paste URL\n"
 "&Paste %n URLs"
 msgstr ""
 
-#: kio/paste.cpp:303
+#: tdeio/paste.cpp:303
 #, fuzzy
 msgid "&Paste Clipboard Contents"
 msgstr "Enw ffeil i gynnwys gludfwrdd:"
 
-#: kio/observer.cpp:332 misc/uiserver.cpp:1218
+#: tdeio/observer.cpp:332 misc/uiserver.cpp:1218
 msgid "The peer SSL certificate appears to be corrupt."
 msgstr "Ymddengys bod tystysgrif SSL y cymar yn llygredig."
 
-#: kio/observer.cpp:332 kio/tcpslavebase.cpp:706 misc/uiserver.cpp:1218
+#: tdeio/observer.cpp:332 tdeio/tcpslavebase.cpp:706 misc/uiserver.cpp:1218
 msgid "SSL"
 msgstr "SSL"
 
-#: kio/chmodjob.cpp:173
+#: tdeio/chmodjob.cpp:173
 #, fuzzy
 msgid ""
 "<qt>Could not modify the ownership of file <b>%1</b>"
@@ -197,69 +197,69 @@ msgstr ""
 "<qt>Methu newid perchnogaeth y ffeil <b>%1</b> Does ganddych dim digon o "
 "hawliau i gyflawni'r newid.</qt>"
 
-#: kio/chmodjob.cpp:173
+#: tdeio/chmodjob.cpp:173
 #, fuzzy
 msgid "&Skip File"
 msgstr "&Ffeil"
 
-#: kio/kfilemetainfo.cpp:844
+#: tdeio/tdefilemetainfo.cpp:844
 msgid "s"
 msgstr "s"
 
-#: kio/kfilemetainfo.cpp:847
+#: tdeio/tdefilemetainfo.cpp:847
 msgid "ms"
 msgstr "ms"
 
-#: kio/kfilemetainfo.cpp:850
+#: tdeio/tdefilemetainfo.cpp:850
 msgid "bps"
 msgstr "bps"
 
-#: kio/kfilemetainfo.cpp:853
+#: tdeio/tdefilemetainfo.cpp:853
 msgid "pixels"
 msgstr "picseli"
 
-#: kio/kfilemetainfo.cpp:856
+#: tdeio/tdefilemetainfo.cpp:856
 msgid "in"
 msgstr "in"
 
-#: kio/kfilemetainfo.cpp:859
+#: tdeio/tdefilemetainfo.cpp:859
 msgid "cm"
 msgstr "cm"
 
-#: kio/kfilemetainfo.cpp:862
+#: tdeio/tdefilemetainfo.cpp:862
 msgid "B"
 msgstr "B"
 
-#: kio/kfilemetainfo.cpp:865
+#: tdeio/tdefilemetainfo.cpp:865
 msgid "KB"
 msgstr "KB"
 
-#: kio/kfilemetainfo.cpp:868
+#: tdeio/tdefilemetainfo.cpp:868
 msgid "fps"
 msgstr "fps"
 
-#: kio/kfilemetainfo.cpp:871
+#: tdeio/tdefilemetainfo.cpp:871
 msgid "dpi"
 msgstr "dpi"
 
-#: kio/kfilemetainfo.cpp:874
+#: tdeio/tdefilemetainfo.cpp:874
 msgid "bpp"
 msgstr "bpp"
 
-#: kio/kfilemetainfo.cpp:877
+#: tdeio/tdefilemetainfo.cpp:877
 msgid "Hz"
 msgstr "Hz"
 
-#: kio/kfilemetainfo.cpp:880
+#: tdeio/tdefilemetainfo.cpp:880
 msgid "mm"
 msgstr "mM"
 
-#: kio/kmimetype.cpp:110
+#: tdeio/kmimetype.cpp:110
 #, fuzzy
 msgid "No mime types installed."
 msgstr "Dim mathau mime wedi eu gosod!"
 
-#: kio/kmimetype.cpp:136
+#: tdeio/kmimetype.cpp:136
 #, c-format
 msgid ""
 "Could not find mime type\n"
@@ -268,11 +268,11 @@ msgstr ""
 "Methu canfod math MIME\n"
 " %1"
 
-#: kio/kmimetype.cpp:796
+#: tdeio/kmimetype.cpp:796
 msgid "The desktop entry file %1 has no Type=... entry."
 msgstr "Mae'r ffeil cofnod penbwrdd  %1 heb gofnod Type= ..."
 
-#: kio/kmimetype.cpp:817
+#: tdeio/kmimetype.cpp:817
 msgid ""
 "The desktop entry of type\n"
 "%1\n"
@@ -282,7 +282,7 @@ msgstr ""
 " %1\n"
 " yn anhysbys."
 
-#: kio/kmimetype.cpp:831 kio/kmimetype.cpp:933 kio/kmimetype.cpp:1115
+#: tdeio/kmimetype.cpp:831 tdeio/kmimetype.cpp:933 tdeio/kmimetype.cpp:1115
 msgid ""
 "The desktop entry file\n"
 "%1\n"
@@ -292,7 +292,7 @@ msgstr ""
 " %1\n"
 " o fath FSDevice ond nid oes cofnod Dev= ... ganddo."
 
-#: kio/kmimetype.cpp:877
+#: tdeio/kmimetype.cpp:877
 msgid ""
 "The desktop entry file\n"
 "%1\n"
@@ -302,19 +302,19 @@ msgstr ""
 " %1\n"
 " o fath Link ond nid oes  cofnod URL= ... ganddo."
 
-#: kio/kmimetype.cpp:943
+#: tdeio/kmimetype.cpp:943
 msgid "Mount"
 msgstr "Gosod"
 
-#: kio/kmimetype.cpp:954
+#: tdeio/kmimetype.cpp:954
 msgid "Eject"
 msgstr "Allfwrw"
 
-#: kio/kmimetype.cpp:956
+#: tdeio/kmimetype.cpp:956
 msgid "Unmount"
 msgstr "Datosod"
 
-#: kio/kmimetype.cpp:1073
+#: tdeio/kmimetype.cpp:1073
 msgid ""
 "The desktop entry file\n"
 "%1\n"
@@ -326,7 +326,7 @@ msgstr ""
 " gyda cofnod dewislen annilys\n"
 " %2."
 
-#: kio/tcpslavebase.cpp:319
+#: tdeio/tcpslavebase.cpp:319
 msgid ""
 "You are about to leave secure mode. Transmissions will no longer be encrypted.\n"
 "This means that a third party could observe your data in transit."
@@ -335,70 +335,70 @@ msgstr ""
 "\n"
 "Golygir hwn y gallai trydydd blaid wylio eich data ar y daith. "
 
-#: kio/tcpslavebase.cpp:325 kio/tcpslavebase.cpp:1087
+#: tdeio/tcpslavebase.cpp:325 tdeio/tcpslavebase.cpp:1087
 msgid "Security Information"
 msgstr "Gwybodaeth Ddiogelwch"
 
-#: kio/tcpslavebase.cpp:326
+#: tdeio/tcpslavebase.cpp:326
 #, fuzzy
 msgid "C&ontinue Loading"
 msgstr "Dal i Lwytho"
 
-#: kio/tcpslavebase.cpp:677
+#: tdeio/tcpslavebase.cpp:677
 msgid "Enter the certificate password:"
 msgstr "Mewnosodwch cyfrinair y tystysgrif:"
 
-#: kio/tcpslavebase.cpp:678
+#: tdeio/tcpslavebase.cpp:678
 msgid "SSL Certificate Password"
 msgstr "Cyfrinair Tystysgrif SSL"
 
-#: kio/tcpslavebase.cpp:691
+#: tdeio/tcpslavebase.cpp:691
 msgid "Unable to open the certificate. Try a new password?"
 msgstr "Methu agor y tystysgrif.  Ceisio cyfrinair newydd?"
 
-#: kio/tcpslavebase.cpp:704
+#: tdeio/tcpslavebase.cpp:704
 msgid "The procedure to set the client certificate for the session failed."
 msgstr "Methodd y weithdrefn i osod y tystysgrif cleient i'r sesiwn."
 
-#: kio/tcpslavebase.cpp:875
+#: tdeio/tcpslavebase.cpp:875
 msgid ""
 "The IP address of the host %1 does not match the one the certificate was issued "
 "to."
 msgstr ""
 "Nid yw cyfeiriad IP gwesteiwr %1 yn cydweddu â'r un a rowyd y tystysgrif iddo."
 
-#: kio/tcpslavebase.cpp:880 kio/tcpslavebase.cpp:888 kio/tcpslavebase.cpp:923
-#: kio/tcpslavebase.cpp:997 kio/tcpslavebase.cpp:1009
-#: kio/tcpslavebase.cpp:1018 kio/tcpslavebase.cpp:1049
+#: tdeio/tcpslavebase.cpp:880 tdeio/tcpslavebase.cpp:888 tdeio/tcpslavebase.cpp:923
+#: tdeio/tcpslavebase.cpp:997 tdeio/tcpslavebase.cpp:1009
+#: tdeio/tcpslavebase.cpp:1018 tdeio/tcpslavebase.cpp:1049
 msgid "Server Authentication"
 msgstr "Dilysiant Gweinydd"
 
-#: kio/tcpslavebase.cpp:881 kio/tcpslavebase.cpp:889 kio/tcpslavebase.cpp:1019
+#: tdeio/tcpslavebase.cpp:881 tdeio/tcpslavebase.cpp:889 tdeio/tcpslavebase.cpp:1019
 msgid "&Details"
 msgstr "&Manylion"
 
-#: kio/tcpslavebase.cpp:882 kio/tcpslavebase.cpp:890
+#: tdeio/tcpslavebase.cpp:882 tdeio/tcpslavebase.cpp:890
 msgid "Co&ntinue"
 msgstr "Par&hau"
 
-#: kio/tcpslavebase.cpp:884 kio/tcpslavebase.cpp:1014
+#: tdeio/tcpslavebase.cpp:884 tdeio/tcpslavebase.cpp:1014
 msgid "The server certificate failed the authenticity test (%1)."
 msgstr "Methodd y tystysgrif gweinydd y prawf dilysiant (%1)."
 
-#: kio/tcpslavebase.cpp:920 kio/tcpslavebase.cpp:1046
+#: tdeio/tcpslavebase.cpp:920 tdeio/tcpslavebase.cpp:1046
 msgid ""
 "Would you like to accept this certificate forever without being prompted?"
 msgstr "Liciwch chi dderbyn y tystysgrif yma am byth heb gofweini arnoch?"
 
-#: kio/tcpslavebase.cpp:924 kio/tcpslavebase.cpp:1050
+#: tdeio/tcpslavebase.cpp:924 tdeio/tcpslavebase.cpp:1050
 msgid "&Forever"
 msgstr "&Am Byth"
 
-#: kio/tcpslavebase.cpp:925 kio/tcpslavebase.cpp:1051
+#: tdeio/tcpslavebase.cpp:925 tdeio/tcpslavebase.cpp:1051
 msgid "&Current Sessions Only"
 msgstr "&Sesiynau Cyfredol yn Unig"
 
-#: kio/tcpslavebase.cpp:996
+#: tdeio/tcpslavebase.cpp:996
 msgid ""
 "You have indicated that you wish to accept this certificate, but it is not "
 "issued to the server who is presenting it. Do you wish to continue loading?"
@@ -406,7 +406,7 @@ msgstr ""
 "Rydych wedi mynegi yr ydych eisiau derbyn y tystysgrif yma, ond nid yw wedi ei "
 "gyhoeddi i'r gweinydd sy'n ei gyflwyno.  Ydych eisiau dal i lwytho?"
 
-#: kio/tcpslavebase.cpp:1008
+#: tdeio/tcpslavebase.cpp:1008
 msgid ""
 "SSL certificate is being rejected as requested. You can disable this in the TDE "
 "Control Center."
@@ -414,11 +414,11 @@ msgstr ""
 "Gwrthodir y tystysgrif fel a ofynwyd.  Gallwch analluogi hyn yn y ganolfan "
 "rheoli TDE."
 
-#: kio/tcpslavebase.cpp:1020
+#: tdeio/tcpslavebase.cpp:1020
 msgid "Co&nnect"
 msgstr "Cy&sylltu"
 
-#: kio/tcpslavebase.cpp:1076
+#: tdeio/tcpslavebase.cpp:1076
 msgid ""
 "You are about to enter secure mode. All transmissions will be encrypted unless "
 "otherwise noted.\n"
@@ -429,53 +429,53 @@ msgstr ""
 "amgriptio onibai i chi glywed yn wahanol. \n"
 "Golygir hyn na allai trydydd blaid wylio eich data yn hawdd ar y daith."
 
-#: kio/tcpslavebase.cpp:1088
+#: tdeio/tcpslavebase.cpp:1088
 #, fuzzy
 msgid "Display SSL &Information"
 msgstr "Dangos Gwybodaeth SSL"
 
-#: kio/tcpslavebase.cpp:1090
+#: tdeio/tcpslavebase.cpp:1090
 msgid "C&onnect"
 msgstr "C&ysylltu"
 
-#: kio/kdcopservicestarter.cpp:64
+#: tdeio/kdcopservicestarter.cpp:64
 #, c-format
 msgid "No service implementing %1"
 msgstr "Nid oes gwasanaeth sy'n gweithredu %1"
 
-#: kio/kscan.cpp:52
+#: tdeio/kscan.cpp:52
 msgid "Acquire Image"
 msgstr "Cipio Delwedd"
 
-#: kio/kscan.cpp:95
+#: tdeio/kscan.cpp:95
 msgid "OCR Image"
 msgstr "Delwedd OCR"
 
-#: kio/defaultprogress.cpp:104
+#: tdeio/defaultprogress.cpp:104
 msgid "Source:"
 msgstr "Tarddiad:"
 
-#: kio/defaultprogress.cpp:111 kio/defaultprogress.cpp:433
+#: tdeio/defaultprogress.cpp:111 tdeio/defaultprogress.cpp:433
 msgid "Destination:"
 msgstr "Cyrchfan:"
 
-#: kio/defaultprogress.cpp:149
+#: tdeio/defaultprogress.cpp:149
 msgid "&Keep this window open after transfer is complete"
 msgstr "&Cadw'r ffenest yma ar agor ar ôl i'r lawrlwythiad orffen"
 
-#: kio/defaultprogress.cpp:157
+#: tdeio/defaultprogress.cpp:157
 msgid "Open &File"
 msgstr "Agor &Ffeil"
 
-#: kio/defaultprogress.cpp:163
+#: tdeio/defaultprogress.cpp:163
 msgid "Open &Destination"
 msgstr "Agor &Cyrchfan"
 
-#: kio/defaultprogress.cpp:179 misc/uiserver.cpp:632
+#: tdeio/defaultprogress.cpp:179 misc/uiserver.cpp:632
 msgid "Progress Dialog"
 msgstr "Deialog Cynnydd"
 
-#: kio/defaultprogress.cpp:226
+#: tdeio/defaultprogress.cpp:226
 #, no-c-format
 msgid ""
 "_n: %n folder\n"
@@ -484,7 +484,7 @@ msgstr ""
 "%n plygell\n"
 "%n o blygyll"
 
-#: kio/defaultprogress.cpp:228
+#: tdeio/defaultprogress.cpp:228
 #, no-c-format
 msgid ""
 "_n: %n file\n"
@@ -493,11 +493,11 @@ msgstr ""
 "%n ffeil\n"
 "%n o ffeiliau"
 
-#: kio/defaultprogress.cpp:239
+#: tdeio/defaultprogress.cpp:239
 msgid "%1 % of %2 "
 msgstr "%1 % o %2"
 
-#: kio/defaultprogress.cpp:241
+#: tdeio/defaultprogress.cpp:241
 #, fuzzy
 msgid ""
 "_n: %1 % of 1 file\n"
@@ -506,36 +506,36 @@ msgstr ""
 "%1 / %n ffeil\n"
 "%1 / %n ffeil"
 
-#: kio/defaultprogress.cpp:243
+#: tdeio/defaultprogress.cpp:243
 msgid "%1 %"
 msgstr "%1 %"
 
-#: kio/defaultprogress.cpp:252
+#: tdeio/defaultprogress.cpp:252
 msgid " (Copying)"
 msgstr "(Copio)"
 
-#: kio/defaultprogress.cpp:255
+#: tdeio/defaultprogress.cpp:255
 msgid " (Moving)"
 msgstr "(Symud)"
 
-#: kio/defaultprogress.cpp:258
+#: tdeio/defaultprogress.cpp:258
 msgid " (Deleting)"
 msgstr "(Dileu)"
 
-#: kio/defaultprogress.cpp:261
+#: tdeio/defaultprogress.cpp:261
 msgid " (Creating)"
 msgstr "(Creu)"
 
-#: kio/defaultprogress.cpp:264
+#: tdeio/defaultprogress.cpp:264
 #, fuzzy
 msgid " (Done)"
 msgstr "&Wedi'i orffen"
 
-#: kio/defaultprogress.cpp:285
+#: tdeio/defaultprogress.cpp:285
 msgid "%1 of %2 complete"
 msgstr "%1 o %2 wedi cwblhau"
 
-#: kio/defaultprogress.cpp:299 kio/defaultprogress.cpp:314
+#: tdeio/defaultprogress.cpp:299 tdeio/defaultprogress.cpp:314
 msgid ""
 "_n: %1 / %n folder\n"
 "%1 / %n folders"
@@ -543,7 +543,7 @@ msgstr ""
 "%1 / %n plygell\n"
 "%1 / %n plygell"
 
-#: kio/defaultprogress.cpp:301 kio/defaultprogress.cpp:317
+#: tdeio/defaultprogress.cpp:301 tdeio/defaultprogress.cpp:317
 msgid ""
 "_n: %1 / %n file\n"
 "%1 / %n files"
@@ -551,104 +551,104 @@ msgstr ""
 "%1 / %n ffeil\n"
 "%1 / %n ffeil"
 
-#: kio/defaultprogress.cpp:325 misc/uiserver.cpp:288
+#: tdeio/defaultprogress.cpp:325 misc/uiserver.cpp:288
 msgid "Stalled"
 msgstr "Wedi seibio"
 
-#: kio/defaultprogress.cpp:327
+#: tdeio/defaultprogress.cpp:327
 msgid "%1/s ( %2 remaining )"
 msgstr "%1/s ( %2 ar ôl )"
 
-#: kio/defaultprogress.cpp:336
+#: tdeio/defaultprogress.cpp:336
 msgid "Copy File(s) Progress"
 msgstr "Cynnydd Copio Ffeil(iau)"
 
-#: kio/defaultprogress.cpp:350
+#: tdeio/defaultprogress.cpp:350
 msgid "Move File(s) Progress"
 msgstr "Cynnydd Symud Ffeil(iau)"
 
-#: kio/defaultprogress.cpp:364
+#: tdeio/defaultprogress.cpp:364
 msgid "Creating Folder"
 msgstr "Creu Plygell"
 
-#: kio/defaultprogress.cpp:376
+#: tdeio/defaultprogress.cpp:376
 msgid "Delete File(s) Progress"
 msgstr "Cynnydd Dileu Ffeil(iau)"
 
-#: kio/defaultprogress.cpp:387
+#: tdeio/defaultprogress.cpp:387
 msgid "Loading Progress"
 msgstr "Llwytho Cynnydd"
 
-#: kio/defaultprogress.cpp:396
+#: tdeio/defaultprogress.cpp:396
 msgid "Examining File Progress"
 msgstr "Archwilio Cynnydd Ffeil"
 
-#: kio/defaultprogress.cpp:403
+#: tdeio/defaultprogress.cpp:403
 #, c-format
 msgid "Mounting %1"
 msgstr "Gosod %1"
 
-#: kio/defaultprogress.cpp:410 misc/uiserver.cpp:378
+#: tdeio/defaultprogress.cpp:410 misc/uiserver.cpp:378
 msgid "Unmounting"
 msgstr "Ddi-osod"
 
-#: kio/defaultprogress.cpp:418
+#: tdeio/defaultprogress.cpp:418
 #, c-format
 msgid "Resuming from %1"
 msgstr "Ail-ddechrau o %1"
 
-#: kio/defaultprogress.cpp:420
+#: tdeio/defaultprogress.cpp:420
 msgid "Not resumable"
 msgstr "Amhosib ail-ddechrau"
 
-#: kio/defaultprogress.cpp:456
+#: tdeio/defaultprogress.cpp:456
 msgid "%1/s (done)"
 msgstr "%1/s (wedi'i wneud)"
 
-#: kio/kservice.cpp:837
+#: tdeio/kservice.cpp:837
 msgid "Updating System Configuration"
 msgstr "Diweddaru Ffurfweddiad Cysawd"
 
-#: kio/kservice.cpp:838
+#: tdeio/kservice.cpp:838
 msgid "Updating system configuration."
 msgstr "Diweddaru ffurfweddiad y cysawd."
 
-#: kio/global.cpp:48 kio/global.cpp:81
+#: tdeio/global.cpp:48 tdeio/global.cpp:81
 msgid "%1 B"
 msgstr "%1 B"
 
-#: kio/global.cpp:62
+#: tdeio/global.cpp:62
 msgid "%1 TB"
 msgstr "%1 TB"
 
-#: kio/global.cpp:64
+#: tdeio/global.cpp:64
 msgid "%1 GB"
 msgstr "%1 GB"
 
-#: kio/global.cpp:70
+#: tdeio/global.cpp:70
 msgid "%1 MB"
 msgstr "%1 MB"
 
-#: kio/global.cpp:76
+#: tdeio/global.cpp:76
 msgid "%1 KB"
 msgstr "%1 KB"
 
-#: kio/global.cpp:86
+#: tdeio/global.cpp:86
 msgid "0 B"
 msgstr ""
 
-#: kio/global.cpp:122
+#: tdeio/global.cpp:122
 msgid ""
 "_n: 1 day %1\n"
 "%n days %1"
 msgstr ""
 
-#: kio/global.cpp:152
+#: tdeio/global.cpp:152
 #, fuzzy
 msgid "No Items"
 msgstr "Nodyn"
 
-#: kio/global.cpp:152
+#: tdeio/global.cpp:152
 #, c-format
 msgid ""
 "_n: One Item\n"
@@ -657,12 +657,12 @@ msgstr ""
 "%n Eitem\n"
 "%n o Eitemau"
 
-#: kio/global.cpp:154
+#: tdeio/global.cpp:154
 #, fuzzy
 msgid "No Files"
 msgstr "Ffeiliau"
 
-#: kio/global.cpp:154
+#: tdeio/global.cpp:154
 #, c-format
 msgid ""
 "_n: One File\n"
@@ -671,16 +671,16 @@ msgstr ""
 "%n Ffeil \n"
 "%n o Ffeiliau"
 
-#: kio/global.cpp:158
+#: tdeio/global.cpp:158
 msgid "(%1 Total)"
 msgstr "(%1 Cyfanswm)"
 
-#: kio/global.cpp:161
+#: tdeio/global.cpp:161
 #, fuzzy
 msgid "No Folders"
 msgstr "Plygell Newydd"
 
-#: kio/global.cpp:161
+#: tdeio/global.cpp:161
 #, c-format
 msgid ""
 "_n: One Folder\n"
@@ -689,22 +689,22 @@ msgstr ""
 "%n Plygell \n"
 "%n Plygell"
 
-#: kio/global.cpp:220
+#: tdeio/global.cpp:220
 #, c-format
 msgid "Could not read %1."
 msgstr "Methu darllen %1."
 
-#: kio/global.cpp:223
+#: tdeio/global.cpp:223
 #, fuzzy, c-format
 msgid "Could not write to %1."
 msgstr "Methu ysgrifennu at %1"
 
-#: kio/global.cpp:226
+#: tdeio/global.cpp:226
 #, fuzzy, c-format
 msgid "Could not start process %1."
 msgstr "Methu dechrau proses %1"
 
-#: kio/global.cpp:229
+#: tdeio/global.cpp:229
 #, c-format
 msgid ""
 "Internal Error\n"
@@ -715,54 +715,54 @@ msgstr ""
 " Gyrrwch adroddiad nam llawn i http://bugs.kde.org\n"
 " %1"
 
-#: kio/global.cpp:232
+#: tdeio/global.cpp:232
 #, c-format
 msgid "Malformed URL %1."
 msgstr "URL annilys %1."
 
-#: kio/global.cpp:235
+#: tdeio/global.cpp:235
 msgid "The protocol %1 is not supported."
 msgstr "Ni chefnogir y protocol %1."
 
-#: kio/global.cpp:238
+#: tdeio/global.cpp:238
 msgid "The protocol %1 is only a filter protocol."
 msgstr "Dim ond protocol hidlo yw protocol %1."
 
-#: kio/global.cpp:245
+#: tdeio/global.cpp:245
 msgid "%1 is a folder, but a file was expected."
 msgstr "Plygell yw %1, ond disgwylwyd ffeil."
 
-#: kio/global.cpp:248
+#: tdeio/global.cpp:248
 msgid "%1 is a file, but a folder was expected."
 msgstr "Ffeil yw %1, ond disgwylwyd plygell."
 
-#: kio/global.cpp:251
+#: tdeio/global.cpp:251
 msgid "The file or folder %1 does not exist."
 msgstr "Nid ydy'r ffeil neu plygell %1 mewn bod."
 
-#: kio/global.cpp:254
+#: tdeio/global.cpp:254
 msgid "A file named %1 already exists."
 msgstr "Mae ffeil o'r enw %1 mewn bod yn barod."
 
-#: kio/global.cpp:257
+#: tdeio/global.cpp:257
 msgid "A folder named %1 already exists."
 msgstr "Mae plygell o'r enw %1 mewn bod yn barod."
 
-#: kio/global.cpp:260
+#: tdeio/global.cpp:260
 msgid "No hostname specified."
 msgstr "Nid yw enw'r gwesteiwr wedi'i benodi."
 
-#: kio/global.cpp:260
+#: tdeio/global.cpp:260
 #, c-format
 msgid "Unknown host %1"
 msgstr "Gwesteiwr anhysbys %1"
 
-#: kio/global.cpp:263
+#: tdeio/global.cpp:263
 #, fuzzy, c-format
 msgid "Access denied to %1."
 msgstr "Gwaharddwyd cyrchiad i %1"
 
-#: kio/global.cpp:266
+#: tdeio/global.cpp:266
 #, fuzzy, c-format
 msgid ""
 "Access denied.\n"
@@ -771,46 +771,46 @@ msgstr ""
 "Gwaharddwyd cyrchiad. \n"
 "Methu ysgrifennu i %1"
 
-#: kio/global.cpp:269
+#: tdeio/global.cpp:269
 #, fuzzy, c-format
 msgid "Could not enter folder %1."
 msgstr "Methu mynd i mewn i blygell %1"
 
-#: kio/global.cpp:272
+#: tdeio/global.cpp:272
 msgid "The protocol %1 does not implement a folder service."
 msgstr "Nid yw'r protocol %1 yn gweithredoli gwasanaeth plygell."
 
-#: kio/global.cpp:275
+#: tdeio/global.cpp:275
 #, fuzzy, c-format
 msgid "Found a cyclic link in %1."
 msgstr "Wedi canfod cyswllt cylchredol yn %1"
 
-#: kio/global.cpp:281
+#: tdeio/global.cpp:281
 #, fuzzy, c-format
 msgid "Found a cyclic link while copying %1."
 msgstr "Wedi canfod cyswllt cylchredol wrth gopïo %1"
 
-#: kio/global.cpp:284
+#: tdeio/global.cpp:284
 #, fuzzy, c-format
 msgid "Could not create socket for accessing %1."
 msgstr "Methu creu soced i gyrchu %1"
 
-#: kio/global.cpp:287
+#: tdeio/global.cpp:287
 #, fuzzy, c-format
 msgid "Could not connect to host %1."
 msgstr "Methu cysylltu i westeiwr %1"
 
-#: kio/global.cpp:290
+#: tdeio/global.cpp:290
 #, fuzzy
 msgid "Connection to host %1 is broken."
 msgstr "Cysylltiad i westeiwr %1 wedi torri"
 
-#: kio/global.cpp:293
+#: tdeio/global.cpp:293
 #, fuzzy
 msgid "The protocol %1 is not a filter protocol."
 msgstr "Nid yw'r protocol %1 yn protocol hidl"
 
-#: kio/global.cpp:296
+#: tdeio/global.cpp:296
 #, c-format
 msgid ""
 "Could not mount device.\n"
@@ -821,7 +821,7 @@ msgstr ""
 " Y gwall a adroddwyd oedd:\n"
 " %1"
 
-#: kio/global.cpp:299
+#: tdeio/global.cpp:299
 #, c-format
 msgid ""
 "Could not unmount device.\n"
@@ -832,76 +832,76 @@ msgstr ""
 " Y gwall a adroddwyd oedd:\n"
 " %1"
 
-#: kio/global.cpp:302
+#: tdeio/global.cpp:302
 #, fuzzy, c-format
 msgid "Could not read file %1."
 msgstr "Methu darllen ffeil %1"
 
-#: kio/global.cpp:305
+#: tdeio/global.cpp:305
 #, fuzzy, c-format
 msgid "Could not write to file %1."
 msgstr "Methu ysgrifennu i ffeil %1"
 
-#: kio/global.cpp:308
+#: tdeio/global.cpp:308
 #, fuzzy, c-format
 msgid "Could not bind %1."
 msgstr "Methu rhwymo %1"
 
-#: kio/global.cpp:311
+#: tdeio/global.cpp:311
 #, fuzzy, c-format
 msgid "Could not listen %1."
 msgstr "Methu gwrando %1"
 
-#: kio/global.cpp:314
+#: tdeio/global.cpp:314
 #, fuzzy, c-format
 msgid "Could not accept %1."
 msgstr "Methu derbyn %1"
 
-#: kio/global.cpp:320
+#: tdeio/global.cpp:320
 #, fuzzy, c-format
 msgid "Could not access %1."
 msgstr "Methu cyrchu %1"
 
-#: kio/global.cpp:323
+#: tdeio/global.cpp:323
 #, fuzzy, c-format
 msgid "Could not terminate listing %1."
 msgstr "Methu terfynnu rhestriad %1"
 
-#: kio/global.cpp:326
+#: tdeio/global.cpp:326
 #, fuzzy, c-format
 msgid "Could not make folder %1."
 msgstr "Methu creu plygell %1"
 
-#: kio/global.cpp:329
+#: tdeio/global.cpp:329
 #, fuzzy, c-format
 msgid "Could not remove folder %1."
 msgstr "Methu gwaredu plygell %1"
 
-#: kio/global.cpp:332
+#: tdeio/global.cpp:332
 #, fuzzy, c-format
 msgid "Could not resume file %1."
 msgstr "Methu ail-ddechrau ffeil %1"
 
-#: kio/global.cpp:335
+#: tdeio/global.cpp:335
 #, fuzzy, c-format
 msgid "Could not rename file %1."
 msgstr "Methu ail-enwi ffeil %1"
 
-#: kio/global.cpp:338
+#: tdeio/global.cpp:338
 #, fuzzy, c-format
 msgid "Could not change permissions for %1."
 msgstr "Methu newid caniatàd i %1"
 
-#: kio/global.cpp:341
+#: tdeio/global.cpp:341
 #, fuzzy, c-format
 msgid "Could not delete file %1."
 msgstr "Methu dileu ffeil %1"
 
-#: kio/global.cpp:344
+#: tdeio/global.cpp:344
 msgid "The process for the %1 protocol died unexpectedly."
 msgstr "Marwodd y broses i brotocol %1 yn annisgwyl."
 
-#: kio/global.cpp:347
+#: tdeio/global.cpp:347
 #, fuzzy, c-format
 msgid ""
 "Error. Out of memory.\n"
@@ -910,7 +910,7 @@ msgstr ""
 "Gwall.  Allan o Gof. \n"
 " %1"
 
-#: kio/global.cpp:350
+#: tdeio/global.cpp:350
 #, c-format
 msgid ""
 "Unknown proxy host\n"
@@ -919,11 +919,11 @@ msgstr ""
 "Gwesteiwr dirprwy anhysbys\n"
 " %1"
 
-#: kio/global.cpp:353
+#: tdeio/global.cpp:353
 msgid "Authorization failed, %1 authentication not supported"
 msgstr "Methu awdurdodi, ni chynhelir dilysiant %1"
 
-#: kio/global.cpp:356
+#: tdeio/global.cpp:356
 #, c-format
 msgid ""
 "User canceled action\n"
@@ -932,7 +932,7 @@ msgstr ""
 "Diddymodd y defnyddiwr y weithred\n"
 " %1"
 
-#: kio/global.cpp:359
+#: tdeio/global.cpp:359
 #, c-format
 msgid ""
 "Internal error in server\n"
@@ -941,7 +941,7 @@ msgstr ""
 "Gwall mewnol yng gweinydd\n"
 " %1"
 
-#: kio/global.cpp:362
+#: tdeio/global.cpp:362
 #, c-format
 msgid ""
 "Timeout on server\n"
@@ -950,7 +950,7 @@ msgstr ""
 "Goramser ar y gweinydd \n"
 " %1"
 
-#: kio/global.cpp:365
+#: tdeio/global.cpp:365
 #, c-format
 msgid ""
 "Unknown error\n"
@@ -959,7 +959,7 @@ msgstr ""
 "Gwall anhysbys \n"
 " %1"
 
-#: kio/global.cpp:368
+#: tdeio/global.cpp:368
 #, c-format
 msgid ""
 "Unknown interrupt\n"
@@ -968,7 +968,7 @@ msgstr ""
 "Ymyriad anhysbys\n"
 " %1"
 
-#: kio/global.cpp:379
+#: tdeio/global.cpp:379
 msgid ""
 "Could not delete original file %1.\n"
 "Please check permissions."
@@ -976,7 +976,7 @@ msgstr ""
 "Methu dileu'r ffeil gwreiddiol %1.\n"
 " Cywirwch y caniatadau."
 
-#: kio/global.cpp:382
+#: tdeio/global.cpp:382
 msgid ""
 "Could not delete partial file %1.\n"
 "Please check permissions."
@@ -984,7 +984,7 @@ msgstr ""
 "Methu dileu ffeil rhannol %1.\n"
 " Cywirwch y caniatadau."
 
-#: kio/global.cpp:385
+#: tdeio/global.cpp:385
 msgid ""
 "Could not rename original file %1.\n"
 "Please check permissions."
@@ -992,7 +992,7 @@ msgstr ""
 "Methu ail-enwi ffeil gwreiddiol %1.\n"
 " Cywirwch y caniatadau."
 
-#: kio/global.cpp:388
+#: tdeio/global.cpp:388
 msgid ""
 "Could not rename partial file %1.\n"
 "Please check permissions."
@@ -1000,7 +1000,7 @@ msgstr ""
 "Methu ail-enwi ffeil rhannol %1.\n"
 " Cywirwch y caniatadau."
 
-#: kio/global.cpp:391
+#: tdeio/global.cpp:391
 msgid ""
 "Could not create symlink %1.\n"
 "Please check permissions."
@@ -1008,7 +1008,7 @@ msgstr ""
 "Methu creu cyswllt symbolaidd %1.\n"
 " Cywirwch y caniatadau."
 
-#: kio/global.cpp:397
+#: tdeio/global.cpp:397
 msgid ""
 "Could not write file %1.\n"
 "Disk full."
@@ -1016,7 +1016,7 @@ msgstr ""
 "Methu ysgrifennu ffeil %1. \n"
 " Mae'r ddisg yn llawn."
 
-#: kio/global.cpp:400
+#: tdeio/global.cpp:400
 #, c-format
 msgid ""
 "The source and destination are the same file.\n"
@@ -1025,16 +1025,16 @@ msgstr ""
 "Yr un un ffeil yw'r tarddiad a'r cyrchfan. \n"
 " %1"
 
-#: kio/global.cpp:406
+#: tdeio/global.cpp:406
 msgid "%1 is required by the server, but is not available."
 msgstr "Mae angen %1 gan y gweinydd, ond nid yw ar gael."
 
-#: kio/global.cpp:409
+#: tdeio/global.cpp:409
 #, fuzzy
 msgid "Access to restricted port in POST denied."
 msgstr "Gwaharddwyd cyrchiad i borth cyfyngedig yn POST"
 
-#: kio/global.cpp:412
+#: tdeio/global.cpp:412
 msgid ""
 "Unknown error code %1\n"
 "%2\n"
@@ -1044,128 +1044,128 @@ msgstr ""
 " %2\n"
 " Anfonwch adroddiad nam llawn i http://bugs.kde.org."
 
-#: kio/global.cpp:422
+#: tdeio/global.cpp:422
 #, fuzzy, c-format
 msgid "Opening connections is not supported with the protocol %1."
 msgstr "Ni chynhelir agor cysylltiadau efo'r protocol %1"
 
-#: kio/global.cpp:424
+#: tdeio/global.cpp:424
 #, fuzzy, c-format
 msgid "Closing connections is not supported with the protocol %1."
 msgstr "Ni chynhelir cau cysylltiadau efo'r protocol %1"
 
-#: kio/global.cpp:426
+#: tdeio/global.cpp:426
 #, fuzzy, c-format
 msgid "Accessing files is not supported with the protocol %1."
 msgstr "Ni chynhelir cyrchu cysylltiadau efo'r protocol %1"
 
-#: kio/global.cpp:428
+#: tdeio/global.cpp:428
 #, fuzzy
 msgid "Writing to %1 is not supported."
 msgstr "Ni chynhelir ysgrifennu at %1"
 
-#: kio/global.cpp:430
+#: tdeio/global.cpp:430
 #, fuzzy, c-format
 msgid "There are no special actions available for protocol %1."
 msgstr "Dim gweithrediadau arbennig ar gael i brotocol %1"
 
-#: kio/global.cpp:432
+#: tdeio/global.cpp:432
 #, fuzzy, c-format
 msgid "Listing folders is not supported for protocol %1."
 msgstr "Ni chynhelir rhestru plygyll efo'r protocol %1"
 
-#: kio/global.cpp:434
+#: tdeio/global.cpp:434
 #, fuzzy
 msgid "Retrieving data from %1 is not supported."
 msgstr "Ni chynhelir nôl data oddiwrth %1"
 
-#: kio/global.cpp:436
+#: tdeio/global.cpp:436
 #, fuzzy
 msgid "Retrieving mime type information from %1 is not supported."
 msgstr "Ni chynhelir nôl data math mime oddiwrth %1"
 
-#: kio/global.cpp:438
+#: tdeio/global.cpp:438
 #, fuzzy
 msgid "Renaming or moving files within %1 is not supported."
 msgstr "Ni chynhelir ail-enwi neu symud ffeiliau tu mewn i %1"
 
-#: kio/global.cpp:440
+#: tdeio/global.cpp:440
 #, fuzzy, c-format
 msgid "Creating symlinks is not supported with protocol %1."
 msgstr "Ni chynhelir creu cysylltau symbolaidd efo'r protocol %1"
 
-#: kio/global.cpp:442
+#: tdeio/global.cpp:442
 #, fuzzy
 msgid "Copying files within %1 is not supported."
 msgstr "Ni chynhelir copïo ffeiliau tu mewn i %1"
 
-#: kio/global.cpp:444
+#: tdeio/global.cpp:444
 #, fuzzy
 msgid "Deleting files from %1 is not supported."
 msgstr "Ni chynhelir dileu ffeiliau o %1"
 
-#: kio/global.cpp:446
+#: tdeio/global.cpp:446
 #, fuzzy, c-format
 msgid "Creating folders is not supported with protocol %1."
 msgstr "Ni chynhelir creu plygyll efo'r protocol %1"
 
-#: kio/global.cpp:448
+#: tdeio/global.cpp:448
 #, fuzzy, c-format
 msgid "Changing the attributes of files is not supported with protocol %1."
 msgstr "Ni chynhelir newid priodoleddau ffeiliau efo'r protocol %1"
 
-#: kio/global.cpp:450
+#: tdeio/global.cpp:450
 #, fuzzy
 msgid "Using sub-URLs with %1 is not supported."
 msgstr "Ni chynhelir defnyddio is-URLs efo %1"
 
-#: kio/global.cpp:452
+#: tdeio/global.cpp:452
 #, fuzzy, c-format
 msgid "Multiple get is not supported with protocol %1."
 msgstr "Ni chynhelir nôl lluosol efo'r protocol %1"
 
-#: kio/global.cpp:454
+#: tdeio/global.cpp:454
 #, fuzzy
 msgid "Protocol %1 does not support action %2."
 msgstr "Nid yw protocol %1 yn cynnal gweithred %2"
 
-#: kio/global.cpp:474 kio/global.cpp:556
+#: tdeio/global.cpp:474 tdeio/global.cpp:556
 msgid "(unknown)"
 msgstr "(anhysbys)"
 
-#: kio/global.cpp:486
+#: tdeio/global.cpp:486
 msgid "<b>Technical reason</b>: "
 msgstr "<b>Rheswm technegol</b>:"
 
-#: kio/global.cpp:487
+#: tdeio/global.cpp:487
 msgid "</p><p><b>Details of the request</b>:"
 msgstr "</p><p><b>Manylion y cais</b>:"
 
-#: kio/global.cpp:488
+#: tdeio/global.cpp:488
 msgid "</p><ul><li>URL: %1</li>"
 msgstr "</p><ul><li>URL: %1</li>"
 
-#: kio/global.cpp:490
+#: tdeio/global.cpp:490
 msgid "<li>Protocol: %1</li>"
 msgstr "<li>Protocol: %1</li>"
 
-#: kio/global.cpp:492
+#: tdeio/global.cpp:492
 msgid "<li>Date and time: %1</li>"
 msgstr "<li>Dyddiad ac Amser: %1</li>"
 
-#: kio/global.cpp:493
+#: tdeio/global.cpp:493
 msgid "<li>Additional information: %1</li></ul>"
 msgstr "<li>Gwybodaeth ychwanegol: %1</li></ul>"
 
-#: kio/global.cpp:495
+#: tdeio/global.cpp:495
 msgid "<p><b>Possible causes</b>:</p><ul><li>"
 msgstr "<p><b>Achosion Posibl</b>:</p><ul><li> "
 
-#: kio/global.cpp:500
+#: tdeio/global.cpp:500
 msgid "<p><b>Possible solutions</b>:</p><ul><li>"
 msgstr "<p><b>Datrysiadau Posibl</b>:</p><ul><li> "
 
-#: kio/global.cpp:566
+#: tdeio/global.cpp:566
 msgid ""
 "Contact your appropriate computer support system, whether the system "
 "administrator, or technical support group for further assistance."
@@ -1173,15 +1173,15 @@ msgstr ""
 "Cysylltwch â'ch cysawd cynnal cyfrifiadur addas (ai'r gwasanaethwr cysawd, "
 "neu'r grw^p cynnal technegol) am fwy o gymorth."
 
-#: kio/global.cpp:569
+#: tdeio/global.cpp:569
 msgid "Contact the administrator of the server for further assistance."
 msgstr "Cysylltwch â gwasanaethwr y gweinydd am fwy o gymorth."
 
-#: kio/global.cpp:572
+#: tdeio/global.cpp:572
 msgid "Check your access permissions on this resource."
 msgstr "Cywirwch eich caniatadau cyrch ar yr adnodd yma."
 
-#: kio/global.cpp:573
+#: tdeio/global.cpp:573
 msgid ""
 "Your access permissions may be inadequate to perform the requested operation on "
 "this resource."
@@ -1189,14 +1189,14 @@ msgstr ""
 "Efallai bod eich caniatadau cyrch yn annigonol i gyflawni'r gweithrediad a "
 "gofynwyd ar yr adnodd yma."
 
-#: kio/global.cpp:575
+#: tdeio/global.cpp:575
 msgid ""
 "The file may be in use (and thus locked) by another user or application."
 msgstr ""
 "Efallai y defnyddir y ffeil gan ddefnyddiwr neu cymhwysiad arall - felly mae o "
 "ar glo."
 
-#: kio/global.cpp:577
+#: tdeio/global.cpp:577
 msgid ""
 "Check to make sure that no other application or user is using the file or has "
 "locked the file."
@@ -1204,15 +1204,15 @@ msgstr ""
 "Cywirwch i sicrhau nad yw cymhwysiad neu ddefnyddiwr arall yn defnyddio'r "
 "ffeil, neu wedi cloi'r ffeil."
 
-#: kio/global.cpp:579
+#: tdeio/global.cpp:579
 msgid "Although unlikely, a hardware error may have occurred."
 msgstr "Er annhebygol, efallai bod gwall caletwedd wedi digwydd."
 
-#: kio/global.cpp:581
+#: tdeio/global.cpp:581
 msgid "You may have encountered a bug in the program."
 msgstr "Efallai eich bod wedi cyfarfod nam yn y rhaglen."
 
-#: kio/global.cpp:582
+#: tdeio/global.cpp:582
 msgid ""
 "This is most likely to be caused by a bug in the program. Please consider "
 "submitting a full bug report as detailed below."
@@ -1220,7 +1220,7 @@ msgstr ""
 "Mae'n eitha debyg yr achosir hynny gan nam yn y rhaglen.  Ystyriedwch gyflwyno "
 "adroddiad nam llawn fel yn y manylion isod."
 
-#: kio/global.cpp:584
+#: tdeio/global.cpp:584
 msgid ""
 "Update your software to the latest version. Your distribution should provide "
 "tools to update your software."
@@ -1228,7 +1228,7 @@ msgstr ""
 "Diweddarwch eich meddalwedd i'r fersiwn diweddaraf.  Mae'n debyg y mae eich "
 "dosbarthiad yn darparu offer i ddiweddaru eich meddalwedd."
 
-#: kio/global.cpp:586
+#: tdeio/global.cpp:586
 msgid ""
 "When all else fails, please consider helping the TDE team or the third party "
 "maintainer of this software by submitting a high quality bug report. If the "
@@ -1246,11 +1246,11 @@ msgstr ""
 ". Os dim, nodwch y manylion uchod, a'u cynnwys yn eich adroddiad nam, efo "
 "cymaint o fanylion eraill ac y meddyliwch bydd o gymorth."
 
-#: kio/global.cpp:594
+#: tdeio/global.cpp:594
 msgid "There may have been a problem with your network connection."
 msgstr "Efallai yr oedd problem efo'ch cysylltiad rhwydwaith."
 
-#: kio/global.cpp:597
+#: tdeio/global.cpp:597
 msgid ""
 "There may have been a problem with your network configuration. If you have been "
 "accessing the Internet with no problems recently, this is unlikely."
@@ -1258,7 +1258,7 @@ msgstr ""
 "Efallai yr oedd problem efo'ch ffurfweddiad rhwydwaith.  Os ydych wedi bod yn "
 "cyrchu'r Rhyngrwyd yn ddiweddar heb broblemau, mae hynny'n annhebyg."
 
-#: kio/global.cpp:600
+#: tdeio/global.cpp:600
 msgid ""
 "There may have been a problem at some point along the network path between the "
 "server and this computer."
@@ -1266,40 +1266,40 @@ msgstr ""
 "Efallai yr oedd problem rhywle ar y llwybr rhwydwaith rhwng y gweinydd a'r "
 "cyfrifiadur yma."
 
-#: kio/global.cpp:602
+#: tdeio/global.cpp:602
 msgid "Try again, either now or at a later time."
 msgstr "Ceisiwch eto, un ai rwan neu yn hwyrach."
 
-#: kio/global.cpp:603
+#: tdeio/global.cpp:603
 msgid "A protocol error or incompatibility may have occurred."
 msgstr "Effallai y ddigwyddodd gwall protocol neu anghydnawsedd."
 
-#: kio/global.cpp:604
+#: tdeio/global.cpp:604
 msgid "Ensure that the resource exists, and try again."
 msgstr "Sicrhewch fod yr adnodd mewn bod, a ceisiwch eto."
 
-#: kio/global.cpp:605
+#: tdeio/global.cpp:605
 msgid "The specified resource may not exist."
 msgstr "Efallai nad yw'r adnodd penodol mewn bod."
 
-#: kio/global.cpp:606
+#: tdeio/global.cpp:606
 msgid "You may have incorrectly typed the location."
 msgstr "Efallai yr ydych wedi cam-deipio'r lleoliad."
 
-#: kio/global.cpp:607
+#: tdeio/global.cpp:607
 msgid "Double-check that you have entered the correct location and try again."
 msgstr ""
 "Sicrhewch yn ofalus yr ydych wedi mewnosod y lleoliad cywir a ceisiwch eto."
 
-#: kio/global.cpp:609
+#: tdeio/global.cpp:609
 msgid "Check your network connection status."
 msgstr "Cywirwch statws eich cysylltiad rhwydwaith."
 
-#: kio/global.cpp:613
+#: tdeio/global.cpp:613
 msgid "Cannot Open Resource For Reading"
 msgstr "Methu Agor Adnodd i'w Ddarllen"
 
-#: kio/global.cpp:614
+#: tdeio/global.cpp:614
 msgid ""
 "This means that the contents of the requested file or folder <strong>%1</strong> "
 "could not be retrieved, as read access could not be obtained."
@@ -1307,16 +1307,16 @@ msgstr ""
 "Golygir hwn nad oedd yn bosib nôl cynnwys y ffeil neu blygell<strong>%1</strong> "
 "a ofynwyd amdano, gan ni ellid cael cyrchiad darllen."
 
-#: kio/global.cpp:617
+#: tdeio/global.cpp:617
 msgid "You may not have permissions to read the file or open the folder."
 msgstr ""
 "Efallai nid oes ganddoch ganiatadau i ddarllen y ffeil neu agor y plygell."
 
-#: kio/global.cpp:623
+#: tdeio/global.cpp:623
 msgid "Cannot Open Resource For Writing"
 msgstr "Methu Agor Adnodd i Ysgrifennu."
 
-#: kio/global.cpp:624
+#: tdeio/global.cpp:624
 msgid ""
 "This means that the file, <strong>%1</strong>, could not be written to as "
 "requested, because access with permission to write could not be obtained."
@@ -1324,15 +1324,15 @@ msgstr ""
 "Golygir hwn nad oedd yn bosib ysgrifennu at y ffeil, <strong>%1</strong>"
 ", a ofynwyd amdano, gan ni ellid cael cyrchiad ysgrifennu."
 
-#: kio/global.cpp:632
+#: tdeio/global.cpp:632
 msgid "Cannot Initiate the %1 Protocol"
 msgstr "Methu Cychwyn y protocol %1"
 
-#: kio/global.cpp:633
+#: tdeio/global.cpp:633
 msgid "Unable to Launch Process"
 msgstr "Methu Lansio Proses"
 
-#: kio/global.cpp:634
+#: tdeio/global.cpp:634
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol could not be started. This is usually due to technical reasons."
@@ -1340,7 +1340,7 @@ msgstr ""
 "Ni ellir dechrau'r rhaglen ar eich cyfrifiadur sy'n darparu cyrchiad i'r "
 "protocol <strong>%1</strong>.  Fel arfer, mae hynny o achos rhesymau technegol."
 
-#: kio/global.cpp:637
+#: tdeio/global.cpp:637
 msgid ""
 "The program which provides compatibility with this protocol may not have been "
 "updated with your last update of TDE. This can cause the program to be "
@@ -1350,11 +1350,11 @@ msgstr ""
 "diweddaru efo'ch diweddariad diwetha o TDE.  Gall hynny achosi'r rhaglen i fod "
 "yn anghytu^n efo'r fersiwn cyfredol, ac felly ni fydd hi'n cychwyn."
 
-#: kio/global.cpp:645
+#: tdeio/global.cpp:645
 msgid "Internal Error"
 msgstr "Gwall Mewnol"
 
-#: kio/global.cpp:646
+#: tdeio/global.cpp:646
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol has reported an internal error."
@@ -1362,11 +1362,11 @@ msgstr ""
 "Mae'r rhaglen ar eich cyfrifiadur sy'n darparu cyrchiad i'r protocol <strong>"
 "%1</strong> wedi adrodd gwall mewnol."
 
-#: kio/global.cpp:654
+#: tdeio/global.cpp:654
 msgid "Improperly Formatted URL"
 msgstr "URL heb ei Fformatio yn Ddilys "
 
-#: kio/global.cpp:655
+#: tdeio/global.cpp:655
 msgid ""
 "The <strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
 "ocator (URL) that you entered was not properly formatted. The format of a URL "
@@ -1380,12 +1380,12 @@ msgstr ""
 "<blockquote><strong>protocol://user@password:www.example.org:port/directory/file"
 "name.extension?query =value</strong></blockquote> "
 
-#: kio/global.cpp:664
+#: tdeio/global.cpp:664
 #, c-format
 msgid "Unsupported Protocol %1"
 msgstr "Ni chyhelir y Protocol %1"
 
-#: kio/global.cpp:665
+#: tdeio/global.cpp:665
 msgid ""
 "The protocol <strong>%1</strong> is not supported by the TDE programs currently "
 "installed on this computer."
@@ -1393,11 +1393,11 @@ msgstr ""
 "Ni chynhelir y protocol <strong>%1</strong> gan y rhaglenni TDE sydd wedi eu "
 "gosod ar hyn o bryd ar y cyfrifiadur yma. "
 
-#: kio/global.cpp:668
+#: tdeio/global.cpp:668
 msgid "The requested protocol may not be supported."
 msgstr "Efallai na chynhelir y protocol a ofynwyd amdano."
 
-#: kio/global.cpp:669
+#: tdeio/global.cpp:669
 msgid ""
 "The versions of the %1 protocol supported by this computer and the server may "
 "be incompatible."
@@ -1405,7 +1405,7 @@ msgstr ""
 "Efallai mae fersiynau'r protocol %1 a gynhelir gan y cyfrifiadur yma a'r "
 "gweinydd yn anghytûn."
 
-#: kio/global.cpp:671
+#: tdeio/global.cpp:671
 #, fuzzy
 msgid ""
 "You may perform a search on the Internet for a TDE program (called a tdeioslave "
@@ -1418,15 +1418,15 @@ msgstr ""
 "href=\"http://apps.kde.com/\">http://apps.kde.com/</a> "
 "a <a href=\"http://freshmeat.net/\">http://freshmeat.net/</a>."
 
-#: kio/global.cpp:680
+#: tdeio/global.cpp:680
 msgid "URL Does Not Refer to a Resource."
 msgstr "Nid yw'r URL yn cyfeirio at adnodd."
 
-#: kio/global.cpp:681
+#: tdeio/global.cpp:681
 msgid "Protocol is a Filter Protocol"
 msgstr "Protocol Hidl yw'r Protocol"
 
-#: kio/global.cpp:682
+#: tdeio/global.cpp:682
 msgid ""
 "The <strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
 "ocator (URL) that you entered did not refer to a specific resource."
@@ -1434,7 +1434,7 @@ msgstr ""
 "Nid oedd y <strong>L</strong>leolydd <strong>A</strong>dnoddau <strong>"
 "U</strong>nffurf (URL) yr ydych wedi cyflwyno yn cyfeirio at adnodd penodol."
 
-#: kio/global.cpp:685
+#: tdeio/global.cpp:685
 msgid ""
 "TDE is able to communicate through a protocol within a protocol; the protocol "
 "specified is only for use in such situations, however this is not one of these "
@@ -1446,12 +1446,12 @@ msgstr ""
 "sefyllfaoedd yma. Mae hwn yn ddigwyddiad eithriadol, a mae'n debyg o ddynodi "
 "gwall rhaglennu."
 
-#: kio/global.cpp:693
+#: tdeio/global.cpp:693
 #, c-format
 msgid "Unsupported Action: %1"
 msgstr "Ni Chynhelir y Gweithrediad: %1"
 
-#: kio/global.cpp:694
+#: tdeio/global.cpp:694
 msgid ""
 "The requested action is not supported by the TDE program which is implementing "
 "the <strong>%1</strong> protocol."
@@ -1459,7 +1459,7 @@ msgstr ""
 "Ni chynhelir y gwethrediad a gofynwyd amdano gan y rhaglen TDE sydd yn "
 "gweithredu y protocol <strong>%1</strong>."
 
-#: kio/global.cpp:697
+#: tdeio/global.cpp:697
 msgid ""
 "This error is very much dependent on the TDE program. The additional "
 "information should give you more information than is available to the TDE "
@@ -1469,15 +1469,15 @@ msgstr ""
 "ychwanegol rhoi fwy o wybodaeth i chi nag sydd ar gael i'r pensaernïaeth "
 "mewnbwn/allbwn TDE."
 
-#: kio/global.cpp:700
+#: tdeio/global.cpp:700
 msgid "Attempt to find another way to accomplish the same outcome."
 msgstr "Ceisio canfod ffordd arall i gyflawni'r un canlyniad."
 
-#: kio/global.cpp:705
+#: tdeio/global.cpp:705
 msgid "File Expected"
 msgstr "Ffeil a Ddisgwylir."
 
-#: kio/global.cpp:706
+#: tdeio/global.cpp:706
 msgid ""
 "The request expected a file, however the folder <strong>%1</strong> "
 "was found instead."
@@ -1485,15 +1485,15 @@ msgstr ""
 "Disgwylodd y cais ffeil, ond wnaeth ganfod y plygell <strong>%1</strong> "
 "yn lle."
 
-#: kio/global.cpp:708
+#: tdeio/global.cpp:708
 msgid "This may be an error on the server side."
 msgstr "Efallai mae gwall ar ochr y gweinydd."
 
-#: kio/global.cpp:713
+#: tdeio/global.cpp:713
 msgid "Folder Expected"
 msgstr "Plygell a Ddisgwylir."
 
-#: kio/global.cpp:714
+#: tdeio/global.cpp:714
 msgid ""
 "The request expected a folder, however the file <strong>%1</strong> "
 "was found instead."
@@ -1501,15 +1501,15 @@ msgstr ""
 "Disgwylodd y cais blygell, ond wnaeth ganfod y ffeil <strong>%1</strong> "
 "yn lle."
 
-#: kio/global.cpp:721
+#: tdeio/global.cpp:721
 msgid "File or Folder Does Not Exist"
 msgstr "Nid yw'r Ffeil neu'r Plygell mewn Bod."
 
-#: kio/global.cpp:722
+#: tdeio/global.cpp:722
 msgid "The specified file or folder <strong>%1</strong> does not exist."
 msgstr "Nid yw'r ffeil neu'r plygell penodol <strong>%1</strong> mewn bod."
 
-#: kio/global.cpp:730
+#: tdeio/global.cpp:730
 msgid ""
 "The requested file could not be created because a file with the same name "
 "already exists."
@@ -1517,21 +1517,21 @@ msgstr ""
 "Ni ellir creu'r ffeil a ofynwyd amdano gan fod ffeil efo'r un enw mewn bod yn "
 "barod."
 
-#: kio/global.cpp:732
+#: tdeio/global.cpp:732
 msgid "Try moving the current file out of the way first, and then try again."
 msgstr ""
 "Ceisiwch symud y ffeil cyfredol allan o'r ffordd yn gyntaf, ac wedyn ceisiwch "
 "eto."
 
-#: kio/global.cpp:734
+#: tdeio/global.cpp:734
 msgid "Delete the current file and try again."
 msgstr "Dileuwch y ffeil cyfredol a ceisiwch eto."
 
-#: kio/global.cpp:735
+#: tdeio/global.cpp:735
 msgid "Choose an alternate filename for the new file."
 msgstr "Dewiswch enw ffeil amgen i'r ffeil newydd."
 
-#: kio/global.cpp:740
+#: tdeio/global.cpp:740
 msgid ""
 "The requested folder could not be created because a folder with the same name "
 "already exists."
@@ -1539,25 +1539,25 @@ msgstr ""
 "Ni ellir creu'r plygell a ofynwyd amdano gan fod plygell efo'r un enw mewn bod "
 "yn barod."
 
-#: kio/global.cpp:742
+#: tdeio/global.cpp:742
 msgid "Try moving the current folder out of the way first, and then try again."
 msgstr ""
 "Ceisiwch symud y plygell cyfredol allan o'r ffordd yn gyntaf, ac wedyn ceisiwch "
 "eto."
 
-#: kio/global.cpp:744
+#: tdeio/global.cpp:744
 msgid "Delete the current folder and try again."
 msgstr "Dileuwch y plygell cyfredol a ceisiwch eto."
 
-#: kio/global.cpp:745
+#: tdeio/global.cpp:745
 msgid "Choose an alternate name for the new folder."
 msgstr "Dewiswch enw amgen i'r plygell newydd."
 
-#: kio/global.cpp:749
+#: tdeio/global.cpp:749
 msgid "Unknown Host"
 msgstr "Gwesteiwr anhysbys"
 
-#: kio/global.cpp:750
+#: tdeio/global.cpp:750
 msgid ""
 "An unknown host error indicates that the server with the requested name, "
 "<strong>%1</strong>, could not be located on the Internet."
@@ -1565,52 +1565,52 @@ msgstr ""
 "Mae gwall gweinydd anhysbys yn dynodi na allir darganfod y gwesteiwr efo'r enw "
 "a ofynwyd amdano, <strong>%1</strong>, ar y Rhyngrwyd. "
 
-#: kio/global.cpp:753
+#: tdeio/global.cpp:753
 msgid ""
 "The name that you typed, %1, may not exist: it may be incorrectly typed."
 msgstr ""
 "Efallai nad yw'r enw yr ydych wedi ei deipio, %1, mewn bod: efallai mae o wedi "
 "ei deipio yn anghywir.  "
 
-#: kio/global.cpp:760
+#: tdeio/global.cpp:760
 msgid "Access Denied"
 msgstr "Gwaharddwyd Cyrchiad."
 
-#: kio/global.cpp:761
+#: tdeio/global.cpp:761
 msgid "Access was denied to the specified resource, <strong>%1</strong>."
 msgstr "Gwaharddwyd cyrchiad i'r adnodd penodol, <strong>%1</strong>."
 
-#: kio/global.cpp:763 kio/global.cpp:979
+#: tdeio/global.cpp:763 tdeio/global.cpp:979
 msgid "You may have supplied incorrect authentication details or none at all."
 msgstr ""
 "Efallai yr ydych wedi darparu manylion dilysu anghywir, neu dim byd o gwbl."
 
-#: kio/global.cpp:765 kio/global.cpp:981
+#: tdeio/global.cpp:765 tdeio/global.cpp:981
 msgid "Your account may not have permission to access the specified resource."
 msgstr "Efallai nad oes caniatàd gan eich cyfrif i gyrchu'r adnodd penodol."
 
-#: kio/global.cpp:767 kio/global.cpp:983 kio/global.cpp:995
+#: tdeio/global.cpp:767 tdeio/global.cpp:983 tdeio/global.cpp:995
 msgid ""
 "Retry the request and ensure your authentication details are entered correctly."
 msgstr ""
 "Ail-geisiwch, a sicrhewch bod eich manylion dilysu wedi eu mewnosod yn gywir."
 
-#: kio/global.cpp:773
+#: tdeio/global.cpp:773
 msgid "Write Access Denied"
 msgstr "Gwaharddwyd Cyrchiad Ysgrifennu"
 
-#: kio/global.cpp:774
+#: tdeio/global.cpp:774
 msgid ""
 "This means that an attempt to write to the file <strong>%1</strong> "
 "was rejected."
 msgstr ""
 "Golygir hwn y gafodd cais i ysgrifennu i'r ffeil <strong>%1</strong> ei wrthod."
 
-#: kio/global.cpp:781
+#: tdeio/global.cpp:781
 msgid "Unable to Enter Folder"
 msgstr "Methu Mynd i mewn i'r Plygell."
 
-#: kio/global.cpp:782
+#: tdeio/global.cpp:782
 msgid ""
 "This means that an attempt to enter (in other words, to open) the requested "
 "folder <strong>%1</strong> was rejected."
@@ -1618,15 +1618,15 @@ msgstr ""
 "Golygir hwn y gafodd cais i fynd i mewn i'r plygell <strong>%1</strong> "
 "(hynny yw, i'w agor) ei wrthod."
 
-#: kio/global.cpp:790
+#: tdeio/global.cpp:790
 msgid "Folder Listing Unavailable"
 msgstr "Nid oes Rhestriad Plygell ar Gael."
 
-#: kio/global.cpp:791
+#: tdeio/global.cpp:791
 msgid "Protocol %1 is not a Filesystem"
 msgstr "Dim cysawd ffeil yw Protocol %1"
 
-#: kio/global.cpp:792
+#: tdeio/global.cpp:792
 msgid ""
 "This means that a request was made which requires determining the contents of "
 "the folder, and the TDE program supporting this protocol is unable to do so."
@@ -1634,11 +1634,11 @@ msgstr ""
 "Golygir hwn y gwnaed cais lle mae angen pederfynu cynnwys y plygell, ac mae'r "
 "rhaglen TDE sy'n cynnal y protocol yma yn methu gwneud."
 
-#: kio/global.cpp:800
+#: tdeio/global.cpp:800
 msgid "Cyclic Link Detected"
 msgstr "Datgelwyd Cyswllt Cylchol"
 
-#: kio/global.cpp:801
+#: tdeio/global.cpp:801
 msgid ""
 "UNIX environments are commonly able to link a file or folder to a separate name "
 "and/or location. TDE detected a link or series of links that results in an "
@@ -1650,7 +1650,7 @@ msgstr ""
 "sy'n creu dolen ddiddiwedd - h.y., roedd y ffeil wedi ei gysylltu (efallai mewn "
 "ffordd cylchfannol) i'w hun."
 
-#: kio/global.cpp:805 kio/global.cpp:827
+#: tdeio/global.cpp:805 tdeio/global.cpp:827
 msgid ""
 "Delete one part of the loop in order that it does not cause an infinite loop, "
 "and try again."
@@ -1658,23 +1658,23 @@ msgstr ""
 "Dileuwch un rhan o'r ddolen fel nad yw'n achosi dolen ddiddiwedd, a ceisiwch "
 "eto."
 
-#: kio/global.cpp:814
+#: tdeio/global.cpp:814
 msgid "Request Aborted By User"
 msgstr "Terfynwyd y Cais gan y Defnyddiwr"
 
-#: kio/global.cpp:815 kio/global.cpp:1108
+#: tdeio/global.cpp:815 tdeio/global.cpp:1108
 msgid "The request was not completed because it was aborted."
 msgstr "Ni chyflawnwyd y cais achos terfynwyd."
 
-#: kio/global.cpp:817 kio/global.cpp:1011 kio/global.cpp:1110
+#: tdeio/global.cpp:817 tdeio/global.cpp:1011 tdeio/global.cpp:1110
 msgid "Retry the request."
 msgstr "Ail-geisio'r cais."
 
-#: kio/global.cpp:821
+#: tdeio/global.cpp:821
 msgid "Cyclic Link Detected During Copy"
 msgstr "Datgelwyd Cyswllt Cylchol wrth Gopïo "
 
-#: kio/global.cpp:822
+#: tdeio/global.cpp:822
 msgid ""
 "UNIX environments are commonly able to link a file or folder to a separate name "
 "and/or location. During the requested copy operation, TDE detected a link or "
@@ -1686,15 +1686,15 @@ msgstr ""
 "datgelu cysylltiad neu gyfres o gysylltiadau sy'n creu dolen ddiddiwedd - h.y., "
 "roedd y ffeil wedi ei gysylltu (efallai mewn ffordd cylchfannol) i'w hun."
 
-#: kio/global.cpp:832
+#: tdeio/global.cpp:832
 msgid "Could Not Create Network Connection"
 msgstr "Methu Creu Cysylltiad Rhwydwaith"
 
-#: kio/global.cpp:833
+#: tdeio/global.cpp:833
 msgid "Could Not Create Socket"
 msgstr "Methu Creu Soced"
 
-#: kio/global.cpp:834
+#: tdeio/global.cpp:834
 msgid ""
 "This is a fairly technical error in which a required device for network "
 "communications (a socket) could not be created."
@@ -1702,7 +1702,7 @@ msgstr ""
 "Mae hwn yn wall go dechnegol, lle ni ellir creu dyfais gofynnol (soced) i "
 "gyfathrebion rhwydwaith."
 
-#: kio/global.cpp:836 kio/global.cpp:949 kio/global.cpp:960 kio/global.cpp:969
+#: tdeio/global.cpp:836 tdeio/global.cpp:949 tdeio/global.cpp:960 tdeio/global.cpp:969
 msgid ""
 "The network connection may be incorrectly configured, or the network interface "
 "may not be enabled."
@@ -1710,11 +1710,11 @@ msgstr ""
 "Efallai mae'r cysylltiad rhwydwaith wedi ei ffurfweddu yn anghywir, neu "
 "analluogir y rhyngwyneb rhwydwaith."
 
-#: kio/global.cpp:842
+#: tdeio/global.cpp:842
 msgid "Connection to Server Refused"
 msgstr "Gwrthodwyd y Cysylltiad i'r Gweinydd"
 
-#: kio/global.cpp:843
+#: tdeio/global.cpp:843
 msgid ""
 "The server <strong>%1</strong> refused to allow this computer to make a "
 "connection."
@@ -1722,7 +1722,7 @@ msgstr ""
 "Gwrthododd y gweinydd <strong>%1</strong> adael i'r cyfrifiadur yma wneud "
 "cyswlltiad."
 
-#: kio/global.cpp:845
+#: tdeio/global.cpp:845
 msgid ""
 "The server, while currently connected to the Internet, may not be configured to "
 "allow requests."
@@ -1730,7 +1730,7 @@ msgstr ""
 "Efallai nad yw'r gweinydd, er ei fod yn gysylltiedig i'r Rhyngrwyd ar hyn o "
 "bryd, wedi ei ffurfweddu i ganiatàu ceisiadau.  "
 
-#: kio/global.cpp:847
+#: tdeio/global.cpp:847
 msgid ""
 "The server, while currently connected to the Internet, may not be running the "
 "requested service (%1)."
@@ -1738,7 +1738,7 @@ msgstr ""
 "Efallai nad yw'r gweinydd, er ei fod yn gysylltiedig i'r Rhyngrwyd ar hyn o "
 "bryd, yn rhedeg y wasanaeth a ofynwyd amdani (%1).  "
 
-#: kio/global.cpp:849
+#: tdeio/global.cpp:849
 msgid ""
 "A network firewall (a device which restricts Internet requests), either "
 "protecting your network or the network of the server, may have intervened, "
@@ -1748,11 +1748,11 @@ msgstr ""
 "sy'n amddiffyn un ai eich rhwydwaith neu rhwydwaith y gweinydd, wedi ymyrryd, a "
 "gwrthod y cais yma. "
 
-#: kio/global.cpp:856
+#: tdeio/global.cpp:856
 msgid "Connection to Server Closed Unexpectedly"
 msgstr "Cauwyd y Cysylltiad i'r Gweinydd yn Annisgwyl"
 
-#: kio/global.cpp:857
+#: tdeio/global.cpp:857
 msgid ""
 "Although a connection was established to <strong>%1</strong>"
 ", the connection was closed at an unexpected point in the communication."
@@ -1760,7 +1760,7 @@ msgstr ""
 "Er bod cysylltiad wedi eu greu i <strong>%1</strong>"
 ", cauwyd y cysylltiad wrth fan annisgwyl yn y cyfathrebu."
 
-#: kio/global.cpp:860
+#: tdeio/global.cpp:860
 msgid ""
 "A protocol error may have occurred, causing the server to close the connection "
 "as a response to the error."
@@ -1768,15 +1768,15 @@ msgstr ""
 "Efallai mae gwall protocol wedi digwydd, yn achosi i'r gweinydd gau'r "
 "cysylltiad fel ymateb i'r gwall."
 
-#: kio/global.cpp:866
+#: tdeio/global.cpp:866
 msgid "URL Resource Invalid"
 msgstr "Adnodd URL Annilys"
 
-#: kio/global.cpp:867
+#: tdeio/global.cpp:867
 msgid "Protocol %1 is not a Filter Protocol"
 msgstr "Nid yw protocol %1 yn Brotocol Hidl"
 
-#: kio/global.cpp:868
+#: tdeio/global.cpp:868
 msgid ""
 "The <strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
 "ocator (URL) that you entered did not refer to a valid mechanism of accessing "
@@ -1786,7 +1786,7 @@ msgstr ""
 "U</strong>nffurf (URL) yr ydych wedi cyflwyno yn cyfeirio at ffordd dilys o "
 "gyrchu'r adnodd penodol, <strong>%1%2</strong>."
 
-#: kio/global.cpp:873
+#: tdeio/global.cpp:873
 msgid ""
 "TDE is able to communicate through a protocol within a protocol. This request "
 "specified a protocol be used as such, however this protocol is not capable of "
@@ -1798,15 +1798,15 @@ msgstr ""
 "gweithrediad o'r fath.  Mae hwn yn ddigwyddiad eithriadol, a mae'n debyg o "
 "ddynodi gwall rhaglennu."
 
-#: kio/global.cpp:881
+#: tdeio/global.cpp:881
 msgid "Unable to Initialize Input/Output Device"
 msgstr "Methu Cychwyn Dyfais Mewnbwn/Allbwn"
 
-#: kio/global.cpp:882
+#: tdeio/global.cpp:882
 msgid "Could Not Mount Device"
 msgstr "Methu Gosod Dyfais"
 
-#: kio/global.cpp:883
+#: tdeio/global.cpp:883
 msgid ""
 "The requested device could not be initialized (\"mounted\"). The reported error "
 "was: <strong>%1</strong>"
@@ -1814,7 +1814,7 @@ msgstr ""
 "Ni ellid ymgychwyn (\"mount\") y dyfais a ofynwyd amdano.  Y gwall a adroddwyd "
 "oedd: <strong>%1</strong>"
 
-#: kio/global.cpp:886
+#: tdeio/global.cpp:886
 msgid ""
 "The device may not be ready, for example there may be no media in a removable "
 "media device (i.e. no CD-ROM in a CD drive), or in the case of a "
@@ -1824,7 +1824,7 @@ msgstr ""
 "dyfais cyfryngau symudadwy (h.y. dim CD-ROM mewn gyriant CD), neu mewn achos "
 "dyfais perifferol/cludadwy efallai nad yw'r dyfais wedi ei gysylltu yn gywir."
 
-#: kio/global.cpp:890
+#: tdeio/global.cpp:890
 msgid ""
 "You may not have permissions to initialize (\"mount\") the device. On UNIX "
 "systems, often system administrator privileges are required to initialize a "
@@ -1834,7 +1834,7 @@ msgstr ""
 "gysodau Unix, y rhan fwyaf o'r amser mae angen hawliau gwasanaethydd cysawd i "
 "ymgychwyn dyfais."
 
-#: kio/global.cpp:894
+#: tdeio/global.cpp:894
 msgid ""
 "Check that the device is ready; removable drives must contain media, and "
 "portable devices must be connected and powered on.; and try again."
@@ -1842,15 +1842,15 @@ msgstr ""
 "Cywirwch bod y dyfais yn barod; rhaid i gyriannau symudadwy gynnwys cyfryngau, "
 "a rhaid i dyfeisiau cludadwy fod wedi eu cysylltu a bod arnodd; ceisiwch eto."
 
-#: kio/global.cpp:900
+#: tdeio/global.cpp:900
 msgid "Unable to Uninitialize Input/Output Device"
 msgstr "Methu Ddi-ymgychwyn Dyfais Mewnbwn/Allbwn"
 
-#: kio/global.cpp:901
+#: tdeio/global.cpp:901
 msgid "Could Not Unmount Device"
 msgstr "Methu Datosod Dyfais"
 
-#: kio/global.cpp:902
+#: tdeio/global.cpp:902
 msgid ""
 "The requested device could not be uninitialized (\"unmounted\"). The reported "
 "error was: <strong>%1</strong>"
@@ -1858,7 +1858,7 @@ msgstr ""
 "Ni ellid ddi-ymgychwyn (\"unmount\") y dyfais a ofynwyd amdano.  Y gwall a "
 "adroddwyd oedd: <strong>%1</strong>"
 
-#: kio/global.cpp:905
+#: tdeio/global.cpp:905
 msgid ""
 "The device may be busy, that is, still in use by another application or user. "
 "Even such things as having an open browser window on a location on this device "
@@ -1868,7 +1868,7 @@ msgstr ""
 "yn dal i'w ddefnyddio.  Mae hyd yn oed pethau fel cadw ffenest porwr ar agor ar "
 "leoliad ar y dyfais yma yn gallu achosi i'r dyfais barhau  mewn defnydd."
 
-#: kio/global.cpp:909
+#: tdeio/global.cpp:909
 msgid ""
 "You may not have permissions to uninitialize (\"unmount\") the device. On UNIX "
 "systems, system administrator privileges are often required to uninitialize a "
@@ -1878,15 +1878,15 @@ msgstr ""
 "gysodau Unix, y rhan fwyaf o'r amser mae angen hawliau gwasanaethydd cysawd i "
 "ddi-ymgychwyn dyfais."
 
-#: kio/global.cpp:913
+#: tdeio/global.cpp:913
 msgid "Check that no applications are accessing the device, and try again."
 msgstr "Cywirwch nad oes cymhwysiadau yn cyrchu'r dyfais, a ceisiwch eto."
 
-#: kio/global.cpp:918
+#: tdeio/global.cpp:918
 msgid "Cannot Read From Resource"
 msgstr "Methu Darllen oddiwrth yr Adnodd"
 
-#: kio/global.cpp:919
+#: tdeio/global.cpp:919
 msgid ""
 "This means that although the resource, <strong>%1</strong>"
 ", was able to be opened, an error occurred while reading the contents of the "
@@ -1895,15 +1895,15 @@ msgstr ""
 "Golygir hwn bod, er roedd yn bosib agor yr adnodd <strong>%1</strong>"
 ", digwyddodd gwall wrth ddarllen cynnwys yr adnodd."
 
-#: kio/global.cpp:922
+#: tdeio/global.cpp:922
 msgid "You may not have permissions to read from the resource."
 msgstr "Efallai nad oes ganddoch caniatadau i ddarllen oddiwrth yr adnodd."
 
-#: kio/global.cpp:931
+#: tdeio/global.cpp:931
 msgid "Cannot Write to Resource"
 msgstr "Methu ysgrifennu at yr adnodd."
 
-#: kio/global.cpp:932
+#: tdeio/global.cpp:932
 msgid ""
 "This means that although the resource, <strong>%1</strong>"
 ", was able to be opened, an error occurred while writing to the resource."
@@ -1911,19 +1911,19 @@ msgstr ""
 "Golygir hwn bod, er roedd yn bosib agor yr adnodd <strong>%1</strong>"
 ", digwyddodd gwall wrth ysgrifennu at yr adnodd."
 
-#: kio/global.cpp:935
+#: tdeio/global.cpp:935
 msgid "You may not have permissions to write to the resource."
 msgstr "Efallai nad oes ganddoch caniatadau i ysgrifennu at yr adnodd."
 
-#: kio/global.cpp:944 kio/global.cpp:955
+#: tdeio/global.cpp:944 tdeio/global.cpp:955
 msgid "Could Not Listen for Network Connections"
 msgstr "Methu Gwrando am Gysylltiadau Rhwydwaith"
 
-#: kio/global.cpp:945
+#: tdeio/global.cpp:945
 msgid "Could Not Bind"
 msgstr "Methu Ymrwymo"
 
-#: kio/global.cpp:946 kio/global.cpp:957
+#: tdeio/global.cpp:946 tdeio/global.cpp:957
 msgid ""
 "This is a fairly technical error in which a required device for network "
 "communications (a socket) could not be established to listen for incoming "
@@ -1932,15 +1932,15 @@ msgstr ""
 "Mae hwn yn wall go dechnegol, lle ni ellir creu dyfais gofynnol (soced) i "
 "gyfathrebion rhwydwaith i wrando am gysylltiadau rhwydwaith cyrhaeddol."
 
-#: kio/global.cpp:956
+#: tdeio/global.cpp:956
 msgid "Could Not Listen"
 msgstr "Methu Gwrando"
 
-#: kio/global.cpp:966
+#: tdeio/global.cpp:966
 msgid "Could Not Accept Network Connection"
 msgstr "Methu Derbyn Cysylltiad Rhwydwaith"
 
-#: kio/global.cpp:967
+#: tdeio/global.cpp:967
 msgid ""
 "This is a fairly technical error in which an error occurred while attempting to "
 "accept an incoming network connection."
@@ -1948,30 +1948,30 @@ msgstr ""
 "Mae hwn yn wall go dechnegol, lle ddigwyddodd gwall wrth ceisio derbyn "
 "cysylltiad rhwydwaith cyrhaeddol."
 
-#: kio/global.cpp:971
+#: tdeio/global.cpp:971
 msgid "You may not have permissions to accept the connection."
 msgstr "Efallai nad oes ganddoch caniatadau i dderbyn y cysylltiad."
 
-#: kio/global.cpp:976
+#: tdeio/global.cpp:976
 #, c-format
 msgid "Could Not Login: %1"
 msgstr "Methu Mewngofnodi: %1"
 
-#: kio/global.cpp:977
+#: tdeio/global.cpp:977
 msgid ""
 "An attempt to login to perform the requested operation was unsuccessful."
 msgstr ""
 "Roedd cais i fewngofnodi i gyflawni'r gweithrediad ceisiedig yn aflwyddiannus."
 
-#: kio/global.cpp:988
+#: tdeio/global.cpp:988
 msgid "Could Not Determine Resource Status"
 msgstr "Methu Pennu Statws yr Adnodd"
 
-#: kio/global.cpp:989
+#: tdeio/global.cpp:989
 msgid "Could Not Stat Resource"
 msgstr "Methu Canfod Statws yr Adnodd"
 
-#: kio/global.cpp:990
+#: tdeio/global.cpp:990
 msgid ""
 "An attempt to determine information about the status of the resource <strong>"
 "%1</strong>, such as the resource name, type, size, etc., was unsuccessful."
@@ -1980,55 +1980,55 @@ msgstr ""
 ", er enghraifft enw yr adnodd, ei fath, ei faint ac yn y blaen, yn "
 "aflwyddiannus."
 
-#: kio/global.cpp:993
+#: tdeio/global.cpp:993
 msgid "The specified resource may not have existed or may not be accessible."
 msgstr "Efallai nad oedd yr adnodd penodol mewn bod, neu ar gael."
 
-#: kio/global.cpp:1001
+#: tdeio/global.cpp:1001
 msgid "Could Not Cancel Listing"
 msgstr "Methu Diddymu'r Rhestriad"
 
-#: kio/global.cpp:1002
+#: tdeio/global.cpp:1002
 msgid "FIXME: Document this"
 msgstr "FIXME: Mae angen dogfennu hyn"
 
-#: kio/global.cpp:1006
+#: tdeio/global.cpp:1006
 msgid "Could Not Create Folder"
 msgstr "Methu Creu Plygell"
 
-#: kio/global.cpp:1007
+#: tdeio/global.cpp:1007
 msgid "An attempt to create the requested folder failed."
 msgstr "Methwyd cais i greu'r plygell a ofynwyd amdano."
 
-#: kio/global.cpp:1008
+#: tdeio/global.cpp:1008
 msgid "The location where the folder was to be created may not exist."
 msgstr "Efallai nad oedd y lleoliad lle roedd eisiau creu'r plygell mewn bod."
 
-#: kio/global.cpp:1015
+#: tdeio/global.cpp:1015
 msgid "Could Not Remove Folder"
 msgstr "Methu Gwaredu Plygell"
 
-#: kio/global.cpp:1016
+#: tdeio/global.cpp:1016
 msgid "An attempt to remove the specified folder, <strong>%1</strong>, failed."
 msgstr "Methwyd cais i ddileu'r plygell penodol, <strong>%1</strong>."
 
-#: kio/global.cpp:1018
+#: tdeio/global.cpp:1018
 msgid "The specified folder may not exist."
 msgstr "Efallai nad yw'r plygell penodol mewn bod."
 
-#: kio/global.cpp:1019
+#: tdeio/global.cpp:1019
 msgid "The specified folder may not be empty."
 msgstr "Efallai nad yw'r plygell penodol yn wag."
 
-#: kio/global.cpp:1022
+#: tdeio/global.cpp:1022
 msgid "Ensure that the folder exists and is empty, and try again."
 msgstr "Sicrhewch fod y plygell mewn bod ac yn wag, a ceisiwch eto."
 
-#: kio/global.cpp:1027
+#: tdeio/global.cpp:1027
 msgid "Could Not Resume File Transfer"
 msgstr "Methu Ail-gychwyn Trosglwyddo'r Ffeil"
 
-#: kio/global.cpp:1028
+#: tdeio/global.cpp:1028
 msgid ""
 "The specified request asked that the transfer of file <strong>%1</strong> "
 "be resumed at a certain point of the transfer. This was not possible."
@@ -2037,47 +2037,47 @@ msgstr ""
 "gael ei ail-gychwyn mewn man arbennig o'r trosglwyddiad.  Nid oedd hyn yn "
 "bosib."
 
-#: kio/global.cpp:1031
+#: tdeio/global.cpp:1031
 msgid "The protocol, or the server, may not support file resuming."
 msgstr ""
 "Efallai nid yw'r protocol neu'r gweinydd yn cynnal ail-gychwyn y ffeil."
 
-#: kio/global.cpp:1033
+#: tdeio/global.cpp:1033
 msgid "Retry the request without attempting to resume transfer."
 msgstr "Ail-geisiwch, heb geisio ail-gychwyn y trosgwyddiad."
 
-#: kio/global.cpp:1038
+#: tdeio/global.cpp:1038
 msgid "Could Not Rename Resource"
 msgstr "Methu Ail-enwi yr Adnodd"
 
-#: kio/global.cpp:1039
+#: tdeio/global.cpp:1039
 msgid "An attempt to rename the specified resource <strong>%1</strong> failed."
 msgstr "Methwyd cais i ail-enwi'r adnodd penodol <strong>%1</strong>."
 
-#: kio/global.cpp:1047
+#: tdeio/global.cpp:1047
 msgid "Could Not Alter Permissions of Resource"
 msgstr "Methu Newid Caniatadau'r Adnodd"
 
-#: kio/global.cpp:1048
+#: tdeio/global.cpp:1048
 msgid ""
 "An attempt to alter the permissions on the specified resource <strong>"
 "%1</strong> failed."
 msgstr ""
 "Methwyd cais i newid caniatadau ar yr adnodd penodol <strong>%1</strong>."
 
-#: kio/global.cpp:1055
+#: tdeio/global.cpp:1055
 msgid "Could Not Delete Resource"
 msgstr "Methu Dileu'r Adnodd"
 
-#: kio/global.cpp:1056
+#: tdeio/global.cpp:1056
 msgid "An attempt to delete the specified resource <strong>%1</strong> failed."
 msgstr "Methwyd cais i ddileu'r adnodd penodol <strong>%1</strong>."
 
-#: kio/global.cpp:1063
+#: tdeio/global.cpp:1063
 msgid "Unexpected Program Termination"
 msgstr "Terfynwyd y Rhaglen yn Annisgwyl"
 
-#: kio/global.cpp:1064
+#: tdeio/global.cpp:1064
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol has unexpectedly terminated."
@@ -2085,11 +2085,11 @@ msgstr ""
 "Mae'r rhaglen ar eich cyfrifiadur sy'n darparu cyrchiad i'r protocol <strong>"
 "%1</strong> wedi terfynu yn annisgwyl."
 
-#: kio/global.cpp:1072
+#: tdeio/global.cpp:1072
 msgid "Out of Memory"
 msgstr "Allan o Gof."
 
-#: kio/global.cpp:1073
+#: tdeio/global.cpp:1073
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol could not obtain the memory required to continue."
@@ -2097,11 +2097,11 @@ msgstr ""
 "Ni allai'r rhaglen ar eich cyfrifiadur sy'n darparu cyrchiad i'r protocol "
 "<strong>%1</strong> gael digon o gof i barhau."
 
-#: kio/global.cpp:1081
+#: tdeio/global.cpp:1081
 msgid "Unknown Proxy Host"
 msgstr "Gwesteiwr Dirpwry Anhysbys"
 
-#: kio/global.cpp:1082
+#: tdeio/global.cpp:1082
 msgid ""
 "While retrieving information about the specified proxy host, <strong>%1</strong>"
 ", an Unknown Host error was encountered. An unknown host error indicates that "
@@ -2111,7 +2111,7 @@ msgstr ""
 ", canfodwyd gwall Gwesteiwr Anhysbys.  Mae gwall gwesteiwr anhysbys yn dynodi "
 "na ellid lleoli'r enw ceisiedig ar y Rhyngrwyd."
 
-#: kio/global.cpp:1086
+#: tdeio/global.cpp:1086
 #, fuzzy
 msgid ""
 "There may have been a problem with your network configuration, specifically "
@@ -2122,15 +2122,15 @@ msgstr ""
 "gwesteiwr dirpwry.  Os ydych wedi bod yn cyrchu'r Rhyngrwyd heb broblemau yn "
 "ddiweddar, mae hyn yn anhebyg."
 
-#: kio/global.cpp:1090
+#: tdeio/global.cpp:1090
 msgid "Double-check your proxy settings and try again."
 msgstr "Cywirwch eich gosodiadau dirprwy a ceisiwch eto."
 
-#: kio/global.cpp:1095
+#: tdeio/global.cpp:1095
 msgid "Authentication Failed: Method %1 Not Supported"
 msgstr "Methodd Dilysiant: Ni Chynhelir Dull %1"
 
-#: kio/global.cpp:1097
+#: tdeio/global.cpp:1097
 #, c-format
 msgid ""
 "Although you may have supplied the correct authentication details, the "
@@ -2141,7 +2141,7 @@ msgstr ""
 "ni chynhelir y dull a ddefnyddir gan y gweinydd gan y rhaglen TDE sy'n "
 "cyflawni'r protocol %1."
 
-#: kio/global.cpp:1101
+#: tdeio/global.cpp:1101
 msgid ""
 "Please file a bug at <a href=\"http://bugs.kde.org/\">http://bugs.kde.org/</a> "
 "to inform the TDE team of the unsupported authentication method."
@@ -2149,15 +2149,15 @@ msgstr ""
 "Cyflwynwch nam wrth <a href=\"http://bugs.kde.org/\">http://bugs.kde.org/</a> "
 "i hysbysu'r tîm TDE am y dull dilysiant na chynhelir."
 
-#: kio/global.cpp:1107
+#: tdeio/global.cpp:1107
 msgid "Request Aborted"
 msgstr "Ataliwyd y Cais"
 
-#: kio/global.cpp:1114
+#: tdeio/global.cpp:1114
 msgid "Internal Error in Server"
 msgstr "Camgymeriad Mewnol yn y Gweinydd"
 
-#: kio/global.cpp:1115
+#: tdeio/global.cpp:1115
 msgid ""
 "The program on the server which provides access to the <strong>%1</strong> "
 "protocol has reported an internal error: %0."
@@ -2165,7 +2165,7 @@ msgstr ""
 "Mae'r rhaglen ar y gweinydd sy'n darparu cyrchiad i'r protocol <strong>"
 "%1</strong> wedi adrodd gwall mewnol: %0."
 
-#: kio/global.cpp:1118
+#: tdeio/global.cpp:1118
 msgid ""
 "This is most likely to be caused by a bug in the server program. Please "
 "consider submitting a full bug report as detailed below."
@@ -2173,11 +2173,11 @@ msgstr ""
 "Achosir hyn gan nam, mwy na thebyg.  Ystyriedwch cyflwyno adrodd nam llawn, yn "
 "ôl y manylion isod."
 
-#: kio/global.cpp:1121
+#: tdeio/global.cpp:1121
 msgid "Contact the administrator of the server to advise them of the problem."
 msgstr "Cysylltwch â gwasanaethwr y gweinuydd i'w gynghori am y problem."
 
-#: kio/global.cpp:1123
+#: tdeio/global.cpp:1123
 msgid ""
 "If you know who the authors of the server software are, submit the bug report "
 "directly to them."
@@ -2185,11 +2185,11 @@ msgstr ""
 "Os wyddoch pwy yw awduron y feddalwedd weinydd, cyflwynwch yr adrodd nam yn "
 "uniongyrchol iddynt."
 
-#: kio/global.cpp:1128
+#: tdeio/global.cpp:1128
 msgid "Timeout Error"
 msgstr "Gwall goramser"
 
-#: kio/global.cpp:1129
+#: tdeio/global.cpp:1129
 msgid ""
 "Although contact was made with the server, a response was not received within "
 "the amount of time allocated for the request as follows:"
@@ -2209,15 +2209,15 @@ msgstr ""
 "Noder y gallwch newid y gosodiadau goramser yn y Ganolfan Rheoli TDE, drwy "
 "ddewis Rhwydwaith -> Hoffiannau."
 
-#: kio/global.cpp:1140
+#: tdeio/global.cpp:1140
 msgid "The server was too busy responding to other requests to respond."
 msgstr "Roedd y gweinydd yn rhy brysur yn ymateb i geisiadau eraill i ymateb."
 
-#: kio/global.cpp:1146
+#: tdeio/global.cpp:1146
 msgid "Unknown Error"
 msgstr "Gwall Anhysbys"
 
-#: kio/global.cpp:1147
+#: tdeio/global.cpp:1147
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol has reported an unknown error: %2."
@@ -2225,11 +2225,11 @@ msgstr ""
 "Mae'r rhaglen ar y gweinydd sy'n darparu cyrchiad i'r protocol <strong>"
 "%1</strong> wedi adrodd gwall mewnol: %2."
 
-#: kio/global.cpp:1155
+#: tdeio/global.cpp:1155
 msgid "Unknown Interruption"
 msgstr "Ymyriad Anhysbys"
 
-#: kio/global.cpp:1156
+#: tdeio/global.cpp:1156
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol has reported an interruption of an unknown type: %2."
@@ -2237,11 +2237,11 @@ msgstr ""
 "Mae'r rhaglen ar y gweinydd sy'n darparu cyrchiad i'r protocol <strong>"
 "%1</strong> wedi adrodd ymyriad o fath anhysbys: %2."
 
-#: kio/global.cpp:1164
+#: tdeio/global.cpp:1164
 msgid "Could Not Delete Original File"
 msgstr "Methu Dileu Ffeil Gwreiddiol"
 
-#: kio/global.cpp:1165
+#: tdeio/global.cpp:1165
 msgid ""
 "The requested operation required the deleting of the original file, most likely "
 "at the end of a file move operation. The original file <strong>%1</strong> "
@@ -2251,11 +2251,11 @@ msgstr ""
 "gweithrediad symud ffeil, mwy na thebyg.  Ni ellid dileu'r ffeil gwreiddiol "
 "<strong>%1</strong>."
 
-#: kio/global.cpp:1174
+#: tdeio/global.cpp:1174
 msgid "Could Not Delete Temporary File"
 msgstr "Methu Dileu Ffeil Dros Dro"
 
-#: kio/global.cpp:1175
+#: tdeio/global.cpp:1175
 msgid ""
 "The requested operation required the creation of a temporary file in which to "
 "save the new file while being downloaded. This temporary file <strong>"
@@ -2265,11 +2265,11 @@ msgstr ""
 "newydd  wrth iddo gael ei lawrlwytho.  Ni ellid dileu'r ffeil dros dro <strong>"
 "%1</strong>."
 
-#: kio/global.cpp:1184
+#: tdeio/global.cpp:1184
 msgid "Could Not Rename Original File"
 msgstr "Methu Ail-enwi Ffeil Gwreiddiol"
 
-#: kio/global.cpp:1185
+#: tdeio/global.cpp:1185
 msgid ""
 "The requested operation required the renaming of the original file <strong>"
 "%1</strong>, however it could not be renamed."
@@ -2277,11 +2277,11 @@ msgstr ""
 "Roedd gan y weithrediad ceisiedig angen ail-enwi'r ffeil gwreiddiol <strong>"
 "%1</strong>.  Ond ni ellid ail-enwi'r ffeil."
 
-#: kio/global.cpp:1193
+#: tdeio/global.cpp:1193
 msgid "Could Not Rename Temporary File"
 msgstr "Methu Ail-enwi Ffeil Dro Dro"
 
-#: kio/global.cpp:1194
+#: tdeio/global.cpp:1194
 msgid ""
 "The requested operation required the creation of a temporary file <strong>"
 "%1</strong>, however it could not be created."
@@ -2289,27 +2289,27 @@ msgstr ""
 "Roedd gan y weithrediad ceisiedig angen greu ffeil dros dro <strong>%1</strong>"
 ".  Ond ni ellid creu'r ffeil."
 
-#: kio/global.cpp:1202
+#: tdeio/global.cpp:1202
 msgid "Could Not Create Link"
 msgstr "Methu Creu Cyswllt"
 
-#: kio/global.cpp:1203
+#: tdeio/global.cpp:1203
 msgid "Could Not Create Symbolic Link"
 msgstr "Methu Creu Cyswllt Symbolaidd"
 
-#: kio/global.cpp:1204
+#: tdeio/global.cpp:1204
 msgid "The requested symbolic link %1 could not be created."
 msgstr "Methu creu y cyswllt symbolaidd %1 a ofynwyd amdano."
 
-#: kio/global.cpp:1211
+#: tdeio/global.cpp:1211
 msgid "No Content"
 msgstr "Dim Cynnwys"
 
-#: kio/global.cpp:1216
+#: tdeio/global.cpp:1216
 msgid "Disk Full"
 msgstr "Disg Llawn"
 
-#: kio/global.cpp:1217
+#: tdeio/global.cpp:1217
 msgid ""
 "The requested file <strong>%1</strong> could not be written to as there is "
 "inadequate disk space."
@@ -2317,7 +2317,7 @@ msgstr ""
 "Ni ellid ysgrifennu at y ffeil ceisiedig <strong>%1</strong> "
 "gan fod diffyg lle ar y ddisg."
 
-#: kio/global.cpp:1219
+#: tdeio/global.cpp:1219
 msgid ""
 "Free up enough disk space by 1) deleting unwanted and temporary files; 2) "
 "archiving files to removable media storage such as CD-Recordable discs; or 3) "
@@ -2327,11 +2327,11 @@ msgstr ""
 "archifo ffeiliau i gronfa cyfryngau symudadwy fel disgiau CD-Cofnodi; neu 3) "
 "darganfod mwy o le cronfa."
 
-#: kio/global.cpp:1226
+#: tdeio/global.cpp:1226
 msgid "Source and Destination Files Identical"
 msgstr "Ffeiliau Tarddiad a Cyrchfan yn Unwy"
 
-#: kio/global.cpp:1227
+#: tdeio/global.cpp:1227
 msgid ""
 "The operation could not be completed because the source and destination files "
 "are the same file."
@@ -2339,51 +2339,51 @@ msgstr ""
 "Methu cwblhau'r gweithrediad gan fod ffeil tarddiad a ffeil cyrchfan yr un un "
 "ffeil."
 
-#: kio/global.cpp:1229
+#: tdeio/global.cpp:1229
 #, fuzzy
 msgid "Choose a different filename for the destination file."
 msgstr "Dewiswch enw ffeil gwahanol i'r ffeil cyrchfan."
 
-#: kio/global.cpp:1240
+#: tdeio/global.cpp:1240
 msgid "Undocumented Error"
 msgstr "Gwall Heb ei Ddogfennu"
 
-#: kio/statusbarprogress.cpp:132
+#: tdeio/statusbarprogress.cpp:132
 msgid " Stalled "
 msgstr "Wedi seibio"
 
-#: kio/statusbarprogress.cpp:134 misc/uiserver.cpp:1102
+#: tdeio/statusbarprogress.cpp:134 misc/uiserver.cpp:1102
 msgid " %1/s "
 msgstr "%1/s"
 
-#: kio/passdlg.cpp:57
+#: tdeio/passdlg.cpp:57
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: kio/passdlg.cpp:98
+#: tdeio/passdlg.cpp:98
 #, fuzzy
 msgid "You need to supply a username and a password"
 msgstr "Rhaid i chi ddarparu enw cyfrif a cyfrinair"
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 134
-#: kfile/kpropertiesdialog.cpp:3699 kio/passdlg.cpp:108 rc.cpp:105
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 134
+#: tdefile/kpropertiesdialog.cpp:3699 tdeio/passdlg.cpp:108 rc.cpp:105
 #, no-c-format
 msgid "&Username:"
 msgstr "&Enw Defnyddiwr:"
 
-#: kio/passdlg.cpp:125
+#: tdeio/passdlg.cpp:125
 msgid "&Password:"
 msgstr "&Cyfrinair"
 
-#: kio/passdlg.cpp:147
+#: tdeio/passdlg.cpp:147
 msgid "&Keep password"
 msgstr "&Cadw Cyfrinair"
 
-#: kio/passdlg.cpp:345 kpasswdserver/kpasswdserver.cpp:371
+#: tdeio/passdlg.cpp:345 kpasswdserver/kpasswdserver.cpp:371
 msgid "Authorization Dialog"
 msgstr "Ymgom Awdurdodi"
 
-#: kio/krun.cpp:120
+#: tdeio/krun.cpp:120
 msgid ""
 "<qt>Unable to enter <b>%1</b>.\n"
 "You do not have access rights to this location.</qt>"
@@ -2391,7 +2391,7 @@ msgstr ""
 "<qt> Methu mynd i mewn i  <b>%1</b>.\n"
 " Nid oes ganddoch  hawliau cyrchu'r lleoliad yma.</qt>"
 
-#: kio/krun.cpp:159
+#: tdeio/krun.cpp:159
 msgid ""
 "<qt>The file <b>%1</b> is an executable program. For safety it will not be "
 "started.</qt>"
@@ -2399,33 +2399,33 @@ msgstr ""
 "<qt>Mae'r ffeil <b>%1</b> yn raglen weithredadwy. Er mwyn diogelwch, ni fydd "
 "hi'n cael ei chychwyn.</qt>"
 
-#: kio/krun.cpp:166
+#: tdeio/krun.cpp:166
 msgid "<qt>You do not have permission to run <b>%1</b>.</qt>"
 msgstr "<qt>nid oes ganddoch ganiatàd i redeg <b>%1</b>.</qt>"
 
-#: kio/krun.cpp:203
+#: tdeio/krun.cpp:203
 #, fuzzy
 msgid "You are not authorized to open this file."
 msgstr "Nid ydych wedi cael eich awdurdodi i weithredu'r ffeil yma."
 
-#: kfile/kopenwith.cpp:835 kio/krun.cpp:207
+#: tdefile/kopenwith.cpp:835 tdeio/krun.cpp:207
 msgid "Open with:"
 msgstr "Agor Efo:"
 
-#: kio/krun.cpp:545
+#: tdeio/krun.cpp:545
 msgid "You are not authorized to execute this file."
 msgstr "Nid ydych wedi cael eich awdurdodi i weithredu'r ffeil yma."
 
-#: kio/krun.cpp:565
+#: tdeio/krun.cpp:565
 #, c-format
 msgid "Launching %1"
 msgstr "Ymgychwyn %1"
 
-#: kio/krun.cpp:746
+#: tdeio/krun.cpp:746
 msgid "You are not authorized to execute this service."
 msgstr "Nid ydych wedi cael eich awdurdodi i weithredu'r gwasanaeth yma."
 
-#: kio/krun.cpp:900
+#: tdeio/krun.cpp:900
 msgid ""
 "<qt>Unable to run the command specified. The file or folder <b>%1</b> "
 "does not exist.</qt>"
@@ -2433,108 +2433,108 @@ msgstr ""
 "<qt>Methu rhedeg y gorchymyn penodol. Nid yw'r ffeil neu plygell <b>%1</b>"
 "mewn bod.</qt>"
 
-#: kio/krun.cpp:1400
+#: tdeio/krun.cpp:1400
 #, fuzzy
 msgid "Could not find the program '%1'"
 msgstr "Methu darganfod y rhaglen '%1'"
 
-#: kio/kfileitem.cpp:730
+#: tdeio/tdefileitem.cpp:730
 msgid "Symbolic Link"
 msgstr "Cyswllt Symbolaidd"
 
-#: kio/kfileitem.cpp:732
+#: tdeio/tdefileitem.cpp:732
 msgid "%1 (Link)"
 msgstr "%1 (Cyswllt)"
 
 #: ../tdeioslave/http/kcookiejar/kcookiewin.cpp:270
-#: bookmarks/kbookmarkmenu.cc:791 kfile/kpropertiesdialog.cpp:3930
-#: kio/kfileitem.cpp:774
+#: bookmarks/kbookmarkmenu.cc:791 tdefile/kpropertiesdialog.cpp:3930
+#: tdeio/tdefileitem.cpp:774
 msgid "Name:"
 msgstr "Enw:"
 
-#: kfile/kpropertiesdialog.cpp:927 kio/kfileitem.cpp:775
+#: tdefile/kpropertiesdialog.cpp:927 tdeio/tdefileitem.cpp:775
 msgid "Type:"
 msgstr "Math:"
 
-#: kio/kfileitem.cpp:779
+#: tdeio/tdefileitem.cpp:779
 #, fuzzy
 msgid "Link to %1 (%2)"
 msgstr "Cyswllt i %1"
 
-#: kfile/kpropertiesdialog.cpp:977 kio/kfileitem.cpp:787
+#: tdefile/kpropertiesdialog.cpp:977 tdeio/tdefileitem.cpp:787
 msgid "Size:"
 msgstr "Maint:"
 
-#: kfile/kpropertiesdialog.cpp:1045 kio/kfileitem.cpp:792
+#: tdefile/kpropertiesdialog.cpp:1045 tdeio/tdefileitem.cpp:792
 msgid "Modified:"
 msgstr "Newidwyd:"
 
-#: kio/kfileitem.cpp:798
+#: tdeio/tdefileitem.cpp:798
 msgid "Owner:"
 msgstr "Perchennog:"
 
-#: kio/kfileitem.cpp:799
+#: tdeio/tdefileitem.cpp:799
 msgid "Permissions:"
 msgstr "Caniatadau "
 
-#: kio/skipdlg.cpp:63
+#: tdeio/skipdlg.cpp:63
 msgid "Skip"
 msgstr "Hepgor"
 
-#: kio/skipdlg.cpp:66
+#: tdeio/skipdlg.cpp:66
 msgid "Auto Skip"
 msgstr "Awto Hepgor"
 
-#: kio/kshred.cpp:212
+#: tdeio/kshred.cpp:212
 msgid "Shredding:  pass %1 of 35"
 msgstr "Rhwygo: tro %1 o 35"
 
-#: kio/slave.cpp:370
+#: tdeio/slave.cpp:370
 #, c-format
 msgid "Unable to create io-slave: %1"
 msgstr "Methu creu gwas-io: %1"
 
-#: kio/slave.cpp:401
+#: tdeio/slave.cpp:401
 #, fuzzy
 msgid "Unknown protocol '%1'."
 msgstr ""
 "Protocol anhysbys '%1'. \n"
 
-#: kio/slave.cpp:409
+#: tdeio/slave.cpp:409
 msgid "Can not find io-slave for protocol '%1'."
 msgstr "Methu canfod gwas-io i brotocol '%1'."
 
-#: kio/slave.cpp:437
+#: tdeio/slave.cpp:437
 #, fuzzy
-msgid "Cannot talk to klauncher"
+msgid "Cannot talk to tdelauncher"
 msgstr "Methu siarad efo Klauncher"
 
-#: kio/slave.cpp:448
+#: tdeio/slave.cpp:448
 #, c-format
 msgid ""
 "Unable to create io-slave:\n"
-"klauncher said: %1"
+"tdelauncher said: %1"
 msgstr ""
 "Methu creu gwas-io:\n"
-" dywedodd klauncher: %1"
+" dywedodd tdelauncher: %1"
 
-#: kfile/kpropertiesdialog.cpp:2686 kio/kmimetypechooser.cpp:75
+#: tdefile/kpropertiesdialog.cpp:2686 tdeio/kmimetypechooser.cpp:75
 msgid "Mime Type"
 msgstr "Math MIME"
 
-#: kfile/kpropertiesdialog.cpp:2697 kio/kmimetypechooser.cpp:80
+#: tdefile/kpropertiesdialog.cpp:2697 tdeio/kmimetypechooser.cpp:80
 msgid "Comment"
 msgstr "Esboniad"
 
-#: kio/kmimetypechooser.cpp:84
+#: tdeio/kmimetypechooser.cpp:84
 msgid "Patterns"
 msgstr "Patrymau"
 
-#: kio/kmimetypechooser.cpp:94
+#: tdeio/kmimetypechooser.cpp:94
 msgid "&Edit..."
 msgstr "&Golygu..."
 
-#: kio/kmimetypechooser.cpp:104
+#: tdeio/kmimetypechooser.cpp:104
 #, fuzzy
 msgid "Click this button to display the familiar TDE mime type editor."
 msgstr "Cliciwch y botwm yma i greu plygell newydd."
@@ -2791,7 +2791,7 @@ msgstr "Cyhoeddwr:"
 msgid "IP address:"
 msgstr "Cyfeiriad IP:"
 
-#: kfile/kpropertiesdialog.cpp:2565 kssl/ksslinfodlg.cc:227
+#: tdefile/kpropertiesdialog.cpp:2565 kssl/ksslinfodlg.cc:227
 msgid "URL:"
 msgstr "URL:"
 
@@ -2900,12 +2900,12 @@ msgstr "Methu lawrlwytho'r ysgrifen ffurfweddu'r dirprwy."
 msgid "Could not find a usable proxy configuration script"
 msgstr "Methu canfod ysgrifen ffurfweddu'r dirpwry a gall ei defnyddio"
 
-#: misc/kfile/fileprops.cpp:200
+#: misc/tdefile/fileprops.cpp:200
 #, fuzzy
 msgid "Do not print the mimetype of the given file(s)"
 msgstr "Peidio ag argraffu math mime y ffeil(iau) penodol"
 
-#: misc/kfile/fileprops.cpp:204
+#: misc/tdefile/fileprops.cpp:204
 msgid ""
 "List all supported metadata keys of the given file(s). If mimetype is not "
 "specified, the mimetype of the given files is used."
@@ -2913,7 +2913,7 @@ msgstr ""
 "Rhestru pob allwedd metadata a gynhelir o'r ffeil(iau) a roddwyd.  Os nid yw'r "
 "math mime wedi'i bennu, defnyddir math mime y ffeiliau a roddwyd."
 
-#: misc/kfile/fileprops.cpp:210
+#: misc/tdefile/fileprops.cpp:210
 msgid ""
 "List all preferred metadata keys of the given file(s). If mimetype is not "
 "specified, the mimetype of the given files is used."
@@ -2921,16 +2921,16 @@ msgstr ""
 "Rhestru pob allwedd metadata amgen o'r ffeil(iau) a roddwyd. Os nid yw'r math "
 "mime wedi'i bennu, defnyddir math mime y ffeiliau a roddwyd."
 
-#: misc/kfile/fileprops.cpp:216
+#: misc/tdefile/fileprops.cpp:216
 msgid "List all metadata keys which have a value in the given file(s)."
 msgstr ""
 "Rhestru pob allwedd metadata sydd efo gwerth yn y ffeil(iau) a roddwyd."
 
-#: misc/kfile/fileprops.cpp:221
+#: misc/tdefile/fileprops.cpp:221
 msgid "Prints all mimetypes for which metadata support is available."
 msgstr "Argraffu pob math mime lle mae cynnal metadata ar gael."
 
-#: misc/kfile/fileprops.cpp:226
+#: misc/tdefile/fileprops.cpp:226
 #, fuzzy
 msgid ""
 "Do not print a warning when more than one file was given and they do not all "
@@ -2939,16 +2939,16 @@ msgstr ""
 "Peidio ag argraffu rhybudd pan rhoddwyd mwy nac un math mime, a nid yw ganddynt "
 "i gyd yr un math mime."
 
-#: misc/kfile/fileprops.cpp:231
+#: misc/tdefile/fileprops.cpp:231
 msgid "Prints all metadata values, available in the given file(s)."
 msgstr "Argraffu pob werth metadata sydd ar gael yn y ffeil(iau) a roddwyd."
 
-#: misc/kfile/fileprops.cpp:236
+#: misc/tdefile/fileprops.cpp:236
 msgid "Prints the preferred metadata values, available in the given file(s)."
 msgstr ""
 "Argraffu y gwerthau metadata amgen sydd ar gael yn y ffeil(iau) a roddwyd."
 
-#: misc/kfile/fileprops.cpp:240
+#: misc/tdefile/fileprops.cpp:240
 msgid ""
 "Opens a TDE properties dialog to allow viewing and modifying of metadata of the "
 "given file(s)"
@@ -2956,7 +2956,7 @@ msgstr ""
 "Agor ymgom priodweddau TDE i ganiatàu gweld a newid y metadata yn y ffeil(iau) "
 "a roddwyd."
 
-#: misc/kfile/fileprops.cpp:244
+#: misc/tdefile/fileprops.cpp:244
 msgid ""
 "Prints the value for 'key' of the given file(s). 'key' may also be a "
 "comma-separated list of keys"
@@ -2964,7 +2964,7 @@ msgstr ""
 "Argraffu gwerth 'allwedd' y ffeil(iau) a roddwyd.  Gall 'key' fod hefyd yn "
 "rhestr gwahanwyd gan gollnod o allweddi."
 
-#: misc/kfile/fileprops.cpp:248
+#: misc/tdefile/fileprops.cpp:248
 msgid ""
 "Attempts to set the value 'value' for the metadata key 'key' for the given "
 "file(s)"
@@ -2972,36 +2972,36 @@ msgstr ""
 "Ceisio gosod y gwerth 'gwerth' i'r allwedd metadata 'allwedd' am y ffeil(iau) a "
 "roddwyd."
 
-#: misc/kfile/fileprops.cpp:251
+#: misc/tdefile/fileprops.cpp:251
 #, fuzzy
 msgid "The group to get values from or set values to"
 msgstr "Y cylch i nôl gwerthoedd ohono neu i osod gwerthoedd iddo."
 
-#: misc/kfile/fileprops.cpp:255
+#: misc/tdefile/fileprops.cpp:255
 msgid "The file (or a number of files) to operate on."
 msgstr "Y ffeil (neu nifer o ffeiliau) i weithredu arnynt."
 
-#: misc/kfile/fileprops.cpp:270
+#: misc/tdefile/fileprops.cpp:270
 msgid "No support for metadata extraction found."
 msgstr "Dim cynnal wedi'i ganfod am dynnu metadata."
 
-#: misc/kfile/fileprops.cpp:275
+#: misc/tdefile/fileprops.cpp:275
 msgid "Supported MimeTypes:"
 msgstr "Mathau Mime a Gynhelir"
 
-#: misc/kfile/fileprops.cpp:410
-msgid "kfile"
-msgstr "kfile"
+#: misc/tdefile/fileprops.cpp:410
+msgid "tdefile"
+msgstr "tdefile"
 
-#: misc/kfile/fileprops.cpp:411
+#: misc/tdefile/fileprops.cpp:411
 msgid "A commandline tool to read and modify metadata of files."
 msgstr "Erfyn llinell gorchymyn i ddarllen a newid metadata ffeiliau."
 
-#: misc/kfile/fileprops.cpp:438
+#: misc/tdefile/fileprops.cpp:438
 msgid "No files specified"
 msgstr "Dim ffeiliau wedi'u pennu"
 
-#: misc/kfile/fileprops.cpp:467
+#: misc/tdefile/fileprops.cpp:467
 msgid "Cannot determine metadata"
 msgstr "Methu pennu metadata"
 
@@ -3023,7 +3023,7 @@ msgstr ""
 "Mae'r cymhwysiad '%1' wedi gofyn i agor y waled '%2'.  Mewnosodwch y cyfrinair "
 "am y waled yma isod."
 
-#: kfile/kfiledialog.cpp:1833 misc/tdewalletd/tdewalletd.cpp:405
+#: tdefile/tdefiledialog.cpp:1833 misc/tdewalletd/tdewalletd.cpp:405
 #: misc/tdewalletd/tdewalletd.cpp:419
 msgid "&Open"
 msgstr "&Agor"
@@ -3137,15 +3137,15 @@ msgstr "Mae'r cyfrineiriau yn cydweddu."
 msgid "Passwords do not match."
 msgstr "Nid yw'r cyfrineiriau yn cydweddu."
 
-#: misc/ktelnetservice.cpp:41
+#: misc/tdetelnetservice.cpp:41
 msgid "telnet service"
 msgstr "gwasanaeth telnet"
 
-#: misc/ktelnetservice.cpp:42
+#: misc/tdetelnetservice.cpp:42
 msgid "telnet protocol handler"
 msgstr "trinydd protocol telnet"
 
-#: misc/ktelnetservice.cpp:76
+#: misc/tdetelnetservice.cpp:76
 msgid "You do not have permission to access the %1 protocol."
 msgstr "Nid oes ganddoch caniatad i gyrchu'r protocol %1."
 
@@ -3199,7 +3199,7 @@ msgstr "Ams. yn Weddill"
 msgid "Speed"
 msgstr "Cyflymdra"
 
-#: kfile/kfiledetailview.cpp:67 misc/uiserver.cpp:146 misc/uiserver.cpp:471
+#: tdefile/tdefiledetailview.cpp:67 misc/uiserver.cpp:146 misc/uiserver.cpp:471
 msgid "Size"
 msgstr "Maint"
 
@@ -3307,83 +3307,83 @@ msgstr "Gweinydd UI Gwybodaeth Cynnydd TDE"
 msgid "Developer"
 msgstr "Datblygwr"
 
-#: misc/ksendbugmail/main.cpp:22
+#: misc/tdesendbugmail/main.cpp:22
 msgid "Subject line"
 msgstr "Llinell pwnc"
 
-#: misc/ksendbugmail/main.cpp:23
+#: misc/tdesendbugmail/main.cpp:23
 msgid "Recipient"
 msgstr "Derbynnwr"
 
-#: misc/ksendbugmail/main.cpp:33
+#: misc/tdesendbugmail/main.cpp:33
 msgid "Error connecting to server."
 msgstr "Gwall wrth gysylltu i'r gweinydd"
 
-#: misc/ksendbugmail/main.cpp:36
+#: misc/tdesendbugmail/main.cpp:36
 msgid "Not connected."
 msgstr "Dim cyswllt."
 
-#: misc/ksendbugmail/main.cpp:39
+#: misc/tdesendbugmail/main.cpp:39
 msgid "Connection timed out."
 msgstr "Cysylltiad wedi goramseru."
 
-#: misc/ksendbugmail/main.cpp:42
+#: misc/tdesendbugmail/main.cpp:42
 msgid "Time out waiting for server interaction."
 msgstr "Goramser wrth aros am ryngweithiad gweinydd."
 
-#: misc/ksendbugmail/main.cpp:46
+#: misc/tdesendbugmail/main.cpp:46
 msgid "Server said: \"%1\""
 msgstr "Dywedodd y gweinydd: \"%1\""
 
-#: misc/ksendbugmail/main.cpp:62
+#: misc/tdesendbugmail/main.cpp:62
 msgid "KSendBugMail"
 msgstr "KSendBugMail"
 
-#: misc/ksendbugmail/main.cpp:63
+#: misc/tdesendbugmail/main.cpp:63
 msgid "Sends a short bug report to submit@bugs.kde.org"
 msgstr "Gyrru adroddiad nam byr i submit@bugs.kde.org"
 
-#: misc/ksendbugmail/main.cpp:65
+#: misc/tdesendbugmail/main.cpp:65
 msgid "Author"
 msgstr "Awdur"
 
-#: misc/kmailservice.cpp:32
+#: misc/tdemailservice.cpp:32
 #, fuzzy
 msgid "KMailService"
 msgstr "Gwasanaeth ebost"
 
-#: misc/kmailservice.cpp:32
+#: misc/tdemailservice.cpp:32
 msgid "Mail service"
 msgstr "Gwasanaeth ebost"
 
-#: kioexec/main.cpp:50
-msgid "KIO Exec - Opens remote files, watches modifications, asks for upload"
-msgstr "KIO Exec - Agor ffeiliau pell, arsylwi newidiadau, gofyn am lanlwytho."
+#: tdeioexec/main.cpp:50
+msgid "TDEIO Exec - Opens remote files, watches modifications, asks for upload"
+msgstr "TDEIO Exec - Agor ffeiliau pell, arsylwi newidiadau, gofyn am lanlwytho."
 
-#: kioexec/main.cpp:54
+#: tdeioexec/main.cpp:54
 msgid "Treat URLs as local files and delete them afterwards"
 msgstr "Trin URLau fel ffeiliau lleol a'u dileu wedyn"
 
-#: kioexec/main.cpp:55
+#: tdeioexec/main.cpp:55
 #, fuzzy
 msgid "Suggested file name for the downloaded file"
 msgstr "Dewiswch enw ffeil amgen i'r ffeil newydd."
 
-#: kioexec/main.cpp:56
+#: tdeioexec/main.cpp:56
 msgid "Command to execute"
 msgstr "Gorchymyn i Weithredu"
 
-#: kioexec/main.cpp:57
+#: tdeioexec/main.cpp:57
 msgid "URL(s) or local file(s) used for 'command'"
 msgstr "URL(au) neu ffeil(iau) lleol i'w defnyddio fel 'gorchymyn'"
 
-#: kioexec/main.cpp:73
+#: tdeioexec/main.cpp:73
 msgid ""
 "'command' expected.\n"
 msgstr ""
 "'gorchymyn' a ddisgwylir.\n"
 
-#: kioexec/main.cpp:102
+#: tdeioexec/main.cpp:102
 msgid ""
 "The URL %1\n"
 "is malformed"
@@ -3391,7 +3391,7 @@ msgstr ""
 "Mae'r URL %1\n"
 "wedi'i gam-fformatio"
 
-#: kioexec/main.cpp:104
+#: tdeioexec/main.cpp:104
 msgid ""
 "Remote URL %1\n"
 "not allowed with --tempfiles switch"
@@ -3399,7 +3399,7 @@ msgstr ""
 "Ni chaniateir URL pell %1\n"
 "efo'r cymal --tempfiles"
 
-#: kioexec/main.cpp:237
+#: tdeioexec/main.cpp:237
 msgid ""
 "The supposedly temporary file\n"
 "%1\n"
@@ -3411,16 +3411,16 @@ msgstr ""
 "(oedd i fod dros dro) wedi ei newid. \n"
 "Ydych eisiau ei dileu?"
 
-#: kioexec/main.cpp:238 kioexec/main.cpp:245
+#: tdeioexec/main.cpp:238 tdeioexec/main.cpp:245
 msgid "File Changed"
 msgstr "Newidwyd y ffeil."
 
-#: kioexec/main.cpp:238
+#: tdeioexec/main.cpp:238
 #, fuzzy
 msgid "Do Not Delete"
 msgstr "Dim byd i'w dileu."
 
-#: kioexec/main.cpp:244
+#: tdeioexec/main.cpp:244
 msgid ""
 "The file\n"
 "%1\n"
@@ -3432,96 +3432,96 @@ msgstr ""
 "wedi ei newid. \n"
 "Ydych eisiau lanlwytho'r newidiadau?"
 
-#: kioexec/main.cpp:245
+#: tdeioexec/main.cpp:245
 msgid "Upload"
 msgstr "Lanlwytho"
 
-#: kioexec/main.cpp:245
+#: tdeioexec/main.cpp:245
 msgid "Do Not Upload"
 msgstr ""
 
-#: kioexec/main.cpp:274
+#: tdeioexec/main.cpp:274
 msgid "KIOExec"
 msgstr "KIOExec"
 
-#: kfile/kimagefilepreview.cpp:53
+#: tdefile/kimagefilepreview.cpp:53
 msgid "&Automatic preview"
 msgstr "&Awtomatig"
 
-#: kfile/kimagefilepreview.cpp:58
+#: tdefile/kimagefilepreview.cpp:58
 msgid "&Preview"
 msgstr "&Rhagolwg"
 
-#: kfile/kfileview.cpp:77
+#: tdefile/tdefileview.cpp:77
 msgid "Unknown View"
 msgstr "Golwg Anhysbys"
 
-#: kfile/kpreviewprops.cpp:49
+#: tdefile/kpreviewprops.cpp:49
 msgid "P&review"
 msgstr "R&hagolwg"
 
-#: kfile/kfilespeedbar.cpp:46
+#: tdefile/tdefilespeedbar.cpp:46
 msgid "Desktop"
 msgstr "Penbwrdd"
 
-#: kfile/kfilespeedbar.cpp:53
+#: tdefile/tdefilespeedbar.cpp:53
 msgid "Documents"
 msgstr "Dogfennau"
 
-#: kfile/kdiroperator.cpp:1264 kfile/kfilespeedbar.cpp:57
+#: tdefile/tdediroperator.cpp:1264 tdefile/tdefilespeedbar.cpp:57
 msgid "Home Folder"
 msgstr "Plygell Cartref"
 
-#: kfile/kfilespeedbar.cpp:62
+#: tdefile/tdefilespeedbar.cpp:62
 msgid "Storage Media"
 msgstr ""
 
-#: kfile/kfilespeedbar.cpp:67
+#: tdefile/tdefilespeedbar.cpp:67
 #, fuzzy
 msgid "Network Folders"
 msgstr "Plygell Newydd"
 
-#: kfile/kcustommenueditor.cpp:88
+#: tdefile/kcustommenueditor.cpp:88
 msgid "Menu Editor"
 msgstr "Golygydd Dewislen"
 
-#: kfile/kcustommenueditor.cpp:94 kfile/kdiroperator.cpp:1258
+#: tdefile/kcustommenueditor.cpp:94 tdefile/tdediroperator.cpp:1258
 msgid "Menu"
 msgstr "Dewislen"
 
-#: kfile/kcustommenueditor.cpp:98
+#: tdefile/kcustommenueditor.cpp:98
 msgid "New..."
 msgstr "Newydd ..."
 
-#: kfile/kcustommenueditor.cpp:100
+#: tdefile/kcustommenueditor.cpp:100
 msgid "Move Up"
 msgstr "Symud i Fyny"
 
-#: kfile/kcustommenueditor.cpp:101
+#: tdefile/kcustommenueditor.cpp:101
 msgid "Move Down"
 msgstr "Symud i Lawr"
 
-#: kfile/kfiledialog.cpp:1676 kfile/kfilefiltercombo.cpp:32
+#: tdefile/tdefiledialog.cpp:1676 tdefile/tdefilefiltercombo.cpp:32
 msgid "*|All Files"
 msgstr "*|Pob Ffeil"
 
-#: kfile/kfilefiltercombo.cpp:164
+#: tdefile/tdefilefiltercombo.cpp:164
 msgid "All Supported Files"
 msgstr "Pob Ffeil a Cynhelir"
 
-#: kfile/kopenwith.cpp:150
+#: tdefile/kopenwith.cpp:150
 msgid "Known Applications"
 msgstr "Cymhwysiannau Hysbys"
 
-#: kfile/kicondialog.cpp:332 kfile/kopenwith.cpp:296
+#: tdefile/kicondialog.cpp:332 tdefile/kopenwith.cpp:296
 msgid "Applications"
 msgstr "Cymhwysiannau"
 
-#: kfile/kopenwith.cpp:322
+#: tdefile/kopenwith.cpp:322
 msgid "Open With"
 msgstr "Agor Efo"
 
-#: kfile/kopenwith.cpp:326
+#: tdefile/kopenwith.cpp:326
 msgid ""
 "<qt>Select the program that should be used to open <b>%1</b>"
 ". If the program is not listed, enter the name or click the browse button.</qt>"
@@ -3530,16 +3530,16 @@ msgstr ""
 ". Os nad yw'r rhaglen wedi ei rhestru, mewnbynnwch yr enw neu clicio ar y botwm "
 "pori.</qt>"
 
-#: kfile/kopenwith.cpp:332
+#: tdefile/kopenwith.cpp:332
 msgid "Choose the name of the program with which to open the selected files."
 msgstr "Dewis enw'r rhaglen i agor y ffeiliau penodol."
 
-#: kfile/kopenwith.cpp:353
+#: tdefile/kopenwith.cpp:353
 #, c-format
 msgid "Choose Application for %1"
 msgstr "Dewis Cymhwysiad i %1"
 
-#: kfile/kopenwith.cpp:354
+#: tdefile/kopenwith.cpp:354
 msgid ""
 "<qt>Select the program for the file type: <b>%1</b>. If the program is not "
 "listed, enter the name or click the browse button.</qt>"
@@ -3547,11 +3547,11 @@ msgstr ""
 "<qt>Dewis y rhaglen i'r math o ffeil: <b>%1</b>. Os nad yw'r rhaglen wedi ei "
 "rhestru, mewnbynnwch yr enw neu clicio ar y botwm pori</qt>"
 
-#: kfile/kopenwith.cpp:366
+#: tdefile/kopenwith.cpp:366
 msgid "Choose Application"
 msgstr "Dewis Cymhwysiad"
 
-#: kfile/kopenwith.cpp:367
+#: tdefile/kopenwith.cpp:367
 msgid ""
 "<qt>Select a program. If the program is not listed, enter the name or click the "
 "browse button.</qt>"
@@ -3559,11 +3559,11 @@ msgstr ""
 "<qt>Dewisi rhaglen. Os nad yw'r rhaglen wedi ei rhestru, mewnbynnwch yr enw neu "
 "clicio ar y botwm pori</qt>"
 
-#: kfile/kopenwith.cpp:406
+#: tdefile/kopenwith.cpp:406
 msgid "Clear input field"
 msgstr "Diddymu'r faes mewnbwn."
 
-#: kfile/kopenwith.cpp:436
+#: tdefile/kopenwith.cpp:436
 msgid ""
 "Following the command, you can have several place holders which will be "
 "replaced with the actual values when the actual program is run:\n"
@@ -3591,242 +3591,242 @@ msgstr ""
 "%m - yr eicon bach\n"
 "%c - y sylwad"
 
-#: kfile/kopenwith.cpp:469
+#: tdefile/kopenwith.cpp:469
 msgid "Run in &terminal"
 msgstr "Rhedeg mewn &terfynell"
 
-#: kfile/kopenwith.cpp:480
+#: tdefile/kopenwith.cpp:480
 msgid "&Do not close when command exits"
 msgstr "&Peidiwch a chau pan terfynir y gorchymyn"
 
-#: kfile/kopenwith.cpp:497
+#: tdefile/kopenwith.cpp:497
 msgid "&Remember application association for this type of file"
 msgstr "&Cofio cyd-gymhwysiad i'r math yma o ffeil"
 
-#: kfile/kicondialog.cpp:241 kfile/kicondialog.cpp:250
+#: tdefile/kicondialog.cpp:241 tdefile/kicondialog.cpp:250
 msgid "Select Icon"
 msgstr "Dewis Eicon"
 
-#: kfile/kicondialog.cpp:270
+#: tdefile/kicondialog.cpp:270
 msgid "Icon Source"
 msgstr "Ffynhonell Eicon"
 
-#: kfile/kicondialog.cpp:276
+#: tdefile/kicondialog.cpp:276
 msgid "S&ystem icons:"
 msgstr "E&iconau cysawd:"
 
-#: kfile/kicondialog.cpp:281
+#: tdefile/kicondialog.cpp:281
 msgid "O&ther icons:"
 msgstr "Ei&conau eraill:"
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 213
-#: kfile/kicondialog.cpp:283 kfile/kpropertiesdialog.cpp:3615 rc.cpp:288
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 213
+#: tdefile/kicondialog.cpp:283 tdefile/kpropertiesdialog.cpp:3615 rc.cpp:288
 #, no-c-format
 msgid "&Browse..."
 msgstr "&Pori..."
 
-#: kfile/kicondialog.cpp:293
+#: tdefile/kicondialog.cpp:293
 msgid "Clear Search"
 msgstr "Gwagu'r Chwiliad"
 
-#: kfile/kicondialog.cpp:297
+#: tdefile/kicondialog.cpp:297
 msgid "&Search:"
 msgstr "&Chwilio:"
 
-#: kfile/kicondialog.cpp:308
+#: tdefile/kicondialog.cpp:308
 msgid "Search interactively for icon names (e.g. folder)."
 msgstr ""
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 204
-#: kfile/kicondialog.cpp:330 rc.cpp:165
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 204
+#: tdefile/kicondialog.cpp:330 rc.cpp:165
 #, no-c-format
 msgid "Actions"
 msgstr "Gweithrediadau"
 
-#: kfile/kicondialog.cpp:331
+#: tdefile/kicondialog.cpp:331
 #, fuzzy
 msgid "Animations"
 msgstr "Stopio Animeiddiadau"
 
-#: kfile/kicondialog.cpp:333
+#: tdefile/kicondialog.cpp:333
 msgid "Categories"
 msgstr "Categoriau"
 
-#: kfile/kicondialog.cpp:334
+#: tdefile/kicondialog.cpp:334
 msgid "Devices"
 msgstr "Dyfeisiau"
 
-#: kfile/kicondialog.cpp:335
+#: tdefile/kicondialog.cpp:335
 #, fuzzy
 msgid "Emblems"
 msgstr "symudol"
 
-#: kfile/kicondialog.cpp:336
+#: tdefile/kicondialog.cpp:336
 #, fuzzy
 msgid "Emotes"
 msgstr "Cynnwys Gwag"
 
-#: kfile/kicondialog.cpp:337
+#: tdefile/kicondialog.cpp:337
 msgid "Filesystems"
 msgstr "Cysodau ffeil"
 
-#: kfile/kicondialog.cpp:338
+#: tdefile/kicondialog.cpp:338
 msgid "International"
 msgstr "Rhyngwladol"
 
-#: kfile/kicondialog.cpp:339
+#: tdefile/kicondialog.cpp:339
 msgid "Mimetypes"
 msgstr "Mathau MIME"
 
-#: kfile/kicondialog.cpp:340
+#: tdefile/kicondialog.cpp:340
 #, fuzzy
 msgid "Places"
 msgstr "Tudalennau"
 
-#: kfile/kicondialog.cpp:341
+#: tdefile/kicondialog.cpp:341
 #, fuzzy
 msgid "Status"
 msgstr "Ymgychwyn"
 
-#: kfile/kicondialog.cpp:589
+#: tdefile/kicondialog.cpp:589
 msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr "*.png *.xpm *.svg *.svgz|Ffeiliau eicon  (*.png *.xpm *.svg *.svgz)"
 
-#: kfile/kfilemetainfowidget.cpp:111
+#: tdefile/tdefilemetainfowidget.cpp:111
 msgid "<Error>"
 msgstr "<Gwall>"
 
-#: kfile/kfilepreview.cpp:63
+#: tdefile/tdefilepreview.cpp:63
 msgid "Preview"
 msgstr "Rhagweld"
 
-#: kfile/kfilepreview.cpp:69
+#: tdefile/tdefilepreview.cpp:69
 msgid "No preview available."
 msgstr "Dim rhagolwg ar gael."
 
-#: kfile/kacleditwidget.cpp:63 kfile/kacleditwidget.cpp:421
-#: kfile/kfiledetailview.cpp:70
+#: tdefile/kacleditwidget.cpp:63 tdefile/kacleditwidget.cpp:421
+#: tdefile/tdefiledetailview.cpp:70
 msgid "Owner"
 msgstr "Perchennog"
 
-#: kfile/kacleditwidget.cpp:64 kfile/kacleditwidget.cpp:423
+#: tdefile/kacleditwidget.cpp:64 tdefile/kacleditwidget.cpp:423
 #, fuzzy
 msgid "Owning Group"
 msgstr "Grwp Newydd"
 
-#: kfile/kacleditwidget.cpp:65 kfile/kacleditwidget.cpp:425
-#: kfile/kpropertiesdialog.cpp:1980
+#: tdefile/kacleditwidget.cpp:65 tdefile/kacleditwidget.cpp:425
+#: tdefile/kpropertiesdialog.cpp:1980
 msgid "Others"
 msgstr "Eraill"
 
-#: kfile/kacleditwidget.cpp:66 kfile/kacleditwidget.cpp:427
+#: tdefile/kacleditwidget.cpp:66 tdefile/kacleditwidget.cpp:427
 msgid "Mask"
 msgstr ""
 
-#: kfile/kacleditwidget.cpp:67 kfile/kacleditwidget.cpp:429
+#: tdefile/kacleditwidget.cpp:67 tdefile/kacleditwidget.cpp:429
 #, fuzzy
 msgid "Named User"
 msgstr "Defnyddwyr a Wrthodir"
 
-#: kfile/kacleditwidget.cpp:68 kfile/kacleditwidget.cpp:431
+#: tdefile/kacleditwidget.cpp:68 tdefile/kacleditwidget.cpp:431
 #, fuzzy
 msgid "Named Group"
 msgstr "Grwp Newydd"
 
-#: kfile/kacleditwidget.cpp:81
+#: tdefile/kacleditwidget.cpp:81
 msgid "Add Entry..."
 msgstr "Ychwanegu cofnod ..."
 
-#: kfile/kacleditwidget.cpp:83
+#: tdefile/kacleditwidget.cpp:83
 msgid "Edit Entry..."
 msgstr "Golygu cofnod ..."
 
-#: kfile/kacleditwidget.cpp:85
+#: tdefile/kacleditwidget.cpp:85
 #, fuzzy
 msgid "Delete Entry"
 msgstr " Dileu eitem"
 
-#: kfile/kacleditwidget.cpp:280
+#: tdefile/kacleditwidget.cpp:280
 msgid " (Default)"
 msgstr "(Rhagosodedig)"
 
-#: kfile/kacleditwidget.cpp:397
+#: tdefile/kacleditwidget.cpp:397
 #, fuzzy
 msgid "Edit ACL Entry"
 msgstr "&Golygu cofnod ..."
 
-#: kfile/kacleditwidget.cpp:407
+#: tdefile/kacleditwidget.cpp:407
 #, fuzzy
 msgid "Entry Type"
 msgstr "Math ye argraffydd:"
 
-#: kfile/kacleditwidget.cpp:410
+#: tdefile/kacleditwidget.cpp:410
 msgid "Default for new files in this folder"
 msgstr ""
 
-#: kfile/kacleditwidget.cpp:446
+#: tdefile/kacleditwidget.cpp:446
 msgid "User: "
 msgstr "Defnyddiwr: "
 
-#: kfile/kacleditwidget.cpp:450
+#: tdefile/kacleditwidget.cpp:450
 msgid "Group: "
 msgstr "Gr?p: "
 
-#: kfile/kacleditwidget.cpp:563
+#: tdefile/kacleditwidget.cpp:563
 msgid "Type"
 msgstr "Math"
 
-#: kfile/kacleditwidget.cpp:564 kfile/kfiledetailview.cpp:66
+#: tdefile/kacleditwidget.cpp:564 tdefile/tdefiledetailview.cpp:66
 msgid "Name"
 msgstr "Enw"
 
-#: kfile/kacleditwidget.cpp:565
+#: tdefile/kacleditwidget.cpp:565
 msgid ""
 "_: read permission\n"
 "r"
 msgstr "r"
 
-#: kfile/kacleditwidget.cpp:566
+#: tdefile/kacleditwidget.cpp:566
 msgid ""
 "_: write permission\n"
 "w"
 msgstr "gorllewin"
 
-#: kfile/kacleditwidget.cpp:567
+#: tdefile/kacleditwidget.cpp:567
 msgid ""
 "_: execute permission\n"
 "x"
 msgstr "x"
 
-#: kfile/kacleditwidget.cpp:568
+#: tdefile/kacleditwidget.cpp:568
 #, fuzzy
 msgid "Effective"
 msgstr "Gweithredwr"
 
-#: kfile/kdirselectdialog.cpp:90
+#: tdefile/kdirselectdialog.cpp:90
 msgid "Select Folder"
 msgstr "Dewis Plygell"
 
-#: kfile/kdiroperator.cpp:1269 kfile/kdirselectdialog.cpp:92
-#: kfile/kdirselectdialog.cpp:125
+#: tdefile/tdediroperator.cpp:1269 tdefile/kdirselectdialog.cpp:92
+#: tdefile/kdirselectdialog.cpp:125
 msgid "New Folder..."
 msgstr "Plygell Newydd..."
 
-#: kfile/kdirselectdialog.cpp:109
+#: tdefile/kdirselectdialog.cpp:109
 msgid "Folders"
 msgstr "Plygyll"
 
-#: kfile/kdirselectdialog.cpp:128
+#: tdefile/kdirselectdialog.cpp:128
 #, fuzzy
 msgid "Show Hidden Folders"
 msgstr "Dangos Ffeiliau Cudd"
 
-#: kfile/kdiroperator.cpp:389 kfile/kdiroperator.cpp:393
-#: kfile/kdirselectdialog.cpp:407 kfile/kdirselectdialog.cpp:411
+#: tdefile/tdediroperator.cpp:389 tdefile/tdediroperator.cpp:393
+#: tdefile/kdirselectdialog.cpp:407 tdefile/kdirselectdialog.cpp:411
 msgid "New Folder"
 msgstr "Plygell Newydd"
 
-#: kfile/kdiroperator.cpp:394 kfile/kdirselectdialog.cpp:412
+#: tdefile/tdediroperator.cpp:394 tdefile/kdirselectdialog.cpp:412
 #, c-format
 msgid ""
 "Create new folder in:\n"
@@ -3835,77 +3835,77 @@ msgstr ""
 "Creu plygell newydd yn: \n"
 "%1"
 
-#: kfile/kdiroperator.cpp:422 kfile/kdirselectdialog.cpp:435
+#: tdefile/tdediroperator.cpp:422 tdefile/kdirselectdialog.cpp:435
 msgid "A file or folder named %1 already exists."
 msgstr "Mae ffeil neu blygell o'r enw %1 mewn bod yn barod."
 
-#: kfile/kdiroperator.cpp:426 kfile/kdirselectdialog.cpp:439
+#: tdefile/tdediroperator.cpp:426 tdefile/kdirselectdialog.cpp:439
 #, fuzzy
 msgid "You do not have permission to create that folder."
 msgstr "Does dim hawliau ganddoch i greu'r plygell yna."
 
-#: bookmarks/kbookmarkmenu.cc:797 kfile/kpropertiesdialog.cpp:968
-#: kfile/kurlrequesterdlg.cpp:47
+#: bookmarks/kbookmarkmenu.cc:797 tdefile/kpropertiesdialog.cpp:968
+#: tdefile/kurlrequesterdlg.cpp:47
 msgid "Location:"
 msgstr "Lleoliad:"
 
-#: kfile/knotifydialog.cpp:81
+#: tdefile/knotifydialog.cpp:81
 msgid "Sounds"
 msgstr "Syniau"
 
-#: kfile/knotifydialog.cpp:82
+#: tdefile/knotifydialog.cpp:82
 msgid "Logging"
 msgstr "Cofnodi"
 
-#: kfile/knotifydialog.cpp:83
+#: tdefile/knotifydialog.cpp:83
 msgid "Program Execution"
 msgstr "Gweithrediad Rhaglen"
 
-#: kfile/knotifydialog.cpp:84
+#: tdefile/knotifydialog.cpp:84
 msgid "Message Windows"
 msgstr "Ffenestri Negesau"
 
-#: kfile/knotifydialog.cpp:85
+#: tdefile/knotifydialog.cpp:85
 msgid "Passive Windows"
 msgstr "Ffenestri Goddefol"
 
-#: kfile/knotifydialog.cpp:86
+#: tdefile/knotifydialog.cpp:86
 msgid "Standard Error Output"
 msgstr "Allbwn Gwall Safonol"
 
-#: kfile/knotifydialog.cpp:87
+#: tdefile/knotifydialog.cpp:87
 msgid "Taskbar"
 msgstr "Bar Tasgiau"
 
-#: kfile/knotifydialog.cpp:121
+#: tdefile/knotifydialog.cpp:121
 msgid "Execute a program"
 msgstr "Gweithredu rhaglen"
 
-#: kfile/knotifydialog.cpp:122
+#: tdefile/knotifydialog.cpp:122
 msgid "Print to Standard error output"
 msgstr "Argraffu i allbwn gwall safonol"
 
-#: kfile/knotifydialog.cpp:123
+#: tdefile/knotifydialog.cpp:123
 msgid "Display a messagebox"
 msgstr "Dangos blwch neges"
 
-#: kfile/knotifydialog.cpp:124
+#: tdefile/knotifydialog.cpp:124
 msgid "Log to a file"
 msgstr "Ysgrifennu i ffeil cofnod"
 
-#: kfile/knotifydialog.cpp:125
+#: tdefile/knotifydialog.cpp:125
 msgid "Play a sound"
 msgstr "Chwarae sŵn"
 
-#: kfile/knotifydialog.cpp:126
+#: tdefile/knotifydialog.cpp:126
 msgid "Flash the taskbar entry"
 msgstr "Fflachio cofnod y bar tasgiau"
 
-#: kfile/knotifydialog.cpp:163
+#: tdefile/knotifydialog.cpp:163
 msgid "Notification Settings"
 msgstr "Gosodiadau Hysbysau"
 
-#: kfile/knotifydialog.cpp:309
+#: tdefile/knotifydialog.cpp:309
 msgid ""
 "<qt>You may use the following macros"
 "<br>in the commandline:"
@@ -3923,79 +3923,79 @@ msgstr ""
 "<br><b>%w</b>: am yr ID ffenestr rhifol lle cychwynnodd y digwyddiad, "
 "<br><b>%i</b>: am yr ID digwyddiad rhifol."
 
-#: kfile/knotifydialog.cpp:339
+#: tdefile/knotifydialog.cpp:339
 #, fuzzy
 msgid "Advanced <<"
 msgstr "Gosod &uwch"
 
-#: kfile/knotifydialog.cpp:340
+#: tdefile/knotifydialog.cpp:340
 msgid "Hide advanced options"
 msgstr "Cuddio dewisiadau uwch"
 
-#: kfile/knotifydialog.cpp:356
+#: tdefile/knotifydialog.cpp:356
 #, fuzzy
 msgid "Advanced >>"
 msgstr "Gosod &uwch"
 
-#: kfile/knotifydialog.cpp:357
+#: tdefile/knotifydialog.cpp:357
 msgid "Show advanced options"
 msgstr "Dangos dewisiadau uwch"
 
-#: kfile/knotifydialog.cpp:782
+#: tdefile/knotifydialog.cpp:782
 #, fuzzy
 msgid "This will cause the notifications to be reset to their defaults."
 msgstr "Achosir i'r hysbysau gael ei ail-osod i'w rhagosodiadau!"
 
-#: kfile/knotifydialog.cpp:784
+#: tdefile/knotifydialog.cpp:784
 msgid "Are You Sure?"
 msgstr "Ydych Yn Sicr?"
 
-#: kfile/knotifydialog.cpp:785
+#: tdefile/knotifydialog.cpp:785
 msgid "&Reset"
 msgstr "&Ailosod"
 
-#: kfile/knotifydialog.cpp:858
+#: tdefile/knotifydialog.cpp:858
 msgid "Select Sound File"
 msgstr "Dewis Ffeil Sw^n"
 
-#: kfile/knotifydialog.cpp:894
+#: tdefile/knotifydialog.cpp:894
 msgid "Select Log File"
 msgstr "Dewis Ffeil Cofnodi"
 
-#: kfile/knotifydialog.cpp:908
+#: tdefile/knotifydialog.cpp:908
 msgid "Select File to Execute"
 msgstr "Dewis Ffeil i Weithredu"
 
-#: kfile/knotifydialog.cpp:942
+#: tdefile/knotifydialog.cpp:942
 #, fuzzy
 msgid "The specified file does not exist."
 msgstr "Efallai nad yw'r plygell penodol mewn bod."
 
-#: kfile/knotifydialog.cpp:1012
+#: tdefile/knotifydialog.cpp:1012
 msgid "No description available"
 msgstr "Disgrifiad"
 
-#: kfile/kfiledialog.cpp:347
+#: tdefile/tdefiledialog.cpp:347
 #, fuzzy
 msgid "Please specify the filename to save to."
 msgstr "Penodwch enw'r ffeil i ddefnyddio wrth gadw."
 
-#: kfile/kfiledialog.cpp:349
+#: tdefile/tdefiledialog.cpp:349
 msgid "Please select the file to open."
 msgstr "Penodwch enw'r ffeil i agor."
 
-#: kfile/kfiledialog.cpp:410 kfile/kfiledialog.cpp:453
-#: kfile/kfiledialog.cpp:1550
+#: tdefile/tdefiledialog.cpp:410 tdefile/tdefiledialog.cpp:453
+#: tdefile/tdefiledialog.cpp:1550
 msgid "You can only select local files."
 msgstr "Gallwch ddewis 'mond ffeiliau lleol."
 
-#: kfile/kfiledialog.cpp:411 kfile/kfiledialog.cpp:454
-#: kfile/kfiledialog.cpp:1551
+#: tdefile/tdefiledialog.cpp:411 tdefile/tdefiledialog.cpp:454
+#: tdefile/tdefiledialog.cpp:1551
 #, fuzzy
 msgid "Remote Files Not Accepted"
 msgstr "Ni derbynnir Ffeiliau Pell"
 
-#: kfile/kfiledialog.cpp:445
+#: tdefile/tdefiledialog.cpp:445
 msgid ""
 "%1\n"
 "does not appear to be a valid URL.\n"
@@ -4004,11 +4004,11 @@ msgstr ""
 " %1 \n"
 " yn URL dilys.\n"
 
-#: kfile/kfiledialog.cpp:445
+#: tdefile/tdefiledialog.cpp:445
 msgid "Invalid URL"
 msgstr "URL Annilys"
 
-#: kfile/kfiledialog.cpp:782
+#: tdefile/tdefiledialog.cpp:782
 msgid ""
 "<p>While typing in the text area, you may be presented with possible matches. "
 "This feature can be controlled by clicking with the right mouse button and "
@@ -4018,11 +4018,11 @@ msgstr ""
 "nodwedd yma drwy glicio efo botwm de y llygoden, a dewis modd amgen oddiar y "
 "ddewislen <b>Cwblhau Testun</b>"
 
-#: kfile/kfiledialog.cpp:791
+#: tdefile/tdefiledialog.cpp:791
 msgid "This is the name to save the file as."
 msgstr " Yr enw i ddefnyddio wrth gadw'r ffeil."
 
-#: kfile/kfiledialog.cpp:796
+#: tdefile/tdefiledialog.cpp:796
 msgid ""
 "This is the list of files to open. More than one file can be specified by "
 "listing several files, separated by spaces."
@@ -4030,16 +4030,16 @@ msgstr ""
 "Y rhestr o ffeiliau i agor.  Gellir benodi mwy nac un ffeil drwy restru amryw "
 "ffeil, wedi eu gwahanu gan fylchau."
 
-#: kfile/kfiledialog.cpp:803
+#: tdefile/tdefiledialog.cpp:803
 msgid "This is the name of the file to open."
 msgstr " Enw'r ffeil i agor."
 
-#: kfile/kfiledialog.cpp:841
+#: tdefile/tdefiledialog.cpp:841
 #, fuzzy
 msgid "Current location"
 msgstr "Gweith&rediadau cyfredol:"
 
-#: kfile/kfiledialog.cpp:842
+#: tdefile/tdefiledialog.cpp:842
 #, fuzzy
 msgid ""
 "This is the currently listed location. The drop-down list also lists commonly "
@@ -4050,27 +4050,27 @@ msgstr ""
 "safonol, fel eich plygell cartref, ac hefyd lleoliadau sydd wedi cael eu ymweld "
 "yn ddiweddar."
 
-#: kfile/kfiledialog.cpp:849
+#: tdefile/tdefiledialog.cpp:849
 #, c-format
 msgid "Root Folder: %1"
 msgstr "Plygell Gwraidd: %1"
 
-#: kfile/kfiledialog.cpp:855
+#: tdefile/tdefiledialog.cpp:855
 #, c-format
 msgid "Home Folder: %1"
 msgstr "Plygell Cartref: %1"
 
-#: kfile/kfiledialog.cpp:864
+#: tdefile/tdefiledialog.cpp:864
 #, c-format
 msgid "Documents: %1"
 msgstr "Dogfennau: %1"
 
-#: kfile/kfiledialog.cpp:871
+#: tdefile/tdefiledialog.cpp:871
 #, c-format
 msgid "Desktop: %1"
 msgstr "Penbwrdd: %1"
 
-#: kfile/kfiledialog.cpp:912
+#: tdefile/tdefiledialog.cpp:912
 msgid ""
 "<qt>Click this button to enter the parent folder."
 "<p>For instance, if the current location is file:/home/%1 clicking this button "
@@ -4080,42 +4080,42 @@ msgstr ""
 "<p> Er enghraifft, os file:/home/%1 yw'r lleoliad cyfredol, bydd clicio'r botwm "
 "yma yn mynd â chi i file:/home.</qt>"
 
-#: kfile/kfiledialog.cpp:916
+#: tdefile/tdefiledialog.cpp:916
 msgid "Click this button to move backwards one step in the browsing history."
 msgstr "Cliciwch y botwm yma i symud un cam yn ôl yn yr hanes pori."
 
-#: kfile/kfiledialog.cpp:918
+#: tdefile/tdefiledialog.cpp:918
 msgid "Click this button to move forward one step in the browsing history."
 msgstr "Cliciwch y botwm yma i symud un cam ymlaen yn yr hanes pori."
 
-#: kfile/kfiledialog.cpp:920
+#: tdefile/tdefiledialog.cpp:920
 msgid "Click this button to reload the contents of the current location."
 msgstr "Cliciwch y botwm yma i ail-lwytho cynnwys y lleoliad cyfredol."
 
-#: kfile/kfiledialog.cpp:923
+#: tdefile/tdefiledialog.cpp:923
 msgid "Click this button to create a new folder."
 msgstr "Cliciwch y botwm yma i greu plygell newydd."
 
-#: kfile/kfiledialog.cpp:926
+#: tdefile/tdefiledialog.cpp:926
 msgid "Show Quick Access Navigation Panel"
 msgstr "Dangos Panel Morlywio Cyrchu ar Frys"
 
-#: kfile/kfiledialog.cpp:927
+#: tdefile/tdefiledialog.cpp:927
 #, fuzzy
 msgid "Hide Quick Access Navigation Panel"
 msgstr "Dangos Panel Morlywio Cyrchu ar Frys"
 
-#: kfile/kfiledialog.cpp:932
+#: tdefile/tdefiledialog.cpp:932
 #, fuzzy
 msgid "Show Bookmarks"
 msgstr "Nodau tudalen"
 
-#: kfile/kfiledialog.cpp:933
+#: tdefile/tdefiledialog.cpp:933
 #, fuzzy
 msgid "Hide Bookmarks"
 msgstr "Nodau tudalen"
 
-#: kfile/kfiledialog.cpp:938
+#: tdefile/tdefiledialog.cpp:938
 msgid ""
 "<qt>This is the configuration menu for the file dialog. Various options can be "
 "accessed from this menu including: "
@@ -4137,11 +4137,11 @@ msgstr ""
 "<li>rhagolygon ffeil</li>"
 "<li>gwahanu plygyll oddiwrth ffeiliau</li></ul></qt>"
 
-#: kfile/kfiledialog.cpp:992
+#: tdefile/tdefiledialog.cpp:992
 msgid "&Location:"
 msgstr "&Lleoliad:"
 
-#: kfile/kfiledialog.cpp:1017
+#: tdefile/tdefiledialog.cpp:1017
 msgid ""
 "<qt>This is the filter to apply to the file list. File names that do not match "
 "the filter will not be shown."
@@ -4155,11 +4155,11 @@ msgstr ""
 "mewnosod hidl addasu yn syth i mewn i'r ardal testun."
 "<p> Caniateir nod-chwilwyr fel * a ?. </qt>"
 
-#: kfile/kfiledialog.cpp:1023
+#: tdefile/tdefiledialog.cpp:1023
 msgid "&Filter:"
 msgstr "&Hidl:"
 
-#: kfile/kfiledialog.cpp:1480
+#: tdefile/tdefiledialog.cpp:1480
 #, fuzzy
 msgid ""
 "The chosen filenames do not\n"
@@ -4168,11 +4168,11 @@ msgstr ""
 "Ymddengys nad ydy \n"
 " enwau'r ffeiliau a ddewiswyd yn ddilys."
 
-#: kfile/kfiledialog.cpp:1482
+#: tdefile/tdefiledialog.cpp:1482
 msgid "Invalid Filenames"
 msgstr "Enwau Ffeil Annilys"
 
-#: kfile/kfiledialog.cpp:1512
+#: tdefile/tdefiledialog.cpp:1512
 #, fuzzy
 msgid ""
 "The requested filenames\n"
@@ -4185,33 +4185,33 @@ msgstr ""
 "yn edrych yn ddilys i mi. \n"
 "Sicrhewch bod pob enw ffeil ar amgau mewn dyfynodau dwbl."
 
-#: kfile/kfiledialog.cpp:1516
+#: tdefile/tdefiledialog.cpp:1516
 msgid "Filename Error"
 msgstr "Gwall yn enw'r ffeil"
 
-#: kfile/kfiledialog.cpp:1673
+#: tdefile/tdefiledialog.cpp:1673
 msgid "*|All Folders"
 msgstr "*|Pob Plygell"
 
-#: kfile/kfiledialog.cpp:1973
+#: tdefile/tdefiledialog.cpp:1973
 #, fuzzy
 msgid "Automatically select filename e&xtension (%1)"
 msgstr "Dewis e&styniad yr enw ffeil yn awtomatig (%1)"
 
-#: kfile/kfiledialog.cpp:1974
+#: tdefile/tdefiledialog.cpp:1974
 msgid "the extension <b>%1</b>"
 msgstr "yr estyniad<b>%1</b>"
 
-#: kfile/kfiledialog.cpp:1982
+#: tdefile/tdefiledialog.cpp:1982
 #, fuzzy
 msgid "Automatically select filename e&xtension"
 msgstr "Dewis e&styniad yr enw ffeil yn awtomatig"
 
-#: kfile/kfiledialog.cpp:1983
+#: tdefile/tdefiledialog.cpp:1983
 msgid "a suitable extension"
 msgstr "estyniad addas"
 
-#: kfile/kfiledialog.cpp:1994
+#: tdefile/tdefiledialog.cpp:1994
 #, fuzzy
 msgid ""
 "This option enables some convenient features for saving files with extensions:"
@@ -4250,7 +4250,7 @@ msgstr ""
 "awtomatig).</li></ol>Os nad ydych yn sicr, alluogwch y dewisiad yma, oherwydd "
 "mae'n gwneud eich ffeiliau yn haws eu trefnu."
 
-#: kfile/kfiledialog.cpp:2268
+#: tdefile/tdefiledialog.cpp:2268
 msgid ""
 "<qt>This button allows you to bookmark specific locations. Click on this button "
 "to open the bookmark menu where you may add, edit or select a bookmark."
@@ -4263,36 +4263,36 @@ msgstr ""
 "<p>Mae'r tudnodau yma yn benodol i'r deialog ffeil, ond ym mhob modd arall "
 "maent yn ymddwyn fel tudnodau mewn llefydd eraill yn TDE.</qt> "
 
-#: kfile/kfileiconview.cpp:62
+#: tdefile/tdefileiconview.cpp:62
 msgid "Small Icons"
 msgstr "Eiconau Bach "
 
-#: kfile/kfileiconview.cpp:67
+#: tdefile/tdefileiconview.cpp:67
 msgid "Large Icons"
 msgstr "Eiconau Mawr"
 
-#: kfile/kfileiconview.cpp:75
+#: tdefile/tdefileiconview.cpp:75
 msgid "Thumbnail Previews"
 msgstr "Rhagolygon Cryno"
 
-#: kfile/kfileiconview.cpp:119
+#: tdefile/tdefileiconview.cpp:119
 msgid "Icon View"
 msgstr "Golwg Eicon"
 
-#: kfile/kurlrequester.cpp:213
+#: tdefile/kurlrequester.cpp:213
 msgid "Open file dialog"
 msgstr "Agor Ymgom Ffeil"
 
-#: kfile/kdiroperator.cpp:448
+#: tdefile/tdediroperator.cpp:448
 #, fuzzy
 msgid "You did not select a file to delete."
 msgstr "Wnaethoch chi ddim dewis ffeil i ddileu."
 
-#: kfile/kdiroperator.cpp:449
+#: tdefile/tdediroperator.cpp:449
 msgid "Nothing to Delete"
 msgstr "Dim byd i'w dileu."
 
-#: kfile/kdiroperator.cpp:471
+#: tdefile/tdediroperator.cpp:471
 msgid ""
 "<qt>Do you really want to delete\n"
 " <b>'%1'</b>?</qt>"
@@ -4300,11 +4300,11 @@ msgstr ""
 "<qt>Ydych wir eisiau dileu\n"
 " <b>'%1'</b>?</qt>"
 
-#: kfile/kdiroperator.cpp:473
+#: tdefile/tdediroperator.cpp:473
 msgid "Delete File"
 msgstr "Dileu Ffeil"
 
-#: kfile/kdiroperator.cpp:478
+#: tdefile/tdediroperator.cpp:478
 #, c-format
 msgid ""
 "_n: Do you really want to delete this item?\n"
@@ -4313,21 +4313,21 @@ msgstr ""
 "Ydych wir eisiau dileu yr eitem yma?\n"
 "Ydych wir eisiau dileu y %n o eitemau yma?"
 
-#: kfile/kdiroperator.cpp:480
+#: tdefile/tdediroperator.cpp:480
 msgid "Delete Files"
 msgstr "Dileu Ffeiliau"
 
-#: kfile/kdiroperator.cpp:511
+#: tdefile/tdediroperator.cpp:511
 #, fuzzy
 msgid "You did not select a file to trash."
 msgstr "Wnaethoch chi ddim dewis ffeil i ddileu."
 
-#: kfile/kdiroperator.cpp:512
+#: tdefile/tdediroperator.cpp:512
 #, fuzzy
 msgid "Nothing to Trash"
 msgstr "Dim byd i'w Ddadwneud"
 
-#: kfile/kdiroperator.cpp:534
+#: tdefile/tdediroperator.cpp:534
 #, fuzzy
 msgid ""
 "<qt>Do you really want to trash\n"
@@ -4336,18 +4336,18 @@ msgstr ""
 "<qt>Ydych wir eisiau dileu\n"
 " <b>'%1'</b>?</qt>"
 
-#: kfile/kdiroperator.cpp:536
+#: tdefile/tdediroperator.cpp:536
 #, fuzzy
 msgid "Trash File"
 msgstr "Sbwriel"
 
-#: kfile/kdiroperator.cpp:537 kfile/kdiroperator.cpp:544
+#: tdefile/tdediroperator.cpp:537 tdefile/tdediroperator.cpp:544
 msgid ""
 "_: to trash\n"
 "&Trash"
 msgstr ""
 
-#: kfile/kdiroperator.cpp:541
+#: tdefile/tdediroperator.cpp:541
 #, fuzzy, c-format
 msgid ""
 "_n: translators: not called for n == 1\n"
@@ -4356,167 +4356,167 @@ msgstr ""
 "Ydych wir eisiau dileu'r %n eitem yma? \n"
 "Ydych wir eisiau dileu'r %n eitem yma?"
 
-#: kfile/kdiroperator.cpp:543
+#: tdefile/tdediroperator.cpp:543
 #, fuzzy
 msgid "Trash Files"
 msgstr "Ffeiliau dros dro"
 
-#: kfile/kdiroperator.cpp:658 kfile/kdiroperator.cpp:726
+#: tdefile/tdediroperator.cpp:658 tdefile/tdediroperator.cpp:726
 msgid "The specified folder does not exist or was not readable."
 msgstr "Nid ydy'r plygell penodol yn bodoli, neu doedd o ddim yn ddarllenadwy."
 
-#: kfile/kdiroperator.cpp:920 kfile/kdiroperator.cpp:1321
-#: kfile/kfiledetailview.cpp:64
+#: tdefile/tdediroperator.cpp:920 tdefile/tdediroperator.cpp:1321
+#: tdefile/tdefiledetailview.cpp:64
 msgid "Detailed View"
 msgstr "Golwg Manwl"
 
-#: kfile/kdiroperator.cpp:925 kfile/kdiroperator.cpp:1319
+#: tdefile/tdediroperator.cpp:925 tdefile/tdediroperator.cpp:1319
 msgid "Short View"
 msgstr "Golwg Byr"
 
-#: kfile/kdiroperator.cpp:1260
+#: tdefile/tdediroperator.cpp:1260
 msgid "Parent Folder"
 msgstr "Plygell Rhiant"
 
-#: kfile/kdiroperator.cpp:1271
+#: tdefile/tdediroperator.cpp:1271
 msgid "Move to Trash"
 msgstr "Symud i'r Sbwriel"
 
-#: kfile/kdiroperator.cpp:1282
+#: tdefile/tdediroperator.cpp:1282
 msgid "Sorting"
 msgstr "Didoli"
 
-#: kfile/kdiroperator.cpp:1283
+#: tdefile/tdediroperator.cpp:1283
 msgid "By Name"
 msgstr "Gan Enw"
 
-#: kfile/kdiroperator.cpp:1286
+#: tdefile/tdediroperator.cpp:1286
 msgid "By Date"
 msgstr "Gan Ddyddiad"
 
-#: kfile/kdiroperator.cpp:1289
+#: tdefile/tdediroperator.cpp:1289
 msgid "By Size"
 msgstr "Gan Faint"
 
-#: kfile/kdiroperator.cpp:1292
+#: tdefile/tdediroperator.cpp:1292
 msgid "Reverse"
 msgstr "Gwrthwyneb"
 
-#: kfile/kdiroperator.cpp:1302
+#: tdefile/tdediroperator.cpp:1302
 msgid "Folders First"
 msgstr "Plygyll yn Gyntaf"
 
-#: kfile/kdiroperator.cpp:1304
+#: tdefile/tdediroperator.cpp:1304
 msgid "Case Insensitive"
 msgstr "Dim bwys am lythrennau bras"
 
-#: kfile/kdiroperator.cpp:1324
+#: tdefile/tdediroperator.cpp:1324
 msgid "Show Hidden Files"
 msgstr "Dangos Ffeiliau Cudd"
 
-#: kfile/kdiroperator.cpp:1327
+#: tdefile/tdediroperator.cpp:1327
 msgid "Separate Folders"
 msgstr "Plygyll ar Wahân"
 
-#: kfile/kdiroperator.cpp:1331
+#: tdefile/tdediroperator.cpp:1331
 msgid "Show Preview"
 msgstr "Dangos Rhagolwg"
 
-#: kfile/kdiroperator.cpp:1335
+#: tdefile/tdediroperator.cpp:1335
 #, fuzzy
 msgid "Hide Preview"
 msgstr "Rhagweld"
 
-#: kfile/kfiledetailview.cpp:68
+#: tdefile/tdefiledetailview.cpp:68
 msgid "Date"
 msgstr "Dyddiad"
 
-#: kfile/kfiledetailview.cpp:69
+#: tdefile/tdefiledetailview.cpp:69
 msgid "Permissions"
 msgstr "Caniatad"
 
-#: kfile/kfiledetailview.cpp:71 kfile/kpropertiesdialog.cpp:1976
+#: tdefile/tdefiledetailview.cpp:71 tdefile/kpropertiesdialog.cpp:1976
 msgid "Group"
 msgstr "Grw^p"
 
-#: kfile/kmetaprops.cpp:130
+#: tdefile/kmetaprops.cpp:130
 msgid "&Meta Info"
 msgstr "&Gwybodaeth Meta"
 
-#: kfile/kpropertiesdialog.cpp:177 kfile/kpropertiesdialog.cpp:193
-#: kfile/kpropertiesdialog.cpp:209 kfile/kpropertiesdialog.cpp:232
-#: kfile/kpropertiesdialog.cpp:252 kfile/kpropertiesdialog.cpp:272
+#: tdefile/kpropertiesdialog.cpp:177 tdefile/kpropertiesdialog.cpp:193
+#: tdefile/kpropertiesdialog.cpp:209 tdefile/kpropertiesdialog.cpp:232
+#: tdefile/kpropertiesdialog.cpp:252 tdefile/kpropertiesdialog.cpp:272
 #, c-format
 msgid "Properties for %1"
 msgstr "Priodweddau i %1"
 
-#: kfile/kpropertiesdialog.cpp:208
+#: tdefile/kpropertiesdialog.cpp:208
 #, fuzzy, c-format
 msgid ""
 "_n: <never used>\n"
 "Properties for %n Selected Items"
 msgstr "Priodweddau i %1"
 
-#: kfile/kpropertiesdialog.cpp:740
+#: tdefile/kpropertiesdialog.cpp:740
 msgid "&General"
 msgstr "&Cyffredin"
 
-#: kfile/kpropertiesdialog.cpp:944
+#: tdefile/kpropertiesdialog.cpp:944
 msgid "Create new file type"
 msgstr "Creu math ffeil newydd"
 
-#: kfile/kpropertiesdialog.cpp:946
+#: tdefile/kpropertiesdialog.cpp:946
 msgid "Edit file type"
 msgstr "Golygu math y ffeil"
 
-#: kfile/kpropertiesdialog.cpp:959
+#: tdefile/kpropertiesdialog.cpp:959
 msgid "Contents:"
 msgstr "Cynnwys:"
 
-#: kfile/kpropertiesdialog.cpp:1001
+#: tdefile/kpropertiesdialog.cpp:1001
 msgid "Calculate"
 msgstr "Cyfrifo"
 
-#: kfile/kpropertiesdialog.cpp:1012 kfile/kpropertiesdialog.cpp:1239
+#: tdefile/kpropertiesdialog.cpp:1012 tdefile/kpropertiesdialog.cpp:1239
 msgid "Refresh"
 msgstr "Adnewyddu"
 
-#: kfile/kpropertiesdialog.cpp:1020
+#: tdefile/kpropertiesdialog.cpp:1020
 msgid "Points to:"
 msgstr "Cyfeirio at:"
 
-#: kfile/kpropertiesdialog.cpp:1034
+#: tdefile/kpropertiesdialog.cpp:1034
 msgid "Created:"
 msgstr "Creuwyd:"
 
-#: kfile/kpropertiesdialog.cpp:1056
+#: tdefile/kpropertiesdialog.cpp:1056
 msgid "Accessed:"
 msgstr "Agorwyd:"
 
-#: kfile/kpropertiesdialog.cpp:1075
+#: tdefile/kpropertiesdialog.cpp:1075
 msgid "Mounted on:"
 msgstr "Wedi'i arosod ar:"
 
-#: kfile/kpropertiesdialog.cpp:1082 kfile/kpropertiesdialog.cpp:2888
+#: tdefile/kpropertiesdialog.cpp:1082 tdefile/kpropertiesdialog.cpp:2888
 msgid "Free disk space:"
 msgstr "Lle ddisg wag:"
 
-#: kfile/kpropertiesdialog.cpp:1189 kfile/kpropertiesdialog.cpp:1204
-#: kfile/kpropertiesdialog.cpp:3031
+#: tdefile/kpropertiesdialog.cpp:1189 tdefile/kpropertiesdialog.cpp:1204
+#: tdefile/kpropertiesdialog.cpp:3031
 #, no-c-format
 msgid ""
 "_: Available space out of total partition size (percent used)\n"
 "%1 out of %2 (%3% used)"
 msgstr "%1allan o %2 (defnyddir %3%)"
 
-#: kfile/kpropertiesdialog.cpp:1215
+#: tdefile/kpropertiesdialog.cpp:1215
 #, fuzzy
 msgid ""
 "Calculating... %1 (%2)\n"
 "%3, %4"
 msgstr "Cyfrifo ... %1 (%2)"
 
-#: kfile/kpropertiesdialog.cpp:1218 kfile/kpropertiesdialog.cpp:1234
+#: tdefile/kpropertiesdialog.cpp:1218 tdefile/kpropertiesdialog.cpp:1234
 #, fuzzy, c-format
 msgid ""
 "_n: 1 file\n"
@@ -4525,7 +4525,7 @@ msgstr ""
 "%n ffeil\n"
 "%n o ffeiliau"
 
-#: kfile/kpropertiesdialog.cpp:1219 kfile/kpropertiesdialog.cpp:1235
+#: tdefile/kpropertiesdialog.cpp:1219 tdefile/kpropertiesdialog.cpp:1235
 #, fuzzy, c-format
 msgid ""
 "_n: 1 sub-folder\n"
@@ -4534,23 +4534,23 @@ msgstr ""
 "%n plygell\n"
 "%n o blygyll"
 
-#: kfile/kpropertiesdialog.cpp:1248
+#: tdefile/kpropertiesdialog.cpp:1248
 msgid "Calculating..."
 msgstr "Cyfrifo ..."
 
-#: kfile/kpropertiesdialog.cpp:1282
+#: tdefile/kpropertiesdialog.cpp:1282
 msgid "Stopped"
 msgstr "Wedi aros"
 
-#: kfile/kpropertiesdialog.cpp:1322
+#: tdefile/kpropertiesdialog.cpp:1322
 #, fuzzy
 msgid "The new file name is empty."
 msgstr "Mae enw'r ffeil newydd yn wag!"
 
-#: kfile/kpropertiesdialog.cpp:1460 kfile/kpropertiesdialog.cpp:2621
-#: kfile/kpropertiesdialog.cpp:2778 kfile/kpropertiesdialog.cpp:3059
-#: kfile/kpropertiesdialog.cpp:3340 kfile/kpropertiesdialog.cpp:3836
-#: kfile/kpropertiesdialog.cpp:4079
+#: tdefile/kpropertiesdialog.cpp:1460 tdefile/kpropertiesdialog.cpp:2621
+#: tdefile/kpropertiesdialog.cpp:2778 tdefile/kpropertiesdialog.cpp:3059
+#: tdefile/kpropertiesdialog.cpp:3340 tdefile/kpropertiesdialog.cpp:3836
+#: tdefile/kpropertiesdialog.cpp:4079
 msgid ""
 "<qt>Could not save properties. You do not have sufficient access to write to <b>"
 "%1</b>.</qt>"
@@ -4558,44 +4558,44 @@ msgstr ""
 "<qt>Methu cadw priodweddau. Does ganddych ganiatadau digonol i  ysgrifennu i <b>"
 "%1</b>.</qt>"
 
-#: kfile/kpropertiesdialog.cpp:1534 kfile/kpropertiesdialog.cpp:1538
-#: kfile/kpropertiesdialog.cpp:1543
+#: tdefile/kpropertiesdialog.cpp:1534 tdefile/kpropertiesdialog.cpp:1538
+#: tdefile/kpropertiesdialog.cpp:1543
 msgid "Forbidden"
 msgstr "Gwaharddir"
 
-#: kfile/kpropertiesdialog.cpp:1535
+#: tdefile/kpropertiesdialog.cpp:1535
 msgid "Can Read"
 msgstr " Gallu Darllen"
 
-#: kfile/kpropertiesdialog.cpp:1536
+#: tdefile/kpropertiesdialog.cpp:1536
 msgid "Can Read & Write"
 msgstr "Gallu Darllen ac Ysgrifennu"
 
-#: kfile/kpropertiesdialog.cpp:1539
+#: tdefile/kpropertiesdialog.cpp:1539
 msgid "Can View Content"
 msgstr " Gallu Edrych ar Gynnwys"
 
-#: kfile/kpropertiesdialog.cpp:1540
+#: tdefile/kpropertiesdialog.cpp:1540
 msgid "Can View & Modify Content"
 msgstr "Gallu Edrych ar a Newid Cynnwys"
 
-#: kfile/kpropertiesdialog.cpp:1544
+#: tdefile/kpropertiesdialog.cpp:1544
 msgid "Can View Content & Read"
 msgstr "Gallu Edrych ar Gynnwys a Darllen"
 
-#: kfile/kpropertiesdialog.cpp:1545
+#: tdefile/kpropertiesdialog.cpp:1545
 msgid "Can View/Read & Modify/Write"
 msgstr " Gallu Edrych/Darllen a Newid/Ysgrifennu"
 
-#: kfile/kpropertiesdialog.cpp:1639
+#: tdefile/kpropertiesdialog.cpp:1639
 msgid "&Permissions"
 msgstr "&Caniatadau"
 
-#: kfile/kpropertiesdialog.cpp:1650 kfile/kpropertiesdialog.cpp:1904
+#: tdefile/kpropertiesdialog.cpp:1650 tdefile/kpropertiesdialog.cpp:1904
 msgid "Access Permissions"
 msgstr "Caniatadau Cyrchu"
 
-#: kfile/kpropertiesdialog.cpp:1661
+#: tdefile/kpropertiesdialog.cpp:1661
 msgid ""
 "_n: This file is a link and does not have permissions.\n"
 "All files are links and do not have permissions."
@@ -4603,31 +4603,31 @@ msgstr ""
 "Mae'r %n ffeil yma yn gyswllt ac nid oes ganddo ganiatadau. \n"
 "Mae'r %n ffeiliau i gyd yn gysylltau ac nid oes ganddynt ganiatadau."
 
-#: kfile/kpropertiesdialog.cpp:1664
+#: tdefile/kpropertiesdialog.cpp:1664
 msgid "Only the owner can change permissions."
 msgstr "Neb ond y perchennog sy'n gallu newid caniatadau."
 
-#: kfile/kpropertiesdialog.cpp:1667
+#: tdefile/kpropertiesdialog.cpp:1667
 msgid "O&wner:"
 msgstr "Perc&hennog:"
 
-#: kfile/kpropertiesdialog.cpp:1673
+#: tdefile/kpropertiesdialog.cpp:1673
 msgid "Specifies the actions that the owner is allowed to do."
 msgstr "Penodi'r gweithrediadau y mae'r perchennog yn cael gwneud."
 
-#: kfile/kpropertiesdialog.cpp:1675
+#: tdefile/kpropertiesdialog.cpp:1675
 msgid "Gro&up:"
 msgstr "Gr&w^p:"
 
-#: kfile/kpropertiesdialog.cpp:1681
+#: tdefile/kpropertiesdialog.cpp:1681
 msgid "Specifies the actions that the members of the group are allowed to do."
 msgstr "Penodi'r gweithrediadau y mae aelodau'r grw^p yn cael gwneud."
 
-#: kfile/kpropertiesdialog.cpp:1683
+#: tdefile/kpropertiesdialog.cpp:1683
 msgid "O&thers:"
 msgstr "E&raill:"
 
-#: kfile/kpropertiesdialog.cpp:1689
+#: tdefile/kpropertiesdialog.cpp:1689
 msgid ""
 "Specifies the actions that all users, who are neither owner nor in the group, "
 "are allowed to do."
@@ -4635,15 +4635,15 @@ msgstr ""
 "Penodi'r gweithrediadau y mae pob defnyddiwr, sy ddim yn berchennog neu aelod y "
 "grw^p, yn cael gwneud."
 
-#: kfile/kpropertiesdialog.cpp:1694
+#: tdefile/kpropertiesdialog.cpp:1694
 msgid "Only own&er can rename and delete folder content"
 msgstr "Neb ond y per&chennog sy'n cael ail-enwi a dileu cynnwys plygell"
 
-#: kfile/kpropertiesdialog.cpp:1695
+#: tdefile/kpropertiesdialog.cpp:1695
 msgid "Is &executable"
 msgstr "Gallu ei &Weithredu"
 
-#: kfile/kpropertiesdialog.cpp:1699
+#: tdefile/kpropertiesdialog.cpp:1699
 msgid ""
 "Enable this option to allow only the folder's owner to delete or rename the "
 "contained files and folders. Other users can only add new files, which requires "
@@ -4653,7 +4653,7 @@ msgstr ""
 "ail-enwi'r ffeiliau neu plygyll sydd ynddo.  Mae defnyddwyr eraill yn gallu "
 "ychwanegu dim ond ffeiliau newydd, sy'n galw am y caniatad 'Addasu Cynnwys'."
 
-#: kfile/kpropertiesdialog.cpp:1703
+#: tdefile/kpropertiesdialog.cpp:1703
 msgid ""
 "Enable this option to mark the file as executable. This only makes sense for "
 "programs and scripts. It is required when you want to execute them."
@@ -4662,35 +4662,35 @@ msgstr ""
 "synnwyr i ddim ond rhaglenni a sgriptiau.  Mae'n angenrheidiol os byddwch "
 "eisiau eu gweithredu."
 
-#: kfile/kpropertiesdialog.cpp:1710
+#: tdefile/kpropertiesdialog.cpp:1710
 msgid "A&dvanced Permissions"
 msgstr "C&aniatadau Uwch"
 
-#: kfile/kpropertiesdialog.cpp:1719
+#: tdefile/kpropertiesdialog.cpp:1719
 msgid "Ownership"
 msgstr "Perchenogaeth"
 
-#: kfile/kpropertiesdialog.cpp:1728
+#: tdefile/kpropertiesdialog.cpp:1728
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: kfile/kpropertiesdialog.cpp:1814
+#: tdefile/kpropertiesdialog.cpp:1814
 msgid "Group:"
 msgstr "Grw^p:"
 
-#: kfile/kpropertiesdialog.cpp:1856
+#: tdefile/kpropertiesdialog.cpp:1856
 msgid "Apply changes to all subfolders and their contents"
 msgstr "Gosod newidiadau i bob is-blygell a'i gynnwys."
 
-#: kfile/kpropertiesdialog.cpp:1894
+#: tdefile/kpropertiesdialog.cpp:1894
 msgid "Advanced Permissions"
 msgstr "Caniatadau Uwch"
 
-#: kfile/kpropertiesdialog.cpp:1913
+#: tdefile/kpropertiesdialog.cpp:1913
 msgid "Class"
 msgstr "Dosbarth"
 
-#: kfile/kpropertiesdialog.cpp:1918
+#: tdefile/kpropertiesdialog.cpp:1918
 msgid ""
 "Show\n"
 "Entries"
@@ -4698,19 +4698,19 @@ msgstr ""
 " Dangos\n"
 " Cofnodion"
 
-#: kfile/kpropertiesdialog.cpp:1920
+#: tdefile/kpropertiesdialog.cpp:1920
 msgid "Read"
 msgstr "Darllen"
 
-#: kfile/kpropertiesdialog.cpp:1925
+#: tdefile/kpropertiesdialog.cpp:1925
 msgid "This flag allows viewing the content of the folder."
 msgstr "Mae'r faner yma yn gadael gweld cynnwys y plygell."
 
-#: kfile/kpropertiesdialog.cpp:1927
+#: tdefile/kpropertiesdialog.cpp:1927
 msgid "The Read flag allows viewing the content of the file."
 msgstr "Mae'r faner Ddarllen yn gadael gweld cynnwys y ffeil."
 
-#: kfile/kpropertiesdialog.cpp:1931
+#: tdefile/kpropertiesdialog.cpp:1931
 msgid ""
 "Write\n"
 "Entries"
@@ -4718,11 +4718,11 @@ msgstr ""
 " Ysgrifennu\n"
 " Cofnodion"
 
-#: kfile/kpropertiesdialog.cpp:1933
+#: tdefile/kpropertiesdialog.cpp:1933
 msgid "Write"
 msgstr "Ysgrifennu"
 
-#: kfile/kpropertiesdialog.cpp:1938
+#: tdefile/kpropertiesdialog.cpp:1938
 msgid ""
 "This flag allows adding, renaming and deleting of files. Note that deleting and "
 "renaming can be limited using the Sticky flag."
@@ -4730,33 +4730,33 @@ msgstr ""
 " Mae'r faner yma yn gadael ychwanegu, ail-enwi a dileu ffeiliau.  Noder: gellir "
 "cyfyngu dileu ac ail-enwi gan ddefnyddio'r faner Gludiog."
 
-#: kfile/kpropertiesdialog.cpp:1941
+#: tdefile/kpropertiesdialog.cpp:1941
 msgid "The Write flag allows modifying the content of the file."
 msgstr "Mae'r faner Ysgrifennu yn gadael addasu cynnwys y ffeil."
 
-#: kfile/kpropertiesdialog.cpp:1946
+#: tdefile/kpropertiesdialog.cpp:1946
 msgid ""
 "_: Enter folder\n"
 "Enter"
 msgstr "Mynd i mewn"
 
-#: kfile/kpropertiesdialog.cpp:1947
+#: tdefile/kpropertiesdialog.cpp:1947
 msgid "Enable this flag to allow entering the folder."
 msgstr "Galluogi'r faner yma i adael mynd i mewn i'r plygell."
 
-#: kfile/kpropertiesdialog.cpp:1950
+#: tdefile/kpropertiesdialog.cpp:1950
 msgid "Exec"
 msgstr "Gweithredu"
 
-#: kfile/kpropertiesdialog.cpp:1951
+#: tdefile/kpropertiesdialog.cpp:1951
 msgid "Enable this flag to allow executing the file as a program."
 msgstr "Galluogi'r faner yma i adael gweithredu'r ffeil fel rhaglen."
 
-#: kfile/kpropertiesdialog.cpp:1961
+#: tdefile/kpropertiesdialog.cpp:1961
 msgid "Special"
 msgstr "Arbennig"
 
-#: kfile/kpropertiesdialog.cpp:1965
+#: tdefile/kpropertiesdialog.cpp:1965
 msgid ""
 "Special flag. Valid for the whole folder, the exact meaning of the flag can be "
 "seen in the right hand column."
@@ -4764,31 +4764,31 @@ msgstr ""
 "Baner arbennig.  Dilys i'r plygell cyfan.  Gall ystyr cywir y faner gael ei "
 "weld yn y golofn dde."
 
-#: kfile/kpropertiesdialog.cpp:1968
+#: tdefile/kpropertiesdialog.cpp:1968
 msgid ""
 "Special flag. The exact meaning of the flag can be seen in the right hand "
 "column."
 msgstr ""
 "Baner arbennig.  Gall ystyr cywir y faner gael ei weld yn y golofn dde."
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 95
-#: kfile/kpropertiesdialog.cpp:1972 rc.cpp:96
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 95
+#: tdefile/kpropertiesdialog.cpp:1972 rc.cpp:96
 #, no-c-format
 msgid "User"
 msgstr "Defnyddiwr"
 
-#: kfile/kpropertiesdialog.cpp:1984
+#: tdefile/kpropertiesdialog.cpp:1984
 msgid "Set UID"
 msgstr "Gosod UID"
 
-#: kfile/kpropertiesdialog.cpp:1988
+#: tdefile/kpropertiesdialog.cpp:1988
 msgid ""
 "If this flag is set, the owner of this folder will be the owner of all new "
 "files."
 msgstr ""
 "Os osodir y faner yma, bydd perchennog y plygell yma yn biau pob ffeil newydd."
 
-#: kfile/kpropertiesdialog.cpp:1991
+#: tdefile/kpropertiesdialog.cpp:1991
 msgid ""
 "If this file is an executable and the flag is set, it will be executed with the "
 "permissions of the owner."
@@ -4796,18 +4796,18 @@ msgstr ""
 "Os mae'r ffeil yma yn weithredadwy ac mae'r faner wedi ei gosod, bydd o'n cael "
 "ei weithredu efo caniatadau'r perchennog."
 
-#: kfile/kpropertiesdialog.cpp:1995
+#: tdefile/kpropertiesdialog.cpp:1995
 msgid "Set GID"
 msgstr "Gosod GID"
 
-#: kfile/kpropertiesdialog.cpp:1999
+#: tdefile/kpropertiesdialog.cpp:1999
 msgid ""
 "If this flag is set, the group of this folder will be set for all new files."
 msgstr ""
 "Os osodir y faner yma, bydd cylch y plygell yma yn cael ei osod am bob ffeil "
 "newydd."
 
-#: kfile/kpropertiesdialog.cpp:2002
+#: tdefile/kpropertiesdialog.cpp:2002
 msgid ""
 "If this file is an executable and the flag is set, it will be executed with the "
 "permissions of the group."
@@ -4815,13 +4815,13 @@ msgstr ""
 "Os mae'r ffeil yma yn weithredadwy ac mae'r faner wedi ei gosod, bydd o'n cael "
 "ei weithredu efo caniatadau'r grw^p."
 
-#: kfile/kpropertiesdialog.cpp:2006
+#: tdefile/kpropertiesdialog.cpp:2006
 msgid ""
 "_: File permission\n"
 "Sticky"
 msgstr "Gludiog"
 
-#: kfile/kpropertiesdialog.cpp:2010
+#: tdefile/kpropertiesdialog.cpp:2010
 msgid ""
 "If the Sticky flag is set on a folder, only the owner and root can delete or "
 "rename files. Otherwise everybody with write permissions can do this."
@@ -4830,22 +4830,22 @@ msgstr ""
 "dileu neu ail-enwi ffeiliau.  Fel arall, mae pawb sydd efo caniatadau "
 "ysgrifennu yn gallu gwneud hyn."
 
-#: kfile/kpropertiesdialog.cpp:2014
+#: tdefile/kpropertiesdialog.cpp:2014
 msgid ""
 "The Sticky flag on a file is ignored on Linux, but may be used on some systems"
 msgstr ""
 " Mae'r faner Gludiog ar ffeil yn cael ei anywbyddu ar Linux, ond gall ei "
 "defnyddio ar rhai cysodau"
 
-#: kfile/kpropertiesdialog.cpp:2193
+#: tdefile/kpropertiesdialog.cpp:2193
 msgid "Link"
 msgstr " Cyswllt"
 
-#: kfile/kpropertiesdialog.cpp:2209
+#: tdefile/kpropertiesdialog.cpp:2209
 msgid "Varying (No Change)"
 msgstr "Amrywio (Dim Newid)"
 
-#: kfile/kpropertiesdialog.cpp:2308
+#: tdefile/kpropertiesdialog.cpp:2308
 msgid ""
 "_n: This file uses advanced permissions\n"
 "These files use advanced permissions."
@@ -4853,7 +4853,7 @@ msgstr ""
 "Mae'r %n ffeil yma yn defnyddio caniatadau uwch. \n"
 "Mae'r %n ffeiliau yma yn defnyddio caniatadau uwch."
 
-#: kfile/kpropertiesdialog.cpp:2329
+#: tdefile/kpropertiesdialog.cpp:2329
 msgid ""
 "_n: This folder uses advanced permissions.\n"
 "These folders use advanced permissions."
@@ -4861,73 +4861,73 @@ msgstr ""
 "Mae'r %n plygell yma yn defnyddio caniatadau uwch. \n"
 "Mae'r %n plygyll yma yn defnyddio caniatadau uwch."
 
-#: kfile/kpropertiesdialog.cpp:2344
+#: tdefile/kpropertiesdialog.cpp:2344
 msgid "These files use advanced permissions."
 msgstr "Mae'r ffeiliau yma yn defnyddio caniatadau uwch."
 
-#: kfile/kpropertiesdialog.cpp:2560
+#: tdefile/kpropertiesdialog.cpp:2560
 msgid "U&RL"
 msgstr "U&RL"
 
-#: kfile/kpropertiesdialog.cpp:2665
+#: tdefile/kpropertiesdialog.cpp:2665
 msgid "A&ssociation"
 msgstr "&Cyd"
 
-#: kfile/kpropertiesdialog.cpp:2674
+#: tdefile/kpropertiesdialog.cpp:2674
 msgid "Pattern ( example: *.html;*.htm )"
 msgstr "Patrwm (enghraifft: *.html;*.htm )"
 
-#: kfile/kpropertiesdialog.cpp:2707
+#: tdefile/kpropertiesdialog.cpp:2707
 msgid "Left click previews"
 msgstr "Rhagolygon chwith-glic"
 
-#: kfile/kpropertiesdialog.cpp:2826
+#: tdefile/kpropertiesdialog.cpp:2826
 msgid "De&vice"
 msgstr "Dy&fais"
 
-#: kfile/kpropertiesdialog.cpp:2856
+#: tdefile/kpropertiesdialog.cpp:2856
 msgid "Device (/dev/fd0):"
 msgstr "Dyfais (/dev/fd0):"
 
-#: kfile/kpropertiesdialog.cpp:2857
+#: tdefile/kpropertiesdialog.cpp:2857
 msgid "Device:"
 msgstr "Dyfais:"
 
-#: kfile/kpropertiesdialog.cpp:2867
+#: tdefile/kpropertiesdialog.cpp:2867
 msgid "Read only"
 msgstr "Darllen yn unig"
 
-#: kfile/kpropertiesdialog.cpp:2871
+#: tdefile/kpropertiesdialog.cpp:2871
 #, fuzzy
 msgid "File system:"
 msgstr "Cysodau ffeil"
 
-#: kfile/kpropertiesdialog.cpp:2879
+#: tdefile/kpropertiesdialog.cpp:2879
 msgid "Mount point (/mnt/floppy):"
 msgstr "Man gosod (/mnt/floppy):"
 
-#: kfile/kpropertiesdialog.cpp:2880
+#: tdefile/kpropertiesdialog.cpp:2880
 msgid "Mount point:"
 msgstr "Man gosod:"
 
-#: kfile/kpropertiesdialog.cpp:2911
+#: tdefile/kpropertiesdialog.cpp:2911
 msgid "Unmounted Icon"
 msgstr "Eicon diosod"
 
-#: kfile/kpropertiesdialog.cpp:3091 kfile/kpropertiesdialog.cpp:3896
+#: tdefile/kpropertiesdialog.cpp:3091 tdefile/kpropertiesdialog.cpp:3896
 msgid "&Application"
 msgstr "&Cymhwysiad"
 
-#: kfile/kpropertiesdialog.cpp:3213
+#: tdefile/kpropertiesdialog.cpp:3213
 #, c-format
 msgid "Add File Type for %1"
 msgstr "Ychwanegu Math Ffeil am %1"
 
-#: bookmarks/kbookmarkmenu.cc:829 kfile/kpropertiesdialog.cpp:3216
+#: bookmarks/kbookmarkmenu.cc:829 tdefile/kpropertiesdialog.cpp:3216
 msgid "&Add"
 msgstr "&Ychwanegu"
 
-#: kfile/kpropertiesdialog.cpp:3217 kfile/kpropertiesdialog.cpp:3218
+#: tdefile/kpropertiesdialog.cpp:3217 tdefile/kpropertiesdialog.cpp:3218
 msgid ""
 "Add the selected file types to\n"
 "the list of supported file types."
@@ -4935,24 +4935,24 @@ msgstr ""
 "Ychwanegu'r mathau ffeiliau penodol\n"
 "i'r rhestr o fathau ffeil a gynhelir."
 
-#: kfile/kpropertiesdialog.cpp:3412 kfile/kpropertiesdialog.cpp:3868
+#: tdefile/kpropertiesdialog.cpp:3412 tdefile/kpropertiesdialog.cpp:3868
 msgid "Only executables on local file systems are supported."
 msgstr "Cynhelir 'mond gweithredadweau  ar gysodau ffeil lleol."
 
-#: kfile/kpropertiesdialog.cpp:3424
+#: tdefile/kpropertiesdialog.cpp:3424
 #, c-format
 msgid "Advanced Options for %1"
 msgstr "Dewisiadau Uwch am %1"
 
-#: kfile/kpropertiesdialog.cpp:3583
+#: tdefile/kpropertiesdialog.cpp:3583
 msgid "E&xecute"
 msgstr "G&weithredu"
 
-#: kfile/kpropertiesdialog.cpp:3590
+#: tdefile/kpropertiesdialog.cpp:3590
 msgid "Comman&d:"
 msgstr "Gorchym&n:"
 
-#: kfile/kpropertiesdialog.cpp:3599
+#: tdefile/kpropertiesdialog.cpp:3599
 msgid ""
 "Following the command, you can have several place holders which will be "
 "replaced with the actual values when the actual program is run:\n"
@@ -4980,72 +4980,72 @@ msgstr ""
 "%m - yr eicon bach\n"
 "%c - y sylwad"
 
-#: kfile/kpropertiesdialog.cpp:3620
+#: tdefile/kpropertiesdialog.cpp:3620
 msgid "Panel Embedding"
 msgstr "Mewnadeiladu Panel"
 
-#: kfile/kpropertiesdialog.cpp:3629
+#: tdefile/kpropertiesdialog.cpp:3629
 msgid "&Execute on click:"
 msgstr "&Gweithredu ar glic:"
 
-#: kfile/kpropertiesdialog.cpp:3637
+#: tdefile/kpropertiesdialog.cpp:3637
 msgid "&Window title:"
 msgstr "&Teitl Ffenestr:"
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 55
-#: kfile/kpropertiesdialog.cpp:3657 rc.cpp:81
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 55
+#: tdefile/kpropertiesdialog.cpp:3657 rc.cpp:81
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "&Rhedeg mewn terfynell"
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 77
-#: kfile/kpropertiesdialog.cpp:3672 rc.cpp:90
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 77
+#: tdefile/kpropertiesdialog.cpp:3672 rc.cpp:90
 #, no-c-format
 msgid "Do not &close when command exits"
 msgstr "Peidiwch a c&hau pan bydd y gorchymyn yn terfynu."
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 66
-#: kfile/kpropertiesdialog.cpp:3676 rc.cpp:87
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 66
+#: tdefile/kpropertiesdialog.cpp:3676 rc.cpp:87
 #, no-c-format
 msgid "&Terminal options:"
 msgstr "&Dewisiadau Terfynell"
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 106
-#: kfile/kpropertiesdialog.cpp:3696 rc.cpp:99
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 106
+#: tdefile/kpropertiesdialog.cpp:3696 rc.cpp:99
 #, no-c-format
 msgid "Ru&n as a different user"
 msgstr "Rhede&g fel defnyddiwr gwahanol"
 
-#: kfile/kpropertiesdialog.cpp:3937
+#: tdefile/kpropertiesdialog.cpp:3937
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: kfile/kpropertiesdialog.cpp:3943
+#: tdefile/kpropertiesdialog.cpp:3943
 msgid "Comment:"
 msgstr "Esboniad:"
 
-#: kfile/kpropertiesdialog.cpp:3949
+#: tdefile/kpropertiesdialog.cpp:3949
 msgid "File types:"
 msgstr "Mathau o Ffeil:"
 
-#: kfile/kfilesharedlg.cpp:56
+#: tdefile/tdefilesharedlg.cpp:56
 msgid "&Share"
 msgstr "&Rhaniad"
 
-#: kfile/kfilesharedlg.cpp:128
+#: tdefile/tdefilesharedlg.cpp:128
 #, fuzzy
 msgid "Only folders in your home folder can be shared."
 msgstr "Gellir rhannu dim ond cyfeiriaduron yn eich cyfeiriadur cartref."
 
-#: kfile/kfilesharedlg.cpp:139
+#: tdefile/tdefilesharedlg.cpp:139
 msgid "Not shared"
 msgstr "Dim wedi'i rhannu.  "
 
-#: kfile/kfilesharedlg.cpp:144
+#: tdefile/tdefilesharedlg.cpp:144
 msgid "Shared"
 msgstr "Wedi ei rhannu."
 
-#: kfile/kfilesharedlg.cpp:156
+#: tdefile/tdefilesharedlg.cpp:156
 #, fuzzy
 msgid ""
 "Sharing this folder makes it available under Linux/UNIX (NFS) and Windows "
@@ -5054,52 +5054,52 @@ msgstr ""
 "Mae rhannu'r cyfeiriadur yma yn trefnu ei fod ar gael dan Linux/Unix (NFS) a "
 "Windows (Samba)."
 
-#: kfile/kfilesharedlg.cpp:162
+#: tdefile/tdefilesharedlg.cpp:162
 msgid "You can also reconfigure file sharing authorization."
 msgstr "Gallwch hefyd ailffurfweddu awdurdodi rhannu ffeiliau."
 
-#: kfile/kfilesharedlg.cpp:165 kfile/kfilesharedlg.cpp:189
+#: tdefile/tdefilesharedlg.cpp:165 tdefile/tdefilesharedlg.cpp:189
 msgid "Configure File Sharing..."
 msgstr "Ffurfweddu Cyfrannu Ffeiliau..."
 
-#: kfile/kfilesharedlg.cpp:174
+#: tdefile/tdefilesharedlg.cpp:174
 msgid ""
 "Error running 'filesharelist'. Check if installed and in $PATH or /usr/sbin."
 msgstr ""
 "Gwall wrth redeg 'filesharelist'. Cywiro os wedi'i osod ac yn $PATH neu "
 "/usr/sbin."
 
-#: kfile/kfilesharedlg.cpp:181
+#: tdefile/tdefilesharedlg.cpp:181
 #, fuzzy
 msgid "You need to be authorized to share folders."
 msgstr "Rhaid i chi gael eich awdurdodi er mwyn rhannu cyfeiriaduron."
 
-#: kfile/kfilesharedlg.cpp:184
+#: tdefile/tdefilesharedlg.cpp:184
 #, fuzzy
 msgid "File sharing is disabled."
 msgstr "Analluogir golygu"
 
-#: kfile/kfilesharedlg.cpp:249
+#: tdefile/tdefilesharedlg.cpp:249
 msgid "Sharing folder '%1' failed."
 msgstr ""
 
-#: kfile/kfilesharedlg.cpp:250
+#: tdefile/tdefilesharedlg.cpp:250
 msgid ""
 "An error occurred while trying to share folder '%1'. Make sure that the Perl "
 "script 'fileshareset' is set suid root."
 msgstr ""
 
-#: kfile/kfilesharedlg.cpp:255
+#: tdefile/tdefilesharedlg.cpp:255
 msgid "Unsharing folder '%1' failed."
 msgstr ""
 
-#: kfile/kfilesharedlg.cpp:256
+#: tdefile/tdefilesharedlg.cpp:256
 msgid ""
 "An error occurred while trying to unshare folder '%1'. Make sure that the Perl "
 "script 'fileshareset' is set suid root."
 msgstr ""
 
-#: kfile/kurlbar.cpp:348
+#: tdefile/kurlbar.cpp:348
 msgid ""
 "<qt>The <b>Quick Access</b> panel provides easy access to commonly used file "
 "locations."
@@ -5112,35 +5112,35 @@ msgstr ""
 "<p>Drwy dde-glicio ar gofnod, gallwch ychwanegu, golygu a diddymu "
 "byrlwybrau.</qt>"
 
-#: kfile/kurlbar.cpp:730
+#: tdefile/kurlbar.cpp:730
 msgid "&Large Icons"
 msgstr "Eiconau &Mawr"
 
-#: kfile/kurlbar.cpp:730
+#: tdefile/kurlbar.cpp:730
 msgid "&Small Icons"
 msgstr "Eiconau &Bach"
 
-#: kfile/kurlbar.cpp:736
+#: tdefile/kurlbar.cpp:736
 msgid "&Edit Entry..."
 msgstr "&Golygu cofnod ..."
 
-#: kfile/kurlbar.cpp:740
+#: tdefile/kurlbar.cpp:740
 msgid "&Add Entry..."
 msgstr "&Ychwanegu cofnod ..."
 
-#: kfile/kurlbar.cpp:744
+#: tdefile/kurlbar.cpp:744
 msgid "&Remove Entry"
 msgstr "&Diddymu Cofnod"
 
-#: kfile/kurlbar.cpp:776
+#: tdefile/kurlbar.cpp:776
 msgid "Enter a description"
 msgstr "Rhoi disgrifiad"
 
-#: kfile/kurlbar.cpp:922
+#: tdefile/kurlbar.cpp:922
 msgid "Edit Quick Access Entry"
 msgstr "Golygu Cofnod Cyrchu ar Frys"
 
-#: kfile/kurlbar.cpp:925
+#: tdefile/kurlbar.cpp:925
 msgid ""
 "<qt><b>Please provide a description, URL and icon for this Quick Access "
 "entry.</b></br></qt>"
@@ -5148,7 +5148,7 @@ msgstr ""
 "<qt><b>Mae angen darparu disgrifiad, URL ac eicon i'r cofnod Cyrchu ar Frys "
 "yma.</b></br></qt>"
 
-#: kfile/kurlbar.cpp:932
+#: tdefile/kurlbar.cpp:932
 msgid ""
 "<qt>This is the text that will appear in the Quick Access panel."
 "<p>The description should consist of one or two words that will help you "
@@ -5158,13 +5158,13 @@ msgstr ""
 "<p>Dylai'r disgrifiad gynnwys un neu ddau o eiriau a fydd yn helpu chi gofio be "
 "mae'r cofnod hwn yn cyfeirio ato.</qt>"
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 125
-#: kfile/kurlbar.cpp:935 rc.cpp:239
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 125
+#: tdefile/kurlbar.cpp:935 rc.cpp:239
 #, no-c-format
 msgid "&Description:"
 msgstr "&Disgrifiad:"
 
-#: kfile/kurlbar.cpp:942
+#: tdefile/kurlbar.cpp:942
 msgid ""
 "<qt>This is the location associated with the entry. Any valid URL may be used. "
 "For example:"
@@ -5182,11 +5182,11 @@ msgstr ""
 "<p>Gan glicio ar y botwm wrth ymyl y blwch golygu testun, gallwch pori at URL "
 "addas. </qt>"
 
-#: kfile/kurlbar.cpp:946
+#: tdefile/kurlbar.cpp:946
 msgid "&URL:"
 msgstr "&URL:"
 
-#: kfile/kurlbar.cpp:953
+#: tdefile/kurlbar.cpp:953
 msgid ""
 "<qt>This is the icon that will appear in the Quick Access panel."
 "<p>Click on the button to select a different icon.</qt>"
@@ -5194,15 +5194,15 @@ msgstr ""
 "<qt>Yr eicon a ymddenygs yn y panel Cyrchu ar Frys."
 "<p>Cliciwch ar y botwm i ddewis eicon gwahanol.</qt>"
 
-#: kfile/kurlbar.cpp:955
+#: tdefile/kurlbar.cpp:955
 msgid "Choose an &icon:"
 msgstr "Dewis &eicon:"
 
-#: kfile/kurlbar.cpp:971
+#: tdefile/kurlbar.cpp:971
 msgid "&Only show when using this application (%1)"
 msgstr "Dangos 'mond &pan ddefnyddir y cymhwysiad yma (%1)"
 
-#: kfile/kurlbar.cpp:974
+#: tdefile/kurlbar.cpp:974
 msgid ""
 "<qt>Select this setting if you want this entry to show only when using the "
 "current application (%1)."
@@ -5421,13 +5421,13 @@ msgstr "Gwa&hardd"
 msgid "Deny &Forever"
 msgstr "&Am Byth"
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 27
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 27
 #: rc.cpp:78
 #, no-c-format
 msgid "Terminal"
 msgstr "Terfynell"
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 58
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 58
 #: rc.cpp:84
 #, no-c-format
 msgid ""
@@ -5436,7 +5436,7 @@ msgid ""
 "window."
 msgstr " "
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 80
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 80
 #: rc.cpp:93
 #, no-c-format
 msgid ""
@@ -5445,7 +5445,7 @@ msgid ""
 "information."
 msgstr ""
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 109
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 109
 #: rc.cpp:102
 #, no-c-format
 msgid ""
@@ -5455,32 +5455,32 @@ msgid ""
 "required to use this option."
 msgstr ""
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 140
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 140
 #: rc.cpp:108
 #, no-c-format
 msgid "Enter the user name you want to run the application as."
 msgstr "Mewnosodwch enw'r defnyddiwr yr ydych eisiau rhedeg y cymhwysiad fel."
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 148
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 148
 #: rc.cpp:111
 #, no-c-format
 msgid "Enter the user name you want to run the application as here."
 msgstr ""
 "Mewnosodwch yma enw'r defnyddiwr yr ydych eisiau rhedeg y cymhwysiad fel."
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 158
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 158
 #: rc.cpp:114
 #, no-c-format
 msgid "Startup"
 msgstr "Ymgychwyn"
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 169
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 169
 #: rc.cpp:117
 #, no-c-format
 msgid "Enable &launch feedback"
 msgstr "Galluogi adbor&th ymgychwyn"
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 172
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 172
 #: rc.cpp:120
 #, no-c-format
 msgid ""
@@ -5491,13 +5491,13 @@ msgstr ""
 "ymcychwyn.  Gall yr adborth gweledol ymddangos fel cyrchydd prysur neu yn y bar "
 "tasgiau."
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 180
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 180
 #: rc.cpp:123
 #, no-c-format
 msgid "&Place in system tray"
 msgstr ""
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 183
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 183
 #: rc.cpp:126
 #, fuzzy, no-c-format
 msgid ""
@@ -5507,151 +5507,151 @@ msgstr ""
 "Cliciwch ar y botwm yma os ydych eisiau ychwanegu math o ffeil (math mime) y "
 "gall eich cymhwysiad ei drin."
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 191
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 191
 #: rc.cpp:129
 #, no-c-format
 msgid "&DCOP registration:"
 msgstr "Cofrestru &DCOP"
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 200
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 200
 #: rc.cpp:132
 #, no-c-format
 msgid "None"
 msgstr "Dim"
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 205
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 205
 #: rc.cpp:135
 #, no-c-format
 msgid "Multiple Instances"
 msgstr "Enghreifftiau Lluosol"
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 210
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 210
 #: rc.cpp:138
 #, no-c-format
 msgid "Single Instance"
 msgstr "Enghraifft Sengl"
 
-#. i18n: file ./kfile/kpropertiesdesktopadvbase.ui line 215
+#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 215
 #: rc.cpp:141
 #, no-c-format
 msgid "Run Until Finished"
 msgstr "Rhedeg tan i'w Orffen"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 91
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 91
 #: rc.cpp:144
 #, no-c-format
 msgid "Events"
 msgstr "Digwyddiadau"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 117
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 117
 #: rc.cpp:147
 #, no-c-format
 msgid "Quick Controls"
 msgstr "Rheoliadau ar Frys"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 128
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 128
 #: rc.cpp:150
 #, no-c-format
 msgid "Apply to &all applications"
 msgstr "Gweithredu i bob cym&hwysiad"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 170
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 170
 #: rc.cpp:153
 #, no-c-format
 msgid "Turn O&ff All"
 msgstr "Cuddio &Popeth"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 173
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 173
 #: rc.cpp:156 rc.cpp:162
 #, no-c-format
 msgid "Allows you to change the behavior for all events at once"
 msgstr "Gadael i chi newid ymddwyn pob ddigwyddiad ar unwaith"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 181
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 181
 #: rc.cpp:159
 #, no-c-format
 msgid "Turn O&n All"
 msgstr "Da&tguddio Popeth"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 215
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 215
 #: rc.cpp:168
 #, no-c-format
 msgid "Print a message to standard &error output"
 msgstr "Ar&graffu neges i allbwn gwall safonol"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 223
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 223
 #: rc.cpp:171
 #, no-c-format
 msgid "Show a &message in a pop-up window"
 msgstr "Dangos &neges mewn ffenest naidlen"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 231
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 231
 #: rc.cpp:174
 #, no-c-format
 msgid "E&xecute a program:"
 msgstr "Gwei&thredu rhaglen:"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 247
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 247
 #: rc.cpp:177
 #, no-c-format
 msgid "Play a &sound:"
 msgstr "Chwarae &sw^n:"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 258
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 258
 #: rc.cpp:180
 #, no-c-format
 msgid "Test the Sound"
 msgstr "Arbrofi'r Sw^n"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 268
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 268
 #: rc.cpp:183
 #, no-c-format
 msgid "Mark &taskbar entry"
 msgstr "Nodi cofnod y bar &tasgiau"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 276
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 276
 #: rc.cpp:186
 #, no-c-format
 msgid "&Log to a file:"
 msgstr "&Ysgrifennu i ffeil cofnod:"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 352
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 352
 #: rc.cpp:189
 #, no-c-format
 msgid "&Use a passive window that does not interrupt other work"
 msgstr "&Defnyddio ffenest goddefol sy ddim yn torri ar draws gwaith arall"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 378
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 378
 #: rc.cpp:192
 #, no-c-format
 msgid "Less Options"
 msgstr "Llai o Ddewisiadau"
 
-#. i18n: file ./kfile/knotifywidgetbase.ui line 406
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 406
 #: rc.cpp:195
 #, no-c-format
 msgid "Player Settings"
 msgstr "Gosodiadau'r Chwaraewr"
 
-#. i18n: file ./kfile/kpropertiesmimetypebase.ui line 27
+#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 27
 #: rc.cpp:198
 #, no-c-format
 msgid "Select one or more file types to add:"
 msgstr "Dewis un neu fwy o fathau ffeil i'w ychwanegu:"
 
-#. i18n: file ./kfile/kpropertiesmimetypebase.ui line 36
+#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 36
 #: rc.cpp:201 rc.cpp:219
 #, no-c-format
 msgid "Mimetype"
 msgstr "Math MIME"
 
-#. i18n: file ./kfile/kpropertiesmimetypebase.ui line 47
+#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 47
 #: rc.cpp:204 rc.cpp:222
 #, no-c-format
 msgid "Description"
 msgstr "Disgrifiad"
 
-#. i18n: file ./kfile/kpropertiesmimetypebase.ui line 61
+#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 61
 #: rc.cpp:207
 #, no-c-format
 msgid ""
@@ -5667,13 +5667,13 @@ msgid ""
 "mimetypes.</p>"
 msgstr ""
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 44
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 44
 #: rc.cpp:211
 #, no-c-format
 msgid "&Supported file types:"
 msgstr "Mat&hau ffeil a gynhelir:"
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 52
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 52
 #: rc.cpp:214 rc.cpp:225
 #, no-c-format
 msgid ""
@@ -5694,13 +5694,13 @@ msgid ""
 "below.</p></qt>"
 msgstr ""
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 103
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 103
 #: rc.cpp:230
 #, no-c-format
 msgid "&Name:"
 msgstr "&Enw:"
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 109
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 109
 #: rc.cpp:233 rc.cpp:236
 #, no-c-format
 msgid ""
@@ -5710,7 +5710,7 @@ msgstr ""
 "Teipiwch yma yr enw yr ydych eisiau roi i'r cymhwysiad yma.  Bydd y cymhwysiad "
 "yma yn ymddangos dan yr enw yma yn y ddewislen gymhwysiadau ac yn y panel."
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 131
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 131
 #: rc.cpp:242 rc.cpp:245
 #, no-c-format
 msgid ""
@@ -5720,25 +5720,25 @@ msgstr ""
 "Teipiwch yma ddisgrifiad o'r cymhwysiad yma, wedi'i seilio ar ei ddefnydd.  "
 "Enghreifftiau: buasai cymhwysiad deialu (KPPP) yn \"Erfyn deilau\"."
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 147
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 147
 #: rc.cpp:248
 #, no-c-format
 msgid "Comm&ent:"
 msgstr "Syl&wad:"
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 153
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 153
 #: rc.cpp:251 rc.cpp:254
 #, no-c-format
 msgid "Type any comment you think is useful here."
 msgstr "Teipiwch yma unrhyw sylwad o ddefnydd."
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 169
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 169
 #: rc.cpp:257
 #, no-c-format
 msgid "Co&mmand:"
 msgstr "G&orchymyn:"
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 186
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 186
 #: rc.cpp:260 rc.cpp:274
 #, no-c-format
 msgid ""
@@ -5772,7 +5772,7 @@ msgstr ""
 "%m - yr eicon bach\n"
 "%c - y sylwad"
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 216
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 216
 #: rc.cpp:291
 #, no-c-format
 msgid ""
@@ -5780,25 +5780,25 @@ msgid ""
 msgstr ""
 "Cliciwch yma i bori'ch cysawd ffeil er mwyn canfod y gweithredadwyn penodol."
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 224
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 224
 #: rc.cpp:294
 #, no-c-format
 msgid "&Work path:"
 msgstr "Llwybr g&waith:"
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 230
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 230
 #: rc.cpp:297 rc.cpp:300
 #, fuzzy, no-c-format
 msgid "Sets the working directory for your application."
 msgstr "Dileuwch y cyfeiriadur cyfredol a ceisiwch eto."
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 246
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 246
 #: rc.cpp:303
 #, no-c-format
 msgid "Add..."
 msgstr "Ychwanegu..."
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 249
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 249
 #: rc.cpp:306
 #, no-c-format
 msgid ""
@@ -5808,7 +5808,7 @@ msgstr ""
 "Cliciwch ar y botwm yma os ydych eisiau ychwanegu math o ffeil (math mime) y "
 "gall eich cymhwysiad ei drin."
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 277
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 277
 #: rc.cpp:312
 #, no-c-format
 msgid ""
@@ -5818,13 +5818,13 @@ msgstr ""
 "Os ydych eisiau gwaredu math ffeil (math mime) na all eich cymhwysiad ei drin, "
 "dewiswch y math mime yn y rhestr uchod a cliciwch ar y botwm yma."
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 302
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 302
 #: rc.cpp:315
 #, no-c-format
 msgid "Ad&vanced Options"
 msgstr "De&wisiadau Uwch"
 
-#. i18n: file ./kfile/kpropertiesdesktopbase.ui line 305
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 305
 #: rc.cpp:318
 #, no-c-format
 msgid ""
@@ -7613,8 +7613,8 @@ msgstr "Dim meta-wybodaeth am %1 "
 #~ msgid "Confidential"
 #~ msgstr "Cyfrinachol"
 
-#~ msgid "Error in libkabc"
-#~ msgstr "Gwall yn libkabc"
+#~ msgid "Error in libtdeabc"
+#~ msgstr "Gwall yn libtdeabc"
 
 #~ msgid "List of Emails"
 #~ msgstr "Rhestr o Gyfeiriadau Ebost"
@@ -8092,7 +8092,7 @@ msgstr "Dim meta-wybodaeth am %1 "
 #~ msgid "Could not register with DCOP.\n"
 #~ msgstr "Methu cofrestru gyda DCOP:\n"
 
-#~ msgid "KLauncher could not be reached via DCOP.\n"
+#~ msgid "TDELauncher could not be reached via DCOP.\n"
 #~ msgstr "Methu cyrraedd Klauncher drwy DCOP.\n"
 
 #~ msgid "Desktop %1"
@@ -10350,8 +10350,8 @@ msgstr "Dim meta-wybodaeth am %1 "
 #~ msgid "Print %1"
 #~ msgstr "Argraffu %1"
 
-#~ msgid "KHTML"
-#~ msgstr "KHTML"
+#~ msgid "TDEHTML"
+#~ msgstr "TDEHTML"
 
 #~ msgid "Embeddable HTML component"
 #~ msgstr "Cydran HTML mewnadeiladedig"
@@ -10443,10 +10443,10 @@ msgstr "Dim meta-wybodaeth am %1 "
 #~ msgstr "Analluogir"
 
 #~ msgid ""
-#~ "A script on this page is causing KHTML to freeze. If it continues to run, other applications may become less responsive.\n"
+#~ "A script on this page is causing TDEHTML to freeze. If it continues to run, other applications may become less responsive.\n"
 #~ "Do you want to abort the script?"
 #~ msgstr ""
-#~ "Mae sgript ar y dudalen yma yn achosi i KHTML rewi.  Os mae'n parhau rhedeg, efallai bydd cymhwysiadau eraill yn dechrau mynd yn llai ymatebol.\n"
+#~ "Mae sgript ar y dudalen yma yn achosi i TDEHTML rewi.  Os mae'n parhau rhedeg, efallai bydd cymhwysiadau eraill yn dechrau mynd yn llai ymatebol.\n"
 #~ "Ydych eisiau terfynu'r sgript?"
 
 #~ msgid "JavaScript"
diff --git a/tde-i18n-cy/messages/tdelibs/tdeio_help.po b/tde-i18n-cy/messages/tdelibs/tdeio_help.po
index 705fe7008ce..24d2149a69a 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeio_help.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeio_help.po
@@ -1,10 +1,10 @@
-# translation of kio_help.po to Cymraeg
+# translation of tdeio_help.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_help\n"
+"Project-Id-Version: tdeio_help\n"
 "POT-Creation-Date: 2006-05-03 03:51+0200\n"
 "PO-Revision-Date: 2003-11-20 23:14+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -26,37 +26,37 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: kio_help.cpp:115
+#: tdeio_help.cpp:115
 #, c-format
 msgid "There is no documentation available for %1."
 msgstr ""
 
-#: kio_help.cpp:158
+#: tdeio_help.cpp:158
 msgid "Looking up correct file"
 msgstr "Chwilio am y ffeil iawn"
 
-#: kio_help.cpp:209
+#: tdeio_help.cpp:209
 msgid "Preparing document"
 msgstr "Paratoi'r ddogfen"
 
-#: kio_help.cpp:218 kio_help.cpp:251
+#: tdeio_help.cpp:218 tdeio_help.cpp:251
 #, fuzzy, c-format
 msgid "The requested help file could not be parsed:<br>%1"
 msgstr "Methu dosrannu'r ffeil cymorth penodol:"
 
-#: kio_help.cpp:240
+#: tdeio_help.cpp:240
 msgid "Saving to cache"
 msgstr "Cadw i'r celc"
 
-#: kio_help.cpp:246
+#: tdeio_help.cpp:246
 msgid "Using cached version"
 msgstr "Defnyddio'r fersiwn sydd yn y celc"
 
-#: kio_help.cpp:308
+#: tdeio_help.cpp:308
 msgid "Looking up section"
 msgstr "Cwhilio am yr adran"
 
-#: kio_help.cpp:319
+#: tdeio_help.cpp:319
 #, fuzzy
 msgid "Could not find filename %1 in %2."
 msgstr "<html>Methu canfod enw ffeil %1 yn %2</html>"
diff --git a/tde-i18n-cy/messages/tdelibs/tdeioexec.po b/tde-i18n-cy/messages/tdelibs/tdeioexec.po
index db28e15ff6f..9790ad85500 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeioexec.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeioexec.po
@@ -1,10 +1,10 @@
-# translation of kioexec.po to Cymraeg
+# translation of tdeioexec.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kioexec\n"
+"Project-Id-Version: tdeioexec\n"
 "POT-Creation-Date: 2007-04-13 02:13+0200\n"
 "PO-Revision-Date: 2003-11-20 20:13+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "X-Generator: KBabel 1.2\n"
 
 #: main.cpp:50
-msgid "KIO Exec - Opens remote files, watches modifications, asks for upload"
-msgstr "KIO Exec - Agor ffeiliau pell, arsylwi newidiadau, gofyn am lanlwytho"
+msgid "TDEIO Exec - Opens remote files, watches modifications, asks for upload"
+msgstr "TDEIO Exec - Agor ffeiliau pell, arsylwi newidiadau, gofyn am lanlwytho"
 
 #: main.cpp:54
 msgid "Treat URLs as local files and delete them afterwards"
diff --git a/tde-i18n-cy/messages/tdelibs/tdelibs.po b/tde-i18n-cy/messages/tdelibs/tdelibs.po
index cd01733b224..53be61f2ac4 100644
--- a/tde-i18n-cy/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-cy/messages/tdelibs/tdelibs.po
@@ -27,13 +27,13 @@ msgstr ""
 "X-Generator: KBabel 1.9\n"
 "\n"
 
-#. i18n: file ./interfaces/ktexteditor/editorchooser_ui.ui line 16
+#. i18n: file ./interfaces/tdetexteditor/editorchooser_ui.ui line 16
 #: rc.cpp:3
 #, no-c-format
 msgid "Editor Chooser"
 msgstr "Dewisydd Golygydd"
 
-#. i18n: file ./interfaces/ktexteditor/editorchooser_ui.ui line 41
+#. i18n: file ./interfaces/tdetexteditor/editorchooser_ui.ui line 41
 #: rc.cpp:6
 #, no-c-format
 msgid ""
@@ -47,25 +47,25 @@ msgstr ""
 ", bydd y cymhwysiad yn ufuddhau eich newidiadau yn y Ganolfan Rheolaeth.  Bydd "
 "pob un dewis arall yn gwrthwneud y gosodiad yna."
 
-#. i18n: file ./kcert/kcertpart.rc line 4
+#. i18n: file ./tdecert/tdecertpart.rc line 4
 #: rc.cpp:9
 #, no-c-format
 msgid "&Certificate"
 msgstr "&Tystysgrif"
 
-#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 58
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 58
 #: rc.cpp:12
 #, no-c-format
 msgid "Alternate shortcut:"
 msgstr "Byrlwybr arall:"
 
-#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 69
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 69
 #: rc.cpp:15
 #, no-c-format
 msgid "Primary shortcut:"
 msgstr "Prif fyrlwybr:"
 
-#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 155
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 155
 #: rc.cpp:18
 #, no-c-format
 msgid ""
@@ -74,31 +74,31 @@ msgstr ""
 "Bydd y byrlwybr sydd mewn bod yn barod, neu'r byrlwybr yr ydych yn ei fewnosod, "
 "yn ymddangos yma."
 
-#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 182
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 182
 #: rc.cpp:21 rc.cpp:27 rc.cpp:84
 #, no-c-format
 msgid "x"
 msgstr "x"
 
-#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 188
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 188
 #: rc.cpp:24 rc.cpp:30 rc.cpp:87
 #, no-c-format
 msgid "Clear shortcut"
 msgstr "Diddymu byrlwybr"
 
-#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 213
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 213
 #: rc.cpp:33
 #, no-c-format
 msgid "Multi-key mode"
 msgstr "Modd aml-fysell"
 
-#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 216
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 216
 #: rc.cpp:36
 #, no-c-format
 msgid "Enable the entry of multi-key shortcuts"
 msgstr "Galluogi mewnosod byrlwybrau aml-fysell"
 
-#. i18n: file ./tdeui/kshortcutdialog_advanced.ui line 219
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 219
 #: rc.cpp:39
 #, no-c-format
 msgid ""
@@ -172,25 +172,25 @@ msgstr "Gosod&iadau"
 msgid "Main Toolbar"
 msgstr "Prif Far Offer"
 
-#. i18n: file ./tdeui/kshortcutdialog_simple.ui line 27
+#. i18n: file ./tdeui/tdeshortcutdialog_simple.ui line 27
 #: rc.cpp:78
 #, no-c-format
 msgid "Shortcut:"
 msgstr "Byrlwybr:"
 
-#. i18n: file ./tdeui/kshortcutdialog_simple.ui line 65
+#. i18n: file ./tdeui/tdeshortcutdialog_simple.ui line 65
 #: rc.cpp:81
 #, no-c-format
 msgid "Alt+Tab"
 msgstr "Alt+Tab"
 
-#. i18n: file ./tdeui/kspellui.ui line 38
+#. i18n: file ./tdeui/tdespellui.ui line 38
 #: rc.cpp:90 rc.cpp:307
 #, no-c-format
 msgid "Unknown word:"
 msgstr "Gair anhysbys"
 
-#. i18n: file ./tdeui/kspellui.ui line 44
+#. i18n: file ./tdeui/tdespellui.ui line 44
 #: rc.cpp:93 rc.cpp:105 rc.cpp:310 rc.cpp:322
 #, no-c-format
 msgid ""
@@ -221,25 +221,25 @@ msgstr ""
 "blwch testun isod, a clicio <b>Amnewid</b> neu <b>Amnewid Pob Un</b>.</p>\n"
 "</qt>"
 
-#. i18n: file ./tdeui/kspellui.ui line 52
+#. i18n: file ./tdeui/tdespellui.ui line 52
 #: rc.cpp:99 rc.cpp:316
 #, no-c-format
 msgid "<b>misspelled</b>"
 msgstr "<b>wedi'i gamsillafu</b>"
 
-#. i18n: file ./tdeui/kspellui.ui line 55
+#. i18n: file ./tdeui/tdespellui.ui line 55
 #: rc.cpp:102 rc.cpp:319
 #, no-c-format
 msgid "Unknown word"
 msgstr "Gair anhysbys"
 
-#. i18n: file ./tdeui/kspellui.ui line 69
+#. i18n: file ./tdeui/tdespellui.ui line 69
 #: rc.cpp:111 rc.cpp:328
 #, no-c-format
 msgid "&Language:"
 msgstr "&Iaith:"
 
-#. i18n: file ./tdeui/kspellui.ui line 77
+#. i18n: file ./tdeui/tdespellui.ui line 77
 #: rc.cpp:114 rc.cpp:209 rc.cpp:331 rc.cpp:389
 #, no-c-format
 msgid ""
@@ -251,19 +251,19 @@ msgstr ""
 "<p>Dewiswch iaith y ddogfen a broflennir yma.</p>\n"
 "</qt>"
 
-#. i18n: file ./tdeui/kspellui.ui line 88
+#. i18n: file ./tdeui/tdespellui.ui line 88
 #: rc.cpp:119 rc.cpp:336
 #, no-c-format
 msgid "... the <b>misspelled</b> word shown in context ..."
 msgstr "... y gair <b>a gamsillafwyd</b> yn ei gyd-destun ..."
 
-#. i18n: file ./tdeui/kspellui.ui line 94
+#. i18n: file ./tdeui/tdespellui.ui line 94
 #: rc.cpp:122 rc.cpp:339
 #, no-c-format
 msgid "Text excerpt showing the unknown word in its context."
 msgstr "Detholiad arbrawf sy'n dangos y gair anhysbys yn ei gyd-destun."
 
-#. i18n: file ./tdeui/kspellui.ui line 99
+#. i18n: file ./tdeui/tdespellui.ui line 99
 #: rc.cpp:125 rc.cpp:342
 #, no-c-format
 msgid ""
@@ -282,13 +282,13 @@ msgstr ""
 "proflennu.</p>\n"
 "</qt>"
 
-#. i18n: file ./tdeui/kspellui.ui line 107
+#. i18n: file ./tdeui/tdespellui.ui line 107
 #: rc.cpp:130 rc.cpp:347
 #, no-c-format
 msgid "<< Add to Dictionary"
 msgstr "<< Ychwanegu i'r Geiriadur"
 
-#. i18n: file ./tdeui/kspellui.ui line 113
+#. i18n: file ./tdeui/tdespellui.ui line 113
 #: rc.cpp:133 rc.cpp:350
 #, no-c-format
 msgid ""
@@ -312,13 +312,13 @@ msgstr ""
 "Anwybyddu</b> neu <b>Anwybyddu Pob Un</b> yn lle.</p>\n"
 "</qt>"
 
-#. i18n: file ./tdeui/kspellui.ui line 138
+#. i18n: file ./tdeui/tdespellui.ui line 138
 #: rc.cpp:139 rc.cpp:405
 #, no-c-format
 msgid "R&eplace All"
 msgstr "Amnewid y &Cwbl"
 
-#. i18n: file ./tdeui/kspellui.ui line 143
+#. i18n: file ./tdeui/tdespellui.ui line 143
 #: rc.cpp:142 rc.cpp:408
 #, no-c-format
 msgid ""
@@ -332,19 +332,19 @@ msgstr ""
 "blwch golygu uchod (i'r chwith).</p>\n"
 "</qt>"
 
-#. i18n: file ./tdeui/kspellui.ui line 149
+#. i18n: file ./tdeui/tdespellui.ui line 149
 #: rc.cpp:147 rc.cpp:356
 #, no-c-format
 msgid "Suggested Words"
 msgstr "Geiriau Awgrymedig"
 
-#. i18n: file ./tdeui/kspellui.ui line 165
+#. i18n: file ./tdeui/tdespellui.ui line 165
 #: rc.cpp:150 rc.cpp:359
 #, no-c-format
 msgid "Suggestion List"
 msgstr "Rhestr Awgrymiadau"
 
-#. i18n: file ./tdeui/kspellui.ui line 171
+#. i18n: file ./tdeui/tdespellui.ui line 171
 #: rc.cpp:153 rc.cpp:362
 #, no-c-format
 msgid ""
@@ -366,13 +366,13 @@ msgstr ""
 "digwyddiad.</p>\n"
 "</qt>"
 
-#. i18n: file ./tdeui/kspellui.ui line 179
-#: tdeui/keditcl2.cpp:833 kutils/kfinddialog.cpp:231 rc.cpp:159 rc.cpp:397
+#. i18n: file ./tdeui/tdespellui.ui line 179
+#: tdeui/keditcl2.cpp:833 tdeutils/kfinddialog.cpp:231 rc.cpp:159 rc.cpp:397
 #, no-c-format
 msgid "&Replace"
 msgstr "&Amnewid"
 
-#. i18n: file ./tdeui/kspellui.ui line 184
+#. i18n: file ./tdeui/tdespellui.ui line 184
 #: rc.cpp:162 rc.cpp:400
 #, no-c-format
 msgid ""
@@ -386,13 +386,13 @@ msgstr ""
 "y blwch golygu uchod (i'r chwith).</p>\n"
 "</qt>"
 
-#. i18n: file ./tdeui/kspellui.ui line 192
+#. i18n: file ./tdeui/tdespellui.ui line 192
 #: rc.cpp:167 rc.cpp:368
 #, no-c-format
 msgid "Replace &with:"
 msgstr "Amnewid &efo:"
 
-#. i18n: file ./tdeui/kspellui.ui line 201
+#. i18n: file ./tdeui/tdespellui.ui line 201
 #: rc.cpp:170 rc.cpp:194 rc.cpp:371 rc.cpp:377
 #, no-c-format
 msgid ""
@@ -412,13 +412,13 @@ msgstr ""
 "digwyddiad.</p>\n"
 "</qt>"
 
-#. i18n: file ./tdeui/kspellui.ui line 209
+#. i18n: file ./tdeui/tdespellui.ui line 209
 #: rc.cpp:176 rc.cpp:413
 #, no-c-format
 msgid "&Ignore"
 msgstr "&Anwybyddu:"
 
-#. i18n: file ./tdeui/kspellui.ui line 215
+#. i18n: file ./tdeui/tdespellui.ui line 215
 #: rc.cpp:179 rc.cpp:416
 #, no-c-format
 msgid ""
@@ -436,13 +436,13 @@ msgstr ""
 "ychwanegu i'r geiriadur.</p>\n"
 "</qt>"
 
-#. i18n: file ./tdeui/kspellui.ui line 223
+#. i18n: file ./tdeui/tdespellui.ui line 223
 #: rc.cpp:185 rc.cpp:422
 #, no-c-format
 msgid "I&gnore All"
 msgstr "A&nwybyddu Popeth:"
 
-#. i18n: file ./tdeui/kspellui.ui line 229
+#. i18n: file ./tdeui/tdespellui.ui line 229
 #: rc.cpp:188 rc.cpp:425 rc.cpp:434
 #, no-c-format
 msgid ""
@@ -461,37 +461,37 @@ msgstr ""
 "ychwanegu i'r geiriadur.</p>\n"
 "</qt>"
 
-#. i18n: file ./tdeui/kspellui.ui line 248
+#. i18n: file ./tdeui/tdespellui.ui line 248
 #: rc.cpp:200 rc.cpp:394
 #, no-c-format
 msgid "S&uggest"
 msgstr "A&wgrymu:"
 
-#. i18n: file ./tdeui/kspellui.ui line 254
+#. i18n: file ./tdeui/tdespellui.ui line 254
 #: tdeui/ksconfig.cpp:294 rc.cpp:203 rc.cpp:383
 #, no-c-format
 msgid "English"
 msgstr "Saesneg"
 
-#. i18n: file ./tdeui/kspellui.ui line 261
+#. i18n: file ./tdeui/tdespellui.ui line 261
 #: rc.cpp:206 rc.cpp:386
 #, no-c-format
 msgid "Language Selection"
 msgstr "Dewis Iaith"
 
-#. i18n: file ./khtml/khtml_popupmenu.rc line 11
+#. i18n: file ./tdehtml/tdehtml_popupmenu.rc line 11
 #: rc.cpp:214
 #, no-c-format
 msgid "Frame"
 msgstr "Ffrâm"
 
-#. i18n: file ./khtml/kjserrordlg.ui line 17
+#. i18n: file ./tdehtml/kjserrordlg.ui line 17
 #: rc.cpp:217
 #, no-c-format
 msgid "JavaScript Errors"
 msgstr "Gwallau JavaScript"
 
-#. i18n: file ./khtml/kjserrordlg.ui line 20
+#. i18n: file ./tdehtml/kjserrordlg.ui line 20
 #: rc.cpp:220
 #, no-c-format
 msgid ""
@@ -511,67 +511,67 @@ msgstr ""
 "nam wrth http://bugs.kde.org/.  Gwerthfawrogir achos prawf sy'n llunio'r "
 "problem."
 
-#. i18n: file ./khtml/kjserrordlg.ui line 39
+#. i18n: file ./tdehtml/kjserrordlg.ui line 39
 #: tdeui/kstdaction_p.h:58 tdeui/kstdguiitem.cpp:161 rc.cpp:226
 #, no-c-format
 msgid "C&lear"
 msgstr "C&lirio"
 
-#. i18n: file ./khtml/htmlpageinfo.ui line 26
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 26
 #: rc.cpp:232
 #, no-c-format
 msgid "Document Information"
 msgstr "Gwybodaeth am y Ddogfen"
 
-#. i18n: file ./khtml/htmlpageinfo.ui line 37
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 37
 #: rc.cpp:235
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
 
-#. i18n: file ./khtml/htmlpageinfo.ui line 64
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 64
 #: rc.cpp:238
 #, no-c-format
 msgid "URL:"
 msgstr "URL:"
 
-#. i18n: file ./khtml/htmlpageinfo.ui line 122
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 122
 #: rc.cpp:241
 #, no-c-format
 msgid "Title:"
 msgstr "Teitl:"
 
-#. i18n: file ./khtml/htmlpageinfo.ui line 141
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 141
 #: rc.cpp:244
 #, no-c-format
 msgid "Last modified:"
 msgstr "Newid diweddaraf:"
 
-#. i18n: file ./khtml/htmlpageinfo.ui line 160
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 160
 #: rc.cpp:247
 #, no-c-format
 msgid "Document encoding:"
 msgstr "Amgodiad y ddogfen:"
 
-#. i18n: file ./khtml/htmlpageinfo.ui line 188
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 188
 #: rc.cpp:250
 #, no-c-format
 msgid "HTTP Headers"
 msgstr "Penodau HTTP"
 
-#. i18n: file ./khtml/htmlpageinfo.ui line 197
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 197
 #: rc.cpp:253
 #, no-c-format
 msgid "Property"
 msgstr "Priodwedd"
 
-#. i18n: file ./khtml/htmlpageinfo.ui line 208
-#: khtml/java/kjavaappletviewer.cpp:132 rc.cpp:256
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 208
+#: tdehtml/java/kjavaappletviewer.cpp:132 rc.cpp:256
 #, no-c-format
 msgid "Value"
 msgstr "Gwerth"
 
-#. i18n: file ./kspell2/ui/configui.ui line 26
+#. i18n: file ./tdespell2/ui/configui.ui line 26
 #: rc.cpp:274
 #, no-c-format
 msgid ""
@@ -579,20 +579,20 @@ msgid ""
 "will list all of the dictionaries of your existing languages."
 msgstr ""
 
-#. i18n: file ./kspell2/ui/configui.ui line 34
+#. i18n: file ./tdespell2/ui/configui.ui line 34
 #: common_texts.cpp:118 tdeui/keditcl2.cpp:723 tdeui/keditcl2.cpp:862
-#: kutils/kfinddialog.cpp:161 rc.cpp:277
+#: tdeutils/kfinddialog.cpp:161 rc.cpp:277
 #, no-c-format
 msgid "Options"
 msgstr "Dewisiadau"
 
-#. i18n: file ./kspell2/ui/configui.ui line 45
+#. i18n: file ./tdespell2/ui/configui.ui line 45
 #: rc.cpp:280
 #, no-c-format
 msgid "Enable &background spellchecking"
 msgstr "Alluogi &gwirio sillafu yn y cefndir"
 
-#. i18n: file ./kspell2/ui/configui.ui line 48
+#. i18n: file ./tdespell2/ui/configui.ui line 48
 #: rc.cpp:283
 #, no-c-format
 msgid ""
@@ -600,13 +600,13 @@ msgid ""
 "are immediately highlighted."
 msgstr ""
 
-#. i18n: file ./kspell2/ui/configui.ui line 56
+#. i18n: file ./tdespell2/ui/configui.ui line 56
 #: rc.cpp:286
 #, no-c-format
 msgid "Skip all &uppercase words"
 msgstr "Hepgor pob gair mewn &PRIFLYTHRENNAU"
 
-#. i18n: file ./kspell2/ui/configui.ui line 59
+#. i18n: file ./tdespell2/ui/configui.ui line 59
 #: rc.cpp:289
 #, no-c-format
 msgid ""
@@ -614,13 +614,13 @@ msgid ""
 "This is useful if you have a lot of acronyms, such as TDE for example."
 msgstr ""
 
-#. i18n: file ./kspell2/ui/configui.ui line 67
+#. i18n: file ./tdespell2/ui/configui.ui line 67
 #: rc.cpp:292
 #, no-c-format
 msgid "S&kip run-together words"
 msgstr "H&epgor geiriau difwlch"
 
-#. i18n: file ./kspell2/ui/configui.ui line 70
+#. i18n: file ./tdespell2/ui/configui.ui line 70
 #: rc.cpp:295
 #, no-c-format
 msgid ""
@@ -628,19 +628,19 @@ msgid ""
 "This is useful in some languages."
 msgstr ""
 
-#. i18n: file ./kspell2/ui/configui.ui line 80
+#. i18n: file ./tdespell2/ui/configui.ui line 80
 #: rc.cpp:298
 #, no-c-format
 msgid "Default language:"
 msgstr "Iaith rhagosodol:"
 
-#. i18n: file ./kspell2/ui/configui.ui line 91
+#. i18n: file ./tdespell2/ui/configui.ui line 91
 #: rc.cpp:301
 #, fuzzy, no-c-format
 msgid "Ignore These Words"
 msgstr "Anwybyddu'r Geiriau Dilynol"
 
-#. i18n: file ./kspell2/ui/configui.ui line 97
+#. i18n: file ./tdespell2/ui/configui.ui line 97
 #: rc.cpp:304
 #, no-c-format
 msgid ""
@@ -648,31 +648,31 @@ msgid ""
 "To remove a word, highlight it in the list and click Remove."
 msgstr ""
 
-#. i18n: file ./kspell2/ui/kspell2ui.ui line 282
+#. i18n: file ./tdespell2/ui/tdespell2ui.ui line 282
 #: rc.cpp:431
 #, no-c-format
 msgid "Autocorrect"
 msgstr "Hunan-gywiro"
 
-#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 9
+#. i18n: file ./dnssd/kcm_tdednssd.kcfg line 9
 #: rc.cpp:440
 #, no-c-format
 msgid "Additional domains for browsing"
 msgstr ""
 
-#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 10
+#. i18n: file ./dnssd/kcm_tdednssd.kcfg line 10
 #: rc.cpp:443
 #, no-c-format
 msgid "List of 'wide-area' (non link-local) domains that should be browsed."
 msgstr ""
 
-#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 13
+#. i18n: file ./dnssd/kcm_tdednssd.kcfg line 13
 #: rc.cpp:446
 #, no-c-format
 msgid "Browse local network"
 msgstr ""
 
-#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 14
+#. i18n: file ./dnssd/kcm_tdednssd.kcfg line 14
 #: rc.cpp:449
 #, no-c-format
 msgid ""
@@ -680,19 +680,19 @@ msgid ""
 "DNS."
 msgstr ""
 
-#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 18
+#. i18n: file ./dnssd/kcm_tdednssd.kcfg line 18
 #: rc.cpp:452
 #, no-c-format
 msgid "Recursive search for domains"
 msgstr ""
 
-#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 19
+#. i18n: file ./dnssd/kcm_tdednssd.kcfg line 19
 #: rc.cpp:455
 #, no-c-format
 msgid "Removed in TDE 3.5.0"
 msgstr ""
 
-#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 25
+#. i18n: file ./dnssd/kcm_tdednssd.kcfg line 25
 #: rc.cpp:458
 #, no-c-format
 msgid ""
@@ -700,7 +700,7 @@ msgid ""
 "server)"
 msgstr ""
 
-#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 26
+#. i18n: file ./dnssd/kcm_tdednssd.kcfg line 26
 #: rc.cpp:461
 #, no-c-format
 msgid ""
@@ -708,13 +708,13 @@ msgid ""
 "(LAN) or 'wide-area' using normal DNS server (WAN)."
 msgstr ""
 
-#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 34
+#. i18n: file ./dnssd/kcm_tdednssd.kcfg line 34
 #: rc.cpp:464
 #, no-c-format
 msgid "Name of default publishing domain for WAN"
 msgstr ""
 
-#. i18n: file ./dnssd/kcm_kdnssd.kcfg line 36
+#. i18n: file ./dnssd/kcm_tdednssd.kcfg line 36
 #: rc.cpp:467
 #, no-c-format
 msgid ""
@@ -735,8 +735,8 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: common_texts.cpp:24 tdeui/kconfigdialog.cpp:56 kutils/kcmultidialog.cpp:59
-#: kutils/kcmultidialog.h:104 kutils/ksettings/dialog.cpp:571
+#: common_texts.cpp:24 tdeui/tdeconfigdialog.cpp:56 tdeutils/kcmultidialog.cpp:59
+#: tdeutils/kcmultidialog.h:104 tdeutils/ksettings/dialog.cpp:571
 msgid "Configure"
 msgstr "Ffurfweddu"
 
@@ -768,7 +768,7 @@ msgstr "Tudalen"
 msgid "Border"
 msgstr "Ymyl"
 
-#: common_texts.cpp:32 tdeui/ktoolbar.cpp:2116
+#: common_texts.cpp:32 tdeui/tdetoolbar.cpp:2116
 msgid "Orientation"
 msgstr "Gogwydd"
 
@@ -852,9 +852,9 @@ msgstr "Chwyddo"
 msgid "&Zoom"
 msgstr "&Chwyddo"
 
-#: arts/message/artsmessage.cc:89 common_texts.cpp:54 kabc/lock.cpp:132
-#: tdeui/kmessagebox.cpp:760 tdeui/kmessagebox.cpp:790 kjs/object.cpp:493
-#: kutils/kpluginselector.cpp:248
+#: arts/message/artsmessage.cc:89 common_texts.cpp:54 tdeabc/lock.cpp:132
+#: tdeui/tdemessagebox.cpp:760 tdeui/tdemessagebox.cpp:790 kjs/object.cpp:493
+#: tdeutils/kpluginselector.cpp:248
 msgid "Error"
 msgstr "Gwall"
 
@@ -867,8 +867,8 @@ msgid "Charset:"
 msgstr "Set nodau:"
 
 #: arts/message/artsmessage.cc:83 common_texts.cpp:59
-#: tdeui/kmessagebox.cpp:561 tdeui/kmessagebox.cpp:633
-#: tdeui/kmessagebox.cpp:709
+#: tdeui/tdemessagebox.cpp:561 tdeui/tdemessagebox.cpp:633
+#: tdeui/tdemessagebox.cpp:709
 msgid "Warning"
 msgstr "Rhybudd"
 
@@ -884,8 +884,8 @@ msgstr "Cynnwys"
 msgid "About"
 msgstr "Ynghylch"
 
-#: common_texts.cpp:63 common_texts.cpp:176 tdeui/kaboutapplication.cpp:64
-#: tdeui/kaboutapplication.cpp:88
+#: common_texts.cpp:63 common_texts.cpp:176 tdeui/tdeaboutapplication.cpp:64
+#: tdeui/tdeaboutapplication.cpp:88
 msgid "&About"
 msgstr "&Ynghylch"
 
@@ -893,13 +893,13 @@ msgstr "&Ynghylch"
 msgid "A&bout"
 msgstr "Y&nghylch"
 
-#: common_texts.cpp:65 kparts/part.cpp:489
+#: common_texts.cpp:65 tdeparts/part.cpp:489
 msgid "Untitled"
 msgstr "Heb deitl"
 
-#: common_texts.cpp:67 tdecore/kapplication.cpp:1417
-#: tdecore/kapplication.cpp:2245 tdecore/kapplication.cpp:2280
-#: tdecore/kapplication.cpp:2551 tdecore/kapplication.cpp:2573
+#: common_texts.cpp:67 tdecore/tdeapplication.cpp:1417
+#: tdecore/tdeapplication.cpp:2245 tdecore/tdeapplication.cpp:2280
+#: tdecore/tdeapplication.cpp:2551 tdecore/tdeapplication.cpp:2573
 #: tdecore/kdebug.cpp:295 tdeui/kdialogbase.cpp:908 tdeui/kstdguiitem.cpp:99
 msgid "&OK"
 msgstr "&Iawn"
@@ -916,7 +916,7 @@ msgstr "I ffwrdd"
 msgid "&Apply"
 msgstr "&Gosod"
 
-#: common_texts.cpp:74 tdecore/kstdaccel.cpp:52
+#: common_texts.cpp:74 tdecore/tdestdaccel.cpp:52
 msgid "File"
 msgstr "Ffeil"
 
@@ -928,7 +928,7 @@ msgstr "&Taflu"
 msgid "Discard"
 msgstr "Taflu"
 
-#: common_texts.cpp:80 tdecore/kstdaccel.cpp:59
+#: common_texts.cpp:80 tdecore/tdestdaccel.cpp:59
 msgid "Edit"
 msgstr "Golygu"
 
@@ -944,7 +944,7 @@ msgstr "Dangos"
 msgid "E&xit"
 msgstr "G&adael"
 
-#: common_texts.cpp:86 tdecore/kstdaccel.cpp:58
+#: common_texts.cpp:86 tdecore/tdestdaccel.cpp:58
 msgid "Quit"
 msgstr "Terfynu"
 
@@ -952,11 +952,11 @@ msgstr "Terfynu"
 msgid "&Quit"
 msgstr "&Gorffen"
 
-#: common_texts.cpp:88 tdecore/kstdaccel.cpp:88 kded/kbuildsycoca.cpp:753
+#: common_texts.cpp:88 tdecore/tdestdaccel.cpp:88 kded/tdebuildsycoca.cpp:753
 msgid "Reload"
 msgstr "Ail-lwytho"
 
-#: common_texts.cpp:89 tdecore/kstdaccel.cpp:86
+#: common_texts.cpp:89 tdecore/tdestdaccel.cpp:86
 msgid "Back"
 msgstr "Yn ôl"
 
@@ -980,7 +980,7 @@ msgstr "Gêm Newydd"
 msgid "&New Game"
 msgstr "&Gêm Newydd"
 
-#: common_texts.cpp:99 tdecore/kkeyserver_x11.cpp:133 tdecore/kstdaccel.cpp:53
+#: common_texts.cpp:99 tdecore/kkeyserver_x11.cpp:133 tdecore/tdestdaccel.cpp:53
 msgid "Open"
 msgstr "Agor"
 
@@ -1004,7 +1004,7 @@ msgstr "&Torri"
 msgid "C&ut"
 msgstr "T&orri"
 
-#: common_texts.cpp:106 tdeui/kfontdialog.cpp:132
+#: common_texts.cpp:106 tdeui/tdefontdialog.cpp:132
 msgid "Font"
 msgstr "Wynebfath"
 
@@ -1016,7 +1016,7 @@ msgstr "&Lliw Blaendir"
 msgid "&Background Color"
 msgstr "&Lliw Cefndir"
 
-#: common_texts.cpp:109 tdecore/kstdaccel.cpp:56
+#: common_texts.cpp:109 tdecore/tdestdaccel.cpp:56
 msgid "Save"
 msgstr "Cadw"
 
@@ -1024,8 +1024,8 @@ msgstr "Cadw"
 msgid "&Save"
 msgstr "&Cadw"
 
-#: common_texts.cpp:111 khtml/khtml_part.cpp:3937 khtml/khtml_part.cpp:4141
-#: khtml/khtml_part.cpp:4462 khtml/khtml_run.cpp:83 kparts/browserrun.cpp:419
+#: common_texts.cpp:111 tdehtml/tdehtml_part.cpp:3937 tdehtml/tdehtml_part.cpp:4141
+#: tdehtml/tdehtml_part.cpp:4462 tdehtml/tdehtml_run.cpp:83 tdeparts/browserrun.cpp:419
 msgid "Save As"
 msgstr "Cadw Fel"
 
@@ -1041,7 +1041,7 @@ msgstr "C&adw Fel..."
 msgid "&Print..."
 msgstr "&Argraffu"
 
-#: common_texts.cpp:117 tdeui/kmessagebox.cpp:837 tdeui/kmessagebox.cpp:867
+#: common_texts.cpp:117 tdeui/tdemessagebox.cpp:837 tdeui/tdemessagebox.cpp:867
 msgid "Sorry"
 msgstr "Ymddiheuriad"
 
@@ -1062,7 +1062,7 @@ msgstr "Newid"
 msgid "&Delete"
 msgstr "&Dileu"
 
-#: common_texts.cpp:125 tdeui/kfontdialog.cpp:225 tdeui/kfontdialog.cpp:477
+#: common_texts.cpp:125 tdeui/tdefontdialog.cpp:225 tdeui/tdefontdialog.cpp:477
 msgid "Italic"
 msgstr "Italig"
 
@@ -1070,7 +1070,7 @@ msgstr "Italig"
 msgid "Roman"
 msgstr "Rhyfeinig"
 
-#: common_texts.cpp:132 tdeui/kmessagebox.cpp:913
+#: common_texts.cpp:132 tdeui/tdemessagebox.cpp:913
 msgid "Information"
 msgstr "Gwybodaeth"
 
@@ -1093,12 +1093,12 @@ msgstr "Pori..."
 #: common_texts.cpp:137 tdecore/kkeyserver_x11.cpp:127 tdeui/keditcl2.cpp:107
 #: tdeui/keditcl2.cpp:120 tdeui/keditcl2.cpp:377 tdeui/keditcl2.cpp:390
 #: tdeui/keditcl2.cpp:456 tdeui/keditcl2.cpp:469 tdeui/kstdguiitem.cpp:259
-#: khtml/ecma/kjs_debugwin.cpp:466 kutils/kreplace.cpp:319
+#: tdehtml/ecma/kjs_debugwin.cpp:466 tdeutils/kreplace.cpp:319
 msgid "Stop"
 msgstr "Aros"
 
 #: common_texts.cpp:138 tdeui/keditlistbox.cpp:136
-#: kresources/configpage.cpp:127
+#: tderesources/configpage.cpp:127
 msgid "&Remove"
 msgstr "&Tynnu ymaith"
 
@@ -1114,7 +1114,7 @@ msgstr "Priodweddau"
 msgid "&Start"
 msgstr "&Dechrau"
 
-#: common_texts.cpp:142 khtml/ecma/kjs_debugwin.cpp:457
+#: common_texts.cpp:142 tdehtml/ecma/kjs_debugwin.cpp:457
 msgid "St&op"
 msgstr "Ar&os"
 
@@ -1142,11 +1142,11 @@ msgstr "&Ail-lwytho"
 msgid "Files"
 msgstr "Ffeiliau"
 
-#: common_texts.cpp:149 khtml/ecma/kjs_debugwin.cpp:465
+#: common_texts.cpp:149 tdehtml/ecma/kjs_debugwin.cpp:465
 msgid "Continue"
 msgstr "Mynd ymlaen"
 
-#: common_texts.cpp:150 kmdi/kmdimainfrm.cpp:995
+#: common_texts.cpp:150 tdemdi/tdemdimainfrm.cpp:995
 msgid "Restore"
 msgstr "Adfer"
 
@@ -1155,7 +1155,7 @@ msgid "Appearance"
 msgstr "Golwg"
 
 #: common_texts.cpp:152 tdecore/kkeyserver_x11.cpp:137
-#: tdecore/kstdaccel.cpp:57
+#: tdecore/tdestdaccel.cpp:57
 msgid "Print"
 msgstr "Argraffu"
 
@@ -1213,9 +1213,9 @@ msgstr "&Nesaf"
 msgid "&Previous"
 msgstr "&Blaenorol"
 
-#: common_texts.cpp:170 kcert/kcertpart.cc:730 kcert/kcertpart.cc:746
-#: tdecore/kstdaccel.cpp:73 tdeui/keditcl2.cpp:456 tdeui/keditcl2.cpp:469
-#: tdeui/keditcl2.cpp:830 kutils/kreplace.cpp:45 kutils/kreplace.cpp:49
+#: common_texts.cpp:170 tdecert/tdecertpart.cc:730 tdecert/tdecertpart.cc:746
+#: tdecore/tdestdaccel.cpp:73 tdeui/keditcl2.cpp:456 tdeui/keditcl2.cpp:469
+#: tdeui/keditcl2.cpp:830 tdeutils/kreplace.cpp:45 tdeutils/kreplace.cpp:49
 msgid "Replace"
 msgstr "Amnewid"
 
@@ -1223,9 +1223,9 @@ msgstr "Amnewid"
 msgid "&Replace..."
 msgstr "&Amnewid"
 
-#: common_texts.cpp:173 kabc/ldapconfigwidget.cpp:156
-#: kabc/ldapconfigwidget.cpp:168 tdeui/klineedit.cpp:914
-#: tdeui/ktoolbar.cpp:2058
+#: common_texts.cpp:173 tdeabc/ldapconfigwidget.cpp:156
+#: tdeabc/ldapconfigwidget.cpp:168 tdeui/klineedit.cpp:914
+#: tdeui/tdetoolbar.cpp:2058
 msgid "Default"
 msgstr "Rhagosodol"
 
@@ -1245,7 +1245,7 @@ msgstr "Agor Diweddar"
 msgid "Open &Recent"
 msgstr "Agor &Diweddar"
 
-#: common_texts.cpp:179 tdeui/kstdaction_p.h:61 khtml/khtml_part.cpp:4258
+#: common_texts.cpp:179 tdeui/kstdaction_p.h:61 tdehtml/tdehtml_part.cpp:4258
 msgid "&Find..."
 msgstr "&Canfod"
 
@@ -1290,7 +1290,7 @@ msgstr "Ffurfweddu &Rhwymiadau Bysell..."
 msgid "&Preferences..."
 msgstr "&Hoffiannau ..."
 
-#: common_texts.cpp:193 tdeui/kmessagebox.cpp:928
+#: common_texts.cpp:193 tdeui/tdemessagebox.cpp:928
 msgid "Do not show this message again"
 msgstr "Peidiwch â dangos y neges yma eto"
 
@@ -1610,24 +1610,24 @@ msgstr "Nid yw'r sail yn wrthrych"
 msgid "Syntax error in parameter list"
 msgstr "Gwall cystrawen yn y rhestr paramedrau"
 
-#: interfaces/ktexteditor/editorchooser.cpp:60
+#: interfaces/tdetexteditor/editorchooser.cpp:60
 msgid "System Default (%1)"
 msgstr "Rhagosodiad Cysawd (%1)"
 
-#: interfaces/kscript/scriptmanager.cpp:106
+#: interfaces/tdescript/scriptmanager.cpp:106
 msgid "Unable to get KScript Runner for type \"%1\"."
 msgstr "Methu cael Rhedydd KScript am fath \"%1\"."
 
-#: interfaces/kscript/scriptmanager.cpp:106
-#: interfaces/kscript/scriptmanager.cpp:129
+#: interfaces/tdescript/scriptmanager.cpp:106
+#: interfaces/tdescript/scriptmanager.cpp:129
 msgid "KScript Error"
 msgstr "Gwall KScript"
 
-#: interfaces/kscript/scriptmanager.cpp:129
+#: interfaces/tdescript/scriptmanager.cpp:129
 msgid "Unable find script \"%1\"."
 msgstr "Methu canfod sgript \"%1\"."
 
-#: interfaces/kscript/scriptloader.cpp:40
+#: interfaces/tdescript/scriptloader.cpp:40
 msgid "TDE Scripts"
 msgstr "Sgriptiau TDE"
 
@@ -1651,73 +1651,73 @@ msgstr "M&aint Arferol"
 msgid "&Double Size"
 msgstr "&Dwywaith y Maint"
 
-#: kabc/addressbook.cpp:346 kabc/addressbook.cpp:365
+#: tdeabc/addressbook.cpp:346 tdeabc/addressbook.cpp:365
 msgid "Unable to load resource '%1'"
 msgstr "Methu llwytho adnodd '%1'"
 
-#: kabc/key.cpp:127
+#: tdeabc/key.cpp:127
 msgid "X509"
 msgstr "X509"
 
-#: kabc/key.cpp:130
+#: tdeabc/key.cpp:130
 msgid "PGP"
 msgstr "PGP"
 
-#: kab/addressbook.cc:335 kabc/field.cpp:217 kabc/key.cpp:133
-#: kabc/scripts/field.src.cpp:110
+#: kab/addressbook.cc:335 tdeabc/field.cpp:217 tdeabc/key.cpp:133
+#: tdeabc/scripts/field.src.cpp:110
 msgid "Custom"
 msgstr "Addasiedig"
 
-#: kabc/key.cpp:136 kabc/secrecy.cpp:80
+#: tdeabc/key.cpp:136 tdeabc/secrecy.cpp:80
 msgid "Unknown type"
 msgstr "Math anhysbys"
 
-#: kabc/field.cpp:192 kabc/scripts/field.src.cpp:85
+#: tdeabc/field.cpp:192 tdeabc/scripts/field.src.cpp:85
 msgid "Unknown Field"
 msgstr "Maes Anhysbys"
 
-#: kabc/field.cpp:205 kabc/scripts/field.src.cpp:98
+#: tdeabc/field.cpp:205 tdeabc/scripts/field.src.cpp:98
 msgid "All"
 msgstr "Cwbl"
 
-#: kabc/field.cpp:207 kabc/scripts/field.src.cpp:100
+#: tdeabc/field.cpp:207 tdeabc/scripts/field.src.cpp:100
 msgid "Frequent"
 msgstr "Aml"
 
-#: kab/addressbook.cc:192 kabc/field.cpp:209 kabc/scripts/field.src.cpp:102
+#: kab/addressbook.cc:192 tdeabc/field.cpp:209 tdeabc/scripts/field.src.cpp:102
 msgid ""
 "_: street/postal\n"
 "Address"
 msgstr ""
 
-#: kabc/addresseedialog.cpp:71 kabc/addresseedialog.cpp:101
-#: kabc/distributionlistdialog.cpp:190 kabc/distributionlisteditor.cpp:143
-#: kabc/field.cpp:211 kabc/scripts/field.src.cpp:104 tdeui/kaboutdialog.cpp:91
+#: tdeabc/addresseedialog.cpp:71 tdeabc/addresseedialog.cpp:101
+#: tdeabc/distributionlistdialog.cpp:190 tdeabc/distributionlisteditor.cpp:143
+#: tdeabc/field.cpp:211 tdeabc/scripts/field.src.cpp:104 tdeui/tdeaboutdialog.cpp:91
 msgid "Email"
 msgstr "Ebost"
 
-#: kabc/field.cpp:213 kabc/scripts/field.src.cpp:106
+#: tdeabc/field.cpp:213 tdeabc/scripts/field.src.cpp:106
 msgid "Personal"
 msgstr "Personol"
 
-#: kab/addressbook.cc:176 kabc/addressee.cpp:727 kabc/field.cpp:215
-#: kabc/scripts/field.src.cpp:108
+#: kab/addressbook.cc:176 tdeabc/addressee.cpp:727 tdeabc/field.cpp:215
+#: tdeabc/scripts/field.src.cpp:108
 msgid "Organization"
 msgstr "Sefydliad"
 
-#: kabc/field.cpp:219 kabc/scripts/field.src.cpp:112
+#: tdeabc/field.cpp:219 tdeabc/scripts/field.src.cpp:112
 msgid "Undefined"
 msgstr "Anniffiniedig"
 
-#: kabc/kab2kabc.cpp:42
+#: tdeabc/tdeab2tdeabc.cpp:42
 msgid "Disable automatic startup on login"
 msgstr "Analluogi cychwyn ymysgogol wrth fewngofnodi."
 
-#: kabc/kab2kabc.cpp:45
+#: tdeabc/tdeab2tdeabc.cpp:45
 msgid "Override existing entries"
 msgstr "Gwrthwneud cofnodion cyfredol"
 
-#: kabc/kab2kabc.cpp:287
+#: tdeabc/tdeab2tdeabc.cpp:287
 msgid ""
 "Address book file <b>%1</b> not found! Make sure the old address book is "
 "located there and you have read permission for this file."
@@ -1725,676 +1725,676 @@ msgstr ""
 "Ni chanfuwyd ffeil llyfr cyfeiriadau <b>%1</b>!  Sicrhewch fod yr hen lyfr "
 "cyfeiriadau mewn bod, a bod gennych caniatadau darllen ar gyfer y ffeil yma."
 
-#: kabc/kab2kabc.cpp:435
+#: tdeabc/tdeab2tdeabc.cpp:435
 msgid "Kab to Kabc Converter"
 msgstr "Trosiadydd Kab i Kabc"
 
-#: kabc/resource.cpp:332
+#: tdeabc/resource.cpp:332
 msgid "Loading resource '%1' failed!"
 msgstr "Methodd llwytho adnodd '%1'!"
 
-#: kabc/resource.cpp:343
+#: tdeabc/resource.cpp:343
 msgid "Saving resource '%1' failed!"
 msgstr "Methodd cadw adnodd '%1'!"
 
-#: kabc/resourceselectdialog.cpp:39 kresources/selectdialog.cpp:42
+#: tdeabc/resourceselectdialog.cpp:39 tderesources/selectdialog.cpp:42
 msgid "Resource Selection"
 msgstr "Dewis Adnoddau"
 
-#: kabc/resourceselectdialog.cpp:46 kresources/configpage.cpp:107
-#: kresources/selectdialog.cpp:49
+#: tdeabc/resourceselectdialog.cpp:46 tderesources/configpage.cpp:107
+#: tderesources/selectdialog.cpp:49
 msgid "Resources"
 msgstr "Adnoddau"
 
-#: kabc/secrecy.cpp:71
+#: tdeabc/secrecy.cpp:71
 msgid "Public"
 msgstr "Cyhoeddus"
 
-#: kab/addressbook.cc:1950 kabc/secrecy.cpp:74
+#: kab/addressbook.cc:1950 tdeabc/secrecy.cpp:74
 msgid "Private"
 msgstr "Preivat"
 
-#: kabc/secrecy.cpp:77
+#: tdeabc/secrecy.cpp:77
 msgid "Confidential"
 msgstr "Cyfrinachol"
 
-#: kabc/errorhandler.cpp:42
-msgid "Error in libkabc"
-msgstr "Gwall yn libkabc"
+#: tdeabc/errorhandler.cpp:42
+msgid "Error in libtdeabc"
+msgstr "Gwall yn libtdeabc"
 
-#: kabc/ldifconverter.cpp:475
+#: tdeabc/ldifconverter.cpp:475
 msgid "List of Emails"
 msgstr "Rhestr o Gyfeiriadau Ebost"
 
-#: kabc/locknull.cpp:60
+#: tdeabc/locknull.cpp:60
 msgid "LockNull: All locks succeed but no actual locking is done."
 msgstr "LockNull: Mae pob clo yn llwyddo, ond nid yw cloi yn cael ei wneud."
 
-#: kabc/locknull.cpp:62
+#: tdeabc/locknull.cpp:62
 msgid "LockNull: All locks fail."
 msgstr "LockNull: Mae pob clo yn methu."
 
-#: kabc/phonenumber.cpp:147
+#: tdeabc/phonenumber.cpp:147
 msgid ""
 "_: Preferred phone\n"
 "Preferred"
 msgstr "Hoffter"
 
-#: kabc/phonenumber.cpp:151
+#: tdeabc/phonenumber.cpp:151
 msgid ""
 "_: Home phone\n"
 "Home"
 msgstr "Cartref"
 
-#: kabc/phonenumber.cpp:154
+#: tdeabc/phonenumber.cpp:154
 msgid ""
 "_: Work phone\n"
 "Work"
 msgstr "Cartref"
 
-#: kabc/phonenumber.cpp:157
+#: tdeabc/phonenumber.cpp:157
 msgid "Messenger"
 msgstr "Negesydd"
 
-#: kabc/phonenumber.cpp:160
+#: tdeabc/phonenumber.cpp:160
 msgid "Preferred Number"
 msgstr "Rhif Dewisiedig"
 
-#: kabc/phonenumber.cpp:163
+#: tdeabc/phonenumber.cpp:163
 msgid "Voice"
 msgstr "Llais"
 
-#: kabc/phonenumber.cpp:166
+#: tdeabc/phonenumber.cpp:166
 msgid "Fax"
 msgstr "Ffacs"
 
-#: kabc/phonenumber.cpp:169
+#: tdeabc/phonenumber.cpp:169
 msgid ""
 "_: Mobile Phone\n"
 "Mobile"
 msgstr "Ffôn Symudol"
 
-#: kabc/phonenumber.cpp:172
+#: tdeabc/phonenumber.cpp:172
 msgid "Video"
 msgstr "Fideo"
 
-#: kabc/phonenumber.cpp:175
+#: tdeabc/phonenumber.cpp:175
 msgid "Mailbox"
 msgstr "Bocs ebost"
 
-#: kabc/phonenumber.cpp:178
+#: tdeabc/phonenumber.cpp:178
 msgid "Modem"
 msgstr "Modem"
 
-#: kabc/phonenumber.cpp:181
+#: tdeabc/phonenumber.cpp:181
 msgid ""
 "_: Car Phone\n"
 "Car"
 msgstr "Ffôn Car"
 
-#: kabc/addressee.cpp:601 kabc/phonenumber.cpp:184
+#: tdeabc/addressee.cpp:601 tdeabc/phonenumber.cpp:184
 msgid "ISDN"
 msgstr "ISDN"
 
-#: kabc/phonenumber.cpp:187
+#: tdeabc/phonenumber.cpp:187
 msgid "PCS"
 msgstr "PCS"
 
-#: kabc/addressee.cpp:607 kabc/phonenumber.cpp:190
+#: tdeabc/addressee.cpp:607 tdeabc/phonenumber.cpp:190
 msgid "Pager"
 msgstr "Blîp"
 
-#: kabc/addressee.cpp:583 kabc/phonenumber.cpp:193
+#: tdeabc/addressee.cpp:583 tdeabc/phonenumber.cpp:193
 msgid "Home Fax"
 msgstr "Facs Cartref"
 
-#: kabc/phonenumber.cpp:196
+#: tdeabc/phonenumber.cpp:196
 msgid "Work Fax"
 msgstr "Ffacs Gwaith"
 
-#: kabc/address.cpp:312 kabc/phonenumber.cpp:199 tdecore/kcharsets.cpp:43
+#: tdeabc/address.cpp:312 tdeabc/phonenumber.cpp:199 tdecore/kcharsets.cpp:43
 msgid "Other"
 msgstr "Eraill"
 
-#: kabc/distributionlistdialog.cpp:44
+#: tdeabc/distributionlistdialog.cpp:44
 msgid "Configure Distribution Lists"
 msgstr "Ffurfweddu Rhestrau Dosbarthu"
 
-#: kabc/distributionlistdialog.cpp:61 kabc/distributionlisteditor.cpp:43
+#: tdeabc/distributionlistdialog.cpp:61 tdeabc/distributionlisteditor.cpp:43
 msgid "Select Email Address"
 msgstr "Dewiswch Gyfeiriad Ebost"
 
-#: kab/addressbook.cc:303 kabc/distributionlistdialog.cpp:69
-#: kabc/distributionlisteditor.cpp:49
+#: kab/addressbook.cc:303 tdeabc/distributionlistdialog.cpp:69
+#: tdeabc/distributionlisteditor.cpp:49
 msgid "Email Addresses"
 msgstr "Cyfeiriadau Ebost"
 
-#: kabc/distributionlistdialog.cpp:152
+#: tdeabc/distributionlistdialog.cpp:152
 msgid "New List..."
 msgstr "Rhestr Newydd..."
 
-#: kabc/distributionlistdialog.cpp:156
+#: tdeabc/distributionlistdialog.cpp:156
 msgid "Rename List..."
 msgstr "Ail-enwi Rhestr..."
 
-#: kabc/distributionlistdialog.cpp:160 kabc/distributionlisteditor.cpp:137
+#: tdeabc/distributionlistdialog.cpp:160 tdeabc/distributionlisteditor.cpp:137
 msgid "Remove List"
 msgstr "Diddymu Rhestr"
 
-#: kabc/distributionlistdialog.cpp:167
+#: tdeabc/distributionlistdialog.cpp:167
 msgid "Available addresses:"
 msgstr "Cyfeiriadau ar gael:"
 
-#: kabc/addressee.cpp:335 kabc/addresseedialog.cpp:70
-#: kabc/addresseedialog.cpp:100 kabc/distributionlistdialog.cpp:174
-#: kabc/distributionlistdialog.cpp:189 kabc/distributionlisteditor.cpp:142
-#: kabc/distributionlisteditor.cpp:161 knewstuff/downloaddialog.cpp:270
+#: tdeabc/addressee.cpp:335 tdeabc/addresseedialog.cpp:70
+#: tdeabc/addresseedialog.cpp:100 tdeabc/distributionlistdialog.cpp:174
+#: tdeabc/distributionlistdialog.cpp:189 tdeabc/distributionlisteditor.cpp:142
+#: tdeabc/distributionlisteditor.cpp:161 knewstuff/downloaddialog.cpp:270
 #: knewstuff/downloaddialog.cpp:276 knewstuff/downloaddialog.cpp:282
-#: knewstuff/providerdialog.cpp:65 kresources/configpage.cpp:119
-#: kutils/kpluginselector.cpp:200
+#: knewstuff/providerdialog.cpp:65 tderesources/configpage.cpp:119
+#: tdeutils/kpluginselector.cpp:200
 msgid "Name"
 msgstr "Enw"
 
-#: kabc/distributionlistdialog.cpp:175 kabc/distributionlisteditor.cpp:162
+#: tdeabc/distributionlistdialog.cpp:175 tdeabc/distributionlisteditor.cpp:162
 msgid "Preferred Email"
 msgstr "Ebost Dewisedig"
 
-#: kabc/distributionlistdialog.cpp:183 kabc/distributionlisteditor.cpp:156
+#: tdeabc/distributionlistdialog.cpp:183 tdeabc/distributionlisteditor.cpp:156
 msgid "Add Entry"
 msgstr "Ychwanegu Cofnod"
 
-#: kabc/distributionlistdialog.cpp:191 kabc/distributionlisteditor.cpp:144
+#: tdeabc/distributionlistdialog.cpp:191 tdeabc/distributionlisteditor.cpp:144
 msgid "Use Preferred"
 msgstr "Defnyddio Dewisedig"
 
-#: kabc/distributionlistdialog.cpp:198
+#: tdeabc/distributionlistdialog.cpp:198
 msgid "Change Email..."
 msgstr "Newid Ebost..."
 
-#: kabc/distributionlistdialog.cpp:202 kabc/distributionlisteditor.cpp:152
+#: tdeabc/distributionlistdialog.cpp:202 tdeabc/distributionlisteditor.cpp:152
 msgid "Remove Entry"
 msgstr "Diddymu Cofnod"
 
-#: kabc/distributionlistdialog.cpp:237 kabc/distributionlisteditor.cpp:196
+#: tdeabc/distributionlistdialog.cpp:237 tdeabc/distributionlisteditor.cpp:196
 msgid "New Distribution List"
 msgstr "Rhestr Dosbarthiad Newydd"
 
-#: kabc/distributionlistdialog.cpp:238
+#: tdeabc/distributionlistdialog.cpp:238
 msgid "Please enter &name:"
 msgstr "Mewnosodwch &enw:"
 
-#: kabc/distributionlistdialog.cpp:255
+#: tdeabc/distributionlistdialog.cpp:255
 msgid "Distribution List"
 msgstr "Rhestr Dosbarthu"
 
-#: kabc/distributionlistdialog.cpp:256
+#: tdeabc/distributionlistdialog.cpp:256
 msgid "Please change &name:"
 msgstr "Newidiwch &enw:"
 
-#: kabc/distributionlistdialog.cpp:273
+#: tdeabc/distributionlistdialog.cpp:273
 msgid "Delete distribution list '%1'?"
 msgstr "Dileu rhestr dosbarthu '%1'?"
 
-#: kabc/distributionlistdialog.cpp:339
+#: tdeabc/distributionlistdialog.cpp:339
 msgid "Selected addressees:"
 msgstr "Derbynyddion dewisedig"
 
-#: kabc/distributionlistdialog.cpp:341
+#: tdeabc/distributionlistdialog.cpp:341
 msgid "Selected addresses in '%1':"
 msgstr "Derbynyddion dewisedig yn '%1':"
 
-#: kabc/addresseehelper.cpp:67
+#: tdeabc/addresseehelper.cpp:67
 msgid "Dr."
 msgstr "Dr."
 
-#: kabc/addresseehelper.cpp:68
+#: tdeabc/addresseehelper.cpp:68
 msgid "Miss"
 msgstr "Miss"
 
-#: kabc/addresseehelper.cpp:69
+#: tdeabc/addresseehelper.cpp:69
 msgid "Mr."
 msgstr "Mr."
 
-#: kabc/addresseehelper.cpp:70
+#: tdeabc/addresseehelper.cpp:70
 msgid "Mrs."
 msgstr "Mrs."
 
-#: kabc/addresseehelper.cpp:71
+#: tdeabc/addresseehelper.cpp:71
 msgid "Ms."
 msgstr "Ms."
 
-#: kabc/addresseehelper.cpp:72
+#: tdeabc/addresseehelper.cpp:72
 msgid "Prof."
 msgstr "Yr Athro"
 
-#: kabc/addresseehelper.cpp:74
+#: tdeabc/addresseehelper.cpp:74
 msgid "I"
 msgstr "I"
 
-#: kabc/addresseehelper.cpp:75
+#: tdeabc/addresseehelper.cpp:75
 msgid "II"
 msgstr "II"
 
-#: kabc/addresseehelper.cpp:76
+#: tdeabc/addresseehelper.cpp:76
 msgid "III"
 msgstr "III"
 
-#: kabc/addresseehelper.cpp:77
+#: tdeabc/addresseehelper.cpp:77
 msgid "Jr."
 msgstr "Jr."
 
-#: kabc/addresseehelper.cpp:78
+#: tdeabc/addresseehelper.cpp:78
 msgid "Sr."
 msgstr "Sr."
 
-#: kabc/ldapconfigwidget.cpp:83
+#: tdeabc/ldapconfigwidget.cpp:83
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: kabc/ldapconfigwidget.cpp:92
+#: tdeabc/ldapconfigwidget.cpp:92
 msgid "Bind DN:"
 msgstr "DN Rhwymo:"
 
-#: kabc/ldapconfigwidget.cpp:101
+#: tdeabc/ldapconfigwidget.cpp:101
 msgid "Realm:"
 msgstr "Bro:"
 
-#: kabc/ldapconfigwidget.cpp:110
+#: tdeabc/ldapconfigwidget.cpp:110
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: kabc/ldapconfigwidget.cpp:120
+#: tdeabc/ldapconfigwidget.cpp:120
 msgid "Host:"
 msgstr "Gwesteiwr:"
 
-#: kabc/ldapconfigwidget.cpp:130
+#: tdeabc/ldapconfigwidget.cpp:130
 msgid "Port:"
 msgstr "Porth:"
 
-#: kabc/ldapconfigwidget.cpp:141
+#: tdeabc/ldapconfigwidget.cpp:141
 msgid "LDAP version:"
 msgstr "Fersiwn LDAP:"
 
-#: kabc/ldapconfigwidget.cpp:152
+#: tdeabc/ldapconfigwidget.cpp:152
 msgid "Size limit:"
 msgstr "Terfyn maint:"
 
-#: kabc/ldapconfigwidget.cpp:163
+#: tdeabc/ldapconfigwidget.cpp:163
 msgid "Time limit:"
 msgstr "Terfyn amser:"
 
-#: kabc/ldapconfigwidget.cpp:167
+#: tdeabc/ldapconfigwidget.cpp:167
 msgid " sec"
 msgstr "sec"
 
-#: kabc/ldapconfigwidget.cpp:175
+#: tdeabc/ldapconfigwidget.cpp:175
 msgid ""
 "_: Distinguished Name\n"
 "DN:"
 msgstr "DN:"
 
-#: kabc/ldapconfigwidget.cpp:182 kabc/ldapconfigwidget.cpp:231
+#: tdeabc/ldapconfigwidget.cpp:182 tdeabc/ldapconfigwidget.cpp:231
 msgid "Query Server"
 msgstr "Gweinydd Ymholiad"
 
-#: kabc/ldapconfigwidget.cpp:190
+#: tdeabc/ldapconfigwidget.cpp:190
 msgid "Filter:"
 msgstr "Hidl:"
 
-#: kabc/ldapconfigwidget.cpp:199
+#: tdeabc/ldapconfigwidget.cpp:199
 msgid "Security"
 msgstr "Diogelwch"
 
-#: kabc/ldapconfigwidget.cpp:201
+#: tdeabc/ldapconfigwidget.cpp:201
 msgid "TLS"
 msgstr "TLS"
 
-#: kabc/ldapconfigwidget.cpp:202
+#: tdeabc/ldapconfigwidget.cpp:202
 msgid "SSL"
 msgstr "SSL"
 
-#: kabc/ldapconfigwidget.cpp:216
+#: tdeabc/ldapconfigwidget.cpp:216
 msgid "Authentication"
 msgstr "Dilysiant"
 
-#: kabc/ldapconfigwidget.cpp:218
+#: tdeabc/ldapconfigwidget.cpp:218
 msgid "Anonymous"
 msgstr "Dienw"
 
-#: kabc/ldapconfigwidget.cpp:219
+#: tdeabc/ldapconfigwidget.cpp:219
 msgid "Simple"
 msgstr "Syml"
 
-#: kabc/ldapconfigwidget.cpp:220
+#: tdeabc/ldapconfigwidget.cpp:220
 msgid "SASL"
 msgstr "SASL"
 
-#: kabc/ldapconfigwidget.cpp:222
+#: tdeabc/ldapconfigwidget.cpp:222
 msgid "SASL mechanism:"
 msgstr "Peirianwaith SASL:"
 
-#: kabc/ldapconfigwidget.cpp:302
+#: tdeabc/ldapconfigwidget.cpp:302
 msgid "LDAP Query"
 msgstr "Ymholiad LDAP"
 
-#: kabc/address.cpp:145
+#: tdeabc/address.cpp:145
 msgid "Post Office Box"
 msgstr "Bocs Swyddfa Post"
 
-#: kabc/address.cpp:163
+#: tdeabc/address.cpp:163
 msgid "Extended Address Information"
 msgstr "Gwybodaeth Cyfeiriad Estynedig"
 
-#: kabc/address.cpp:181
+#: tdeabc/address.cpp:181
 msgid "Street"
 msgstr "Stryd"
 
-#: kabc/address.cpp:199
+#: tdeabc/address.cpp:199
 msgid "Locality"
 msgstr "Lleoliad"
 
-#: kabc/address.cpp:217 tdeui/ktimezonewidget.cpp:46
+#: tdeabc/address.cpp:217 tdeui/ktimezonewidget.cpp:46
 msgid "Region"
 msgstr "Ardal"
 
-#: kabc/address.cpp:235
+#: tdeabc/address.cpp:235
 msgid "Postal Code"
 msgstr "Côd Post"
 
-#: kab/addressbook.cc:204 kabc/address.cpp:253
+#: kab/addressbook.cc:204 tdeabc/address.cpp:253
 msgid "Country"
 msgstr "Gwlad"
 
-#: kab/addressbook.cc:188 kabc/address.cpp:271
+#: kab/addressbook.cc:188 tdeabc/address.cpp:271
 msgid "Delivery Label"
 msgstr "Label Derbyn"
 
-#: kabc/address.cpp:287
+#: tdeabc/address.cpp:287
 msgid ""
 "_: Preferred address\n"
 "Preferred"
 msgstr "Hoffter"
 
-#: kabc/address.cpp:291
+#: tdeabc/address.cpp:291
 msgid "Domestic"
 msgstr "Mewnol"
 
-#: kabc/address.cpp:294
+#: tdeabc/address.cpp:294
 msgid "International"
 msgstr "Rhyngwladol"
 
-#: kabc/address.cpp:297
+#: tdeabc/address.cpp:297
 msgid "Postal"
 msgstr "Post"
 
-#: kabc/address.cpp:300
+#: tdeabc/address.cpp:300
 msgid "Parcel"
 msgstr "Parsel"
 
-#: kabc/address.cpp:303
+#: tdeabc/address.cpp:303
 msgid ""
 "_: Home Address\n"
 "Home"
 msgstr " Cyfeiriad Cartref"
 
-#: kabc/address.cpp:306
+#: tdeabc/address.cpp:306
 msgid ""
 "_: Work Address\n"
 "Work"
 msgstr "Cyfeiriad Gwaith"
 
-#: kabc/address.cpp:309
+#: tdeabc/address.cpp:309
 msgid "Preferred Address"
 msgstr "Cyfeiriad Dewisiedig"
 
-#: kabc/lock.cpp:93
+#: tdeabc/lock.cpp:93
 msgid "Unable to open lock file."
 msgstr "Methu agor ffeil glo."
 
-#: kabc/lock.cpp:106
+#: tdeabc/lock.cpp:106
 msgid ""
 "The address book '%1' is locked by application '%2'.\n"
 "If you believe this is incorrect, just remove the lock file from '%3'"
 msgstr ""
 
-#: kabc/lock.cpp:146
+#: tdeabc/lock.cpp:146
 msgid "Unlock failed. Lock file is owned by other process: %1 (%2)"
 msgstr "Methodd y dadgloi.  Mae'r ffeil glo yn biau i broses arall: %1 (%2)"
 
-#: kabc/stdaddressbook.cpp:148
+#: tdeabc/stdaddressbook.cpp:148
 msgid "Unable to save to resource '%1'. It is locked."
 msgstr "Methu cadw i adnodd %1.  Mae o wedi'i gloi."
 
-#: kabc/addresseedialog.cpp:60
+#: tdeabc/addresseedialog.cpp:60
 msgid "Select Addressee"
 msgstr "Dewiswch Derbynnydd"
 
-#: kabc/addresseedialog.cpp:95
+#: tdeabc/addresseedialog.cpp:95
 msgid "Selected"
 msgstr "Dewisedig"
 
-#: kabc/addresseedialog.cpp:107
+#: tdeabc/addresseedialog.cpp:107
 msgid "Unselect"
 msgstr "Dad-ddewis"
 
-#: kabc/distributionlisteditor.cpp:133
+#: tdeabc/distributionlisteditor.cpp:133
 msgid "New List"
 msgstr "Rhestr Newydd"
 
-#: kabc/distributionlisteditor.cpp:148
+#: tdeabc/distributionlisteditor.cpp:148
 msgid "Change Email"
 msgstr "Newid Ebost"
 
-#: kabc/distributionlisteditor.cpp:197
+#: tdeabc/distributionlisteditor.cpp:197
 msgid "Please enter name:"
 msgstr "Mewnbynnwch enw:"
 
-#: kabc/formatfactory.cpp:55 kabc/formatfactory.cpp:119
+#: tdeabc/formatfactory.cpp:55 tdeabc/formatfactory.cpp:119
 msgid "vCard"
 msgstr "vCerdyn"
 
-#: kabc/formatfactory.cpp:56 kabc/formatfactory.cpp:120
+#: tdeabc/formatfactory.cpp:56 tdeabc/formatfactory.cpp:120
 msgid "vCard Format"
 msgstr "Fformat vCerdyn"
 
-#: kabc/formatfactory.cpp:75
+#: tdeabc/formatfactory.cpp:75
 msgid "No description available."
 msgstr "Dim disgrifiad ar gael"
 
-#: kabc/addressee.cpp:317 kabc/scripts/addressee.src.cpp:180
+#: tdeabc/addressee.cpp:317 tdeabc/scripts/addressee.src.cpp:180
 msgid "Unique Identifier"
 msgstr "Dynodwr Unigryw"
 
-#: kab/addressbook.cc:271 kabc/addressee.cpp:354
+#: kab/addressbook.cc:271 tdeabc/addressee.cpp:354
 msgid "Formatted Name"
 msgstr "Enw Fformatedig"
 
-#: kabc/addressee.cpp:373
+#: tdeabc/addressee.cpp:373
 msgid "Family Name"
 msgstr "Enw Teuluol"
 
-#: kabc/addressee.cpp:392
+#: tdeabc/addressee.cpp:392
 msgid "Given Name"
 msgstr "Enw Gwreiddiol"
 
-#: kabc/addressee.cpp:411
+#: tdeabc/addressee.cpp:411
 msgid "Additional Names"
 msgstr "Enwau Ychwanegol"
 
-#: kabc/addressee.cpp:430
+#: tdeabc/addressee.cpp:430
 msgid "Honorific Prefixes"
 msgstr "Rhagddodiaid Anrhydedd"
 
-#: kabc/addressee.cpp:449
+#: tdeabc/addressee.cpp:449
 msgid "Honorific Suffixes"
 msgstr "Ôlddodiaid Anrhydedd"
 
-#: kabc/addressee.cpp:468
+#: tdeabc/addressee.cpp:468
 msgid "Nick Name"
 msgstr "Llysenw"
 
-#: kab/addressbook.cc:291 kabc/addressee.cpp:487
+#: kab/addressbook.cc:291 tdeabc/addressee.cpp:487
 msgid "Birthday"
 msgstr "Penblwydd"
 
-#: kabc/addressee.cpp:493
+#: tdeabc/addressee.cpp:493
 msgid "Home Address Street"
 msgstr "Stryd Cyfeiriad Cartref"
 
-#: kabc/addressee.cpp:499
+#: tdeabc/addressee.cpp:499
 msgid "Home Address City"
 msgstr "Dinas Gyfeiriad Cartref"
 
-#: kabc/addressee.cpp:505
+#: tdeabc/addressee.cpp:505
 msgid "Home Address State"
 msgstr "Talaith Gyfeiriad Cartref"
 
-#: kabc/addressee.cpp:511
+#: tdeabc/addressee.cpp:511
 msgid "Home Address Zip Code"
 msgstr "Côd Post Cyfeiriad Cartref"
 
-#: kabc/addressee.cpp:517
+#: tdeabc/addressee.cpp:517
 msgid "Home Address Country"
 msgstr "Gwlad Cyfeiriad Cartref"
 
-#: kabc/addressee.cpp:523
+#: tdeabc/addressee.cpp:523
 msgid "Home Address Label"
 msgstr "Label Cyfeiriad Cartref"
 
-#: kabc/addressee.cpp:529
+#: tdeabc/addressee.cpp:529
 msgid "Business Address Street"
 msgstr "Stryd Cyfeiriad Busnes"
 
-#: kabc/addressee.cpp:535
+#: tdeabc/addressee.cpp:535
 msgid "Business Address City"
 msgstr "Dinas Gyfeiriad Busnes"
 
-#: kabc/addressee.cpp:541
+#: tdeabc/addressee.cpp:541
 msgid "Business Address State"
 msgstr "Talaith Gyfeiriad Busnes"
 
-#: kabc/addressee.cpp:547
+#: tdeabc/addressee.cpp:547
 msgid "Business Address Zip Code"
 msgstr "Côd Post Cyfeiriad Busnes"
 
-#: kabc/addressee.cpp:553
+#: tdeabc/addressee.cpp:553
 msgid "Business Address Country"
 msgstr "Gwlad Cyfeiriad Busnes"
 
-#: kabc/addressee.cpp:559
+#: tdeabc/addressee.cpp:559
 msgid "Business Address Label"
 msgstr "Label Cyfeiriad Busnes"
 
-#: kabc/addressee.cpp:565
+#: tdeabc/addressee.cpp:565
 msgid "Home Phone"
 msgstr "Ffôn Cartref"
 
-#: kabc/addressee.cpp:571
+#: tdeabc/addressee.cpp:571
 msgid "Business Phone"
 msgstr "Ffôn Busnes"
 
-#: kabc/addressee.cpp:577
+#: tdeabc/addressee.cpp:577
 msgid "Mobile Phone"
 msgstr "Ffôn Symudol"
 
-#: kabc/addressee.cpp:589
+#: tdeabc/addressee.cpp:589
 msgid "Business Fax"
 msgstr "Facs Busnes"
 
-#: kabc/addressee.cpp:595
+#: tdeabc/addressee.cpp:595
 msgid "Car Phone"
 msgstr "Ffôn Car"
 
-#: kabc/addressee.cpp:613
+#: tdeabc/addressee.cpp:613
 msgid "Email Address"
 msgstr "Cyfeiriad Ebost"
 
-#: kabc/addressee.cpp:632
+#: tdeabc/addressee.cpp:632
 msgid "Mail Client"
 msgstr "Cleient Ebost"
 
-#: kabc/addressee.cpp:651
+#: tdeabc/addressee.cpp:651
 msgid "Time Zone"
 msgstr "Cylchfa Amser"
 
-#: kabc/addressee.cpp:670
+#: tdeabc/addressee.cpp:670
 msgid "Geographic Position"
 msgstr "Safle Daearyddol"
 
-#: kab/addressbook.cc:263 kabc/addressee.cpp:689
+#: kab/addressbook.cc:263 tdeabc/addressee.cpp:689
 #, fuzzy
 msgid ""
 "_: person\n"
 "Title"
 msgstr "Tamil"
 
-#: kabc/addressee.cpp:708
+#: tdeabc/addressee.cpp:708
 msgid ""
 "_: person in organization\n"
 "Role"
 msgstr ""
 
-#: kab/addressbook.cc:180 kabc/addressee.cpp:746
+#: kab/addressbook.cc:180 tdeabc/addressee.cpp:746
 msgid "Department"
 msgstr "Adran"
 
-#: kabc/addressee.cpp:765
+#: tdeabc/addressee.cpp:765
 msgid "Note"
 msgstr "Nodyn"
 
-#: kabc/addressee.cpp:784
+#: tdeabc/addressee.cpp:784
 msgid "Product Identifier"
 msgstr "Dynodwr Cynnyrch"
 
-#: kabc/addressee.cpp:803
+#: tdeabc/addressee.cpp:803
 msgid "Revision Date"
 msgstr "Dyddiad Addasiad"
 
-#: kabc/addressee.cpp:822
+#: tdeabc/addressee.cpp:822
 msgid "Sort String"
 msgstr "Llinyn Trefnu"
 
-#: kabc/addressee.cpp:841 tdeui/kaboutdialog.cpp:92
+#: tdeabc/addressee.cpp:841 tdeui/tdeaboutdialog.cpp:92
 msgid "Homepage"
 msgstr "Tudalen gartref"
 
-#: kabc/addressee.cpp:860
+#: tdeabc/addressee.cpp:860
 msgid "Security Class"
 msgstr "Dosbarth Diogelwch"
 
-#: kabc/addressee.cpp:879
+#: tdeabc/addressee.cpp:879
 msgid "Logo"
 msgstr "Logo"
 
-#: kabc/addressee.cpp:898
+#: tdeabc/addressee.cpp:898
 msgid "Photo"
 msgstr "Ffoto"
 
-#: kabc/addressee.cpp:917
+#: tdeabc/addressee.cpp:917
 msgid "Sound"
 msgstr "Sŵn"
 
-#: kabc/addressee.cpp:936
+#: tdeabc/addressee.cpp:936
 msgid "Agent"
 msgstr "Asiant"
 
-#: kabc/vcard/testwrite.cpp:11
+#: tdeabc/vcard/testwrite.cpp:11
 msgid "TestWritevCard"
 msgstr "YsgrifennuPrawfvCerdyn"
 
-#: kabc/vcardparser/testread.cpp:38
+#: tdeabc/vcardparser/testread.cpp:38
 msgid "vCard 2.1"
 msgstr " vCerdyn 2.1"
 
-#: kabc/vcardparser/testread.cpp:39 kdewidgets/makekdewidgets.cpp:112
+#: tdeabc/vcardparser/testread.cpp:39 kdewidgets/maketdewidgets.cpp:112
 msgid "Input file"
 msgstr "Ffeil fewnbwn"
 
-#: kded/kde-menu.cpp:36
+#: kded/tde-menu.cpp:36
 msgid "Output data in UTF-8 instead of local encoding"
 msgstr "Allbynnu'r data mewn UTF-8 yn lle amgodiad lleol"
 
-#: kded/kde-menu.cpp:37
+#: kded/tde-menu.cpp:37
 msgid ""
 "Print menu-id of the menu that contains\n"
 "the application"
@@ -2402,7 +2402,7 @@ msgstr ""
 "Argraffu y dynodiad dewislen o'r ddewislen sy'n cynnwys\n"
 "y cymhwysiad"
 
-#: kded/kde-menu.cpp:38
+#: kded/tde-menu.cpp:38
 msgid ""
 "Print menu name (caption) of the menu that\n"
 "contains the application"
@@ -2410,23 +2410,23 @@ msgstr ""
 "Argraffu yr enw (egluryn) o'r ddewislen\n"
 " sy'n cynnwys y cymhwysiad"
 
-#: kded/kde-menu.cpp:39
+#: kded/tde-menu.cpp:39
 msgid "Highlight the entry in the menu"
 msgstr "Amlygu'r gofnod yn y ddewislen"
 
-#: kded/kde-menu.cpp:40
+#: kded/tde-menu.cpp:40
 msgid "Do not check if sycoca database is up to date"
 msgstr "Peidio â gwirio a yw'r cronfa ddata sycoca yn ddiweddar"
 
-#: kded/kde-menu.cpp:41
+#: kded/tde-menu.cpp:41
 msgid "The id of the menu entry to locate"
 msgstr "Y dynodiad o'r gofnod ddewislen i'w chanfod"
 
-#: kded/kde-menu.cpp:99
+#: kded/tde-menu.cpp:99
 msgid "Menu item '%1' could not be highlighted."
 msgstr "Ni ellid amlygu'r eitem dewislen '%1'."
 
-#: kded/kde-menu.cpp:111
+#: kded/tde-menu.cpp:111
 msgid ""
 "TDE Menu query tool.\n"
 "This tool can be used to find in which menu a specific application is shown.\n"
@@ -2440,20 +2440,20 @@ msgstr ""
 "\n"
 "yn y ddewislen TDE a ellir canfod cymhwysiad penodol."
 
-#: kded/kde-menu.cpp:116
-msgid "kde-menu"
-msgstr "kde-menu"
+#: kded/tde-menu.cpp:116
+msgid "tde-menu"
+msgstr "tde-menu"
 
-#: kded/kbuildsycoca.cpp:724 kded/kbuildsycoca.cpp:725 kded/kde-menu.cpp:119
-#: kded/khostname.cpp:362 tdeui/kaboutdialog.cpp:90
+#: kded/tdebuildsycoca.cpp:724 kded/tdebuildsycoca.cpp:725 kded/tde-menu.cpp:119
+#: kded/khostname.cpp:362 tdeui/tdeaboutdialog.cpp:90
 msgid "Author"
 msgstr "Awdur"
 
-#: kded/kde-menu.cpp:133
+#: kded/tde-menu.cpp:133
 msgid "You must specify an application-id such as 'tde-konsole.desktop'"
 msgstr "Rhaid i chi benodi dynodiad cymhwysiad fel 'tde-konsole.desktop'"
 
-#: kded/kde-menu.cpp:142
+#: kded/tde-menu.cpp:142
 msgid ""
 "You must specify at least one of --print-menu-id, --print-menu-name or "
 "--highlight"
@@ -2461,11 +2461,11 @@ msgstr ""
 "Rhaid i chi benodi o leiaf un o --print-menu-id, --print-menu-name or "
 "--highlight"
 
-#: kded/kde-menu.cpp:164
+#: kded/tde-menu.cpp:164
 msgid "No menu item '%1'."
 msgstr "Dim eitem dewislen '%1'."
 
-#: kded/kde-menu.cpp:168
+#: kded/tde-menu.cpp:168
 msgid "Menu item '%1' not found in menu."
 msgstr "Ni chanfuwyd eitem dewislen '%1' yn y ddewislen."
 
@@ -2509,7 +2509,7 @@ msgstr "Ellyll TDE"
 msgid "TDE Daemon - triggers Sycoca database updates when needed"
 msgstr "Ellyll TDE - yn diweddaru cronfa ddata Sycoca pan bo angen"
 
-#: kded/kbuildsycoca.cpp:483
+#: kded/tdebuildsycoca.cpp:483
 msgid ""
 "Error creating database '%1'.\n"
 "Check that the permissions are correct on the directory and the disk is not "
@@ -2519,12 +2519,12 @@ msgstr ""
 "Gwiriwch fod y caniatadau yn gywir ar y cyfeiriadur, a nad yw'r ddisg yn "
 "llawn.\n"
 
-#: kded/kbuildsycoca.cpp:483 kded/kbuildsycoca.cpp:512
-#: kded/kbuildsycoca.cpp:721
+#: kded/tdebuildsycoca.cpp:483 kded/tdebuildsycoca.cpp:512
+#: kded/tdebuildsycoca.cpp:721
 msgid "KBuildSycoca"
 msgstr "KBuildSycoca"
 
-#: kded/kbuildsycoca.cpp:512
+#: kded/tdebuildsycoca.cpp:512
 msgid ""
 "Error writing database '%1'.\n"
 "Check that the permissions are correct on the directory and the disk is not "
@@ -2534,233 +2534,233 @@ msgstr ""
 "Gwiriwch fod y caniatadau yn gywir ar y cyfeiriadur, a nad yw'r ddisg yn "
 "llawn.\n"
 
-#: kded/kbuildsycoca.cpp:695
+#: kded/tdebuildsycoca.cpp:695
 msgid "Do not signal applications to update"
 msgstr "Peidio â nodi cymwysiadau i'w diweddaru"
 
-#: kded/kbuildsycoca.cpp:696
+#: kded/tdebuildsycoca.cpp:696
 msgid "Disable incremental update, re-read everything"
 msgstr "Analluogi diweddariad cynnyddol, ail-ddarllen popeth"
 
-#: kded/kbuildsycoca.cpp:697
+#: kded/tdebuildsycoca.cpp:697
 msgid "Check file timestamps"
 msgstr "Gwirio stampiau amser ffeil"
 
-#: kded/kbuildsycoca.cpp:698
+#: kded/tdebuildsycoca.cpp:698
 msgid "Disable checking files (dangerous)"
 msgstr "Analluogi gwirio ffeiliau (peryglus)"
 
-#: kded/kbuildsycoca.cpp:699
+#: kded/tdebuildsycoca.cpp:699
 msgid "Create global database"
 msgstr "Creu cronfa ddata eang"
 
-#: kded/kbuildsycoca.cpp:700
+#: kded/tdebuildsycoca.cpp:700
 msgid "Perform menu generation test run only"
 msgstr "Gweithredu arbrofiad yn unig o'r cread dewislen"
 
-#: kded/kbuildsycoca.cpp:701
+#: kded/tdebuildsycoca.cpp:701
 msgid "Track menu id for debug purposes"
 msgstr "Dilyn dynodiad dewislen i pwrpas dadnamu"
 
-#: kded/kbuildsycoca.cpp:703
+#: kded/tdebuildsycoca.cpp:703
 msgid "Silent - work without windows and stderr"
 msgstr "Distaw - gweithio heb ffenestri a stderr"
 
-#: kded/kbuildsycoca.cpp:704
+#: kded/tdebuildsycoca.cpp:704
 msgid "Show progress information (even if 'silent' mode is on)"
 msgstr "Dangos gwybodaeth gynnydd (hyd yn oed os dewisir modd 'distaw') "
 
-#: kded/kbuildsycoca.cpp:722
+#: kded/tdebuildsycoca.cpp:722
 msgid "Rebuilds the system configuration cache."
 msgstr "Ail-adeiladu celc ffurfweddiad y cysawd."
 
-#: kded/kbuildsycoca.cpp:750
+#: kded/tdebuildsycoca.cpp:750
 msgid "Reloading TDE configuration, please wait..."
 msgstr "Ail-lwytho ffurfweddiad TDE, arhoswch ..."
 
-#: kded/kbuildsycoca.cpp:751
+#: kded/tdebuildsycoca.cpp:751
 msgid "TDE Configuration Manager"
 msgstr "Rheolydd Ffurfweddu TDE"
 
-#: kded/kbuildsycoca.cpp:753
+#: kded/tdebuildsycoca.cpp:753
 msgid "Do you want to reload TDE configuration?"
 msgstr "Ydych eisiau ail-lwytho ffurfweddiad TDE?"
 
-#: kded/kbuildsycoca.cpp:753
+#: kded/tdebuildsycoca.cpp:753
 #, fuzzy
 msgid "Do Not Reload"
 msgstr "&Peidiwch â Chadw"
 
-#: kded/kbuildsycoca.cpp:953
+#: kded/tdebuildsycoca.cpp:953
 msgid "Configuration information reloaded successfully."
 msgstr "Wedi ail-lwytho'r ffurfweddiad yn llwyddiannus."
 
-#: kmdi/kmdi/guiclient.cpp:79 kmdi/kmdiguiclient.cpp:139
+#: tdemdi/tdemdi/guiclient.cpp:79 tdemdi/tdemdiguiclient.cpp:139
 msgid "Tool &Views"
 msgstr "Golygfeydd &Offer"
 
-#: kmdi/kmdiguiclient.cpp:142
+#: tdemdi/tdemdiguiclient.cpp:142
 msgid "MDI Mode"
 msgstr "Modd MDI"
 
-#: kmdi/kmdiguiclient.cpp:144 kmdi/kmdimainfrm.cpp:2594
+#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2594
 msgid "&Toplevel Mode"
 msgstr "&Modd Gwastad Uchaf"
 
-#: kmdi/kmdiguiclient.cpp:144 kmdi/kmdimainfrm.cpp:2595
+#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2595
 msgid "C&hildframe Mode"
 msgstr "Modd Ffrâm &Plentyn"
 
-#: kmdi/kmdiguiclient.cpp:144 kmdi/kmdimainfrm.cpp:2596
+#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2596
 msgid "Ta&b Page Mode"
 msgstr "Modd Tudalen Ta&b"
 
-#: kmdi/kmdiguiclient.cpp:144 kmdi/kmdimainfrm.cpp:2597
+#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2597
 msgid "I&DEAl Mode"
 msgstr "Modd I&DEAI"
 
-#: kmdi/kmdi/guiclient.cpp:81 kmdi/kmdiguiclient.cpp:154
+#: tdemdi/tdemdi/guiclient.cpp:81 tdemdi/tdemdiguiclient.cpp:154
 msgid "Tool &Docks"
 msgstr "Dociau &Offer"
 
-#: kmdi/kmdi/guiclient.cpp:82 kmdi/kmdiguiclient.cpp:155
+#: tdemdi/tdemdi/guiclient.cpp:82 tdemdi/tdemdiguiclient.cpp:155
 msgid "Switch Top Dock"
 msgstr "Newid y Doc wrth y Pen"
 
-#: kmdi/kmdi/guiclient.cpp:84 kmdi/kmdiguiclient.cpp:157
+#: tdemdi/tdemdi/guiclient.cpp:84 tdemdi/tdemdiguiclient.cpp:157
 msgid "Switch Left Dock"
 msgstr "Newid y Doc ar y Chwith"
 
-#: kmdi/kmdi/guiclient.cpp:86 kmdi/kmdiguiclient.cpp:159
+#: tdemdi/tdemdi/guiclient.cpp:86 tdemdi/tdemdiguiclient.cpp:159
 msgid "Switch Right Dock"
 msgstr "Newid y Doc ar y Dde"
 
-#: kmdi/kmdi/guiclient.cpp:88 kmdi/kmdiguiclient.cpp:161
+#: tdemdi/tdemdi/guiclient.cpp:88 tdemdi/tdemdiguiclient.cpp:161
 msgid "Switch Bottom Dock"
 msgstr "Newid y Doc wrth y Gwaelod"
 
-#: kmdi/kmdi/guiclient.cpp:91 kmdi/kmdiguiclient.cpp:164
+#: tdemdi/tdemdi/guiclient.cpp:91 tdemdi/tdemdiguiclient.cpp:164
 msgid "Previous Tool View"
 msgstr "Golwg Offer Cynt"
 
-#: kmdi/kmdi/guiclient.cpp:93 kmdi/kmdiguiclient.cpp:166
+#: tdemdi/tdemdi/guiclient.cpp:93 tdemdi/tdemdiguiclient.cpp:166
 msgid "Next Tool View"
 msgstr "Golwg Offer Nesaf"
 
-#: tdeui/kdockwidget.cpp:2945 kmdi/kmdi/guiclient.cpp:148
-#: kmdi/kmdiguiclient.cpp:260
+#: tdeui/kdockwidget.cpp:2945 tdemdi/tdemdi/guiclient.cpp:148
+#: tdemdi/tdemdiguiclient.cpp:260
 #, c-format
 msgid "Show %1"
 msgstr "Dangos %1"
 
-#: tdeui/kdockwidget.cpp:2939 kmdi/kmdi/guiclient.cpp:152
-#: kmdi/kmdiguiclient.cpp:265
+#: tdeui/kdockwidget.cpp:2939 tdemdi/tdemdi/guiclient.cpp:152
+#: tdemdi/tdemdiguiclient.cpp:265
 #, c-format
 msgid "Hide %1"
 msgstr "Cuddio %1"
 
-#: kmdi/kmdimainfrm.cpp:979
+#: tdemdi/tdemdimainfrm.cpp:979
 msgid "Window"
 msgstr "Ffenest"
 
-#: kmdi/kmdimainfrm.cpp:992
+#: tdemdi/tdemdimainfrm.cpp:992
 msgid "Undock"
 msgstr "Dad-ddocio"
 
-#: kmdi/kmdimainfrm.cpp:1002
+#: tdemdi/tdemdimainfrm.cpp:1002
 msgid "Dock"
 msgstr "Docio"
 
-#: kmdi/kmdimainfrm.cpp:1007
+#: tdemdi/tdemdimainfrm.cpp:1007
 msgid "Operations"
 msgstr "Gweithrediadau"
 
-#: kmdi/kmdimainfrm.cpp:2577
+#: tdemdi/tdemdimainfrm.cpp:2577
 msgid "Close &All"
 msgstr "Cau'r &Cwbl"
 
-#: kmdi/kmdimainfrm.cpp:2586
+#: tdemdi/tdemdimainfrm.cpp:2586
 msgid "&Minimize All"
 msgstr "Llei&hau'r Cwbl"
 
-#: kmdi/kmdimainfrm.cpp:2592
+#: tdemdi/tdemdimainfrm.cpp:2592
 msgid "&MDI Mode"
 msgstr "&Modd MDI"
 
-#: kmdi/kmdimainfrm.cpp:2619
+#: tdemdi/tdemdimainfrm.cpp:2619
 msgid "&Tile"
 msgstr "&Teilio"
 
-#: kmdi/kmdimainfrm.cpp:2621
+#: tdemdi/tdemdimainfrm.cpp:2621
 msgid "Ca&scade Windows"
 msgstr "Rhae&adru Ffenestri"
 
-#: kmdi/kmdimainfrm.cpp:2622
+#: tdemdi/tdemdimainfrm.cpp:2622
 msgid "Cascade &Maximized"
 msgstr "Rhaeadru wedi'u &Ehangu"
 
-#: kmdi/kmdimainfrm.cpp:2623
+#: tdemdi/tdemdimainfrm.cpp:2623
 msgid "Expand &Vertically"
 msgstr "Ehangu'n &Fertigol"
 
-#: kmdi/kmdimainfrm.cpp:2624
+#: tdemdi/tdemdimainfrm.cpp:2624
 msgid "Expand &Horizontally"
 msgstr "Ehangu'n &Llorweddol"
 
-#: kmdi/kmdimainfrm.cpp:2625
+#: tdemdi/tdemdimainfrm.cpp:2625
 msgid "Tile &Non-Overlapped"
 msgstr "Teilio wedi'u &Di-orgyffwrdd"
 
-#: kmdi/kmdimainfrm.cpp:2626
+#: tdemdi/tdemdimainfrm.cpp:2626
 msgid "Tile Overla&pped"
 msgstr "Teilio wedi'u &Gorgyffwrdd"
 
-#: kmdi/kmdimainfrm.cpp:2627
+#: tdemdi/tdemdimainfrm.cpp:2627
 msgid "Tile V&ertically"
 msgstr "Teilio'n Fe&rtigol"
 
-#: kmdi/kmdimainfrm.cpp:2633
+#: tdemdi/tdemdimainfrm.cpp:2633
 msgid "&Dock/Undock"
 msgstr "&Docio/Dad-ddocio"
 
-#: kmdi/kmdichildfrmcaption.cpp:71 kmdi/kmdichildview.cpp:63
-#: kmdi/kmdichildview.cpp:89
+#: tdemdi/tdemdichildfrmcaption.cpp:71 tdemdi/tdemdichildview.cpp:63
+#: tdemdi/tdemdichildview.cpp:89
 msgid "Unnamed"
 msgstr "Di-enw"
 
-#: kmdi/kmdichildfrm.cpp:1239
+#: tdemdi/tdemdichildfrm.cpp:1239
 msgid "R&esize"
 msgstr "Ne&wid Maint"
 
-#: kmdi/kmdichildfrm.cpp:1240
+#: tdemdi/tdemdichildfrm.cpp:1240
 msgid "M&inimize"
 msgstr "Lle&ihau"
 
-#: kmdi/kmdichildfrm.cpp:1241
+#: tdemdi/tdemdichildfrm.cpp:1241
 msgid "M&aximize"
 msgstr "Ch&wyddo"
 
-#: kmdi/kmdichildfrm.cpp:1261
+#: tdemdi/tdemdichildfrm.cpp:1261
 msgid "&Maximize"
 msgstr "&Chwyddo"
 
-#: tdeui/ksystemtray.cpp:155 kmdi/kmdichildfrm.cpp:1263
+#: tdeui/ksystemtray.cpp:155 tdemdi/tdemdichildfrm.cpp:1263
 msgid "&Minimize"
 msgstr "Llei&hau"
 
-#: kmdi/kmdichildfrm.cpp:1265
+#: tdemdi/tdemdichildfrm.cpp:1265
 msgid "M&ove"
 msgstr "&Symud"
 
-#: kmdi/kmdichildfrm.cpp:1267
+#: tdemdi/tdemdichildfrm.cpp:1267
 msgid "&Resize"
 msgstr "Newid &Maint"
 
-#: kmdi/kmdichildfrm.cpp:1270
+#: tdemdi/tdemdichildfrm.cpp:1270
 msgid "&Undock"
 msgstr "&Dad-ddocio"
 
-#: kmdi/kmdi/dockcontainer.cpp:196 kmdi/kmdidockcontainer.cpp:218
+#: tdemdi/tdemdi/dockcontainer.cpp:196 tdemdi/tdemdidockcontainer.cpp:218
 msgid ""
 "_: Switch between overlap and side by side mode\n"
 "Overlap"
@@ -2778,14 +2778,14 @@ msgstr "Nid yw'r rhaglengell %1 yn cynnig ffatri sy'n cyfaddas i TDE."
 msgid "Library files for \"%1\" not found in paths."
 msgstr "Ni chanfuwyd ffeiliau llyfrgell ar gyfer \"%1\" ymysg y llwybrau."
 
-#: tdecore/kapplication.cpp:931
+#: tdecore/tdeapplication.cpp:931
 msgid ""
 "_: Dear Translator! Translate this string to the string 'LTR' in left-to-right "
 "languages (as english) or to 'RTL' in right-to-left languages (such as Hebrew "
 "and Arabic) to get proper widget layout."
 msgstr "LTR"
 
-#: tdecore/kapplication.cpp:1404
+#: tdecore/tdeapplication.cpp:1404
 msgid ""
 "There was an error setting up inter-process communications for TDE. The message "
 "returned by the system was:\n"
@@ -2795,7 +2795,7 @@ msgstr ""
 "ddychwelwyd gan y cysawd oedd:\n"
 "\n"
 
-#: tdecore/kapplication.cpp:1408
+#: tdecore/tdeapplication.cpp:1408
 msgid ""
 "\n"
 "\n"
@@ -2805,23 +2805,23 @@ msgstr ""
 "\n"
 "Gwiriwch fod y rhaglen \"dcopserver\" yn rhedeg!"
 
-#: tdecore/kapplication.cpp:1415
+#: tdecore/tdeapplication.cpp:1415
 msgid "DCOP communications error (%1)"
 msgstr "Gwall cyfathrebu DCOP (%1)"
 
-#: tdecore/kapplication.cpp:1433
+#: tdecore/tdeapplication.cpp:1433
 msgid "Use the X-server display 'displayname'"
 msgstr "Defnyddio'r arddangosydd gweinydd-X 'displayname'"
 
-#: tdecore/kapplication.cpp:1435
+#: tdecore/tdeapplication.cpp:1435
 msgid "Use the QWS display 'displayname'"
 msgstr "Defnyddio'r arddangosydd QWS 'displayname'"
 
-#: tdecore/kapplication.cpp:1437
+#: tdecore/tdeapplication.cpp:1437
 msgid "Restore the application for the given 'sessionId'"
 msgstr "Adfer y cymhwysiad ar gyfer y 'sessionId' a rhoddwyd"
 
-#: tdecore/kapplication.cpp:1438
+#: tdecore/tdeapplication.cpp:1438
 msgid ""
 "Causes the application to install a private color\n"
 "map on an 8-bit display"
@@ -2829,7 +2829,7 @@ msgstr ""
 " Achosi i'r cymhwysiad arsefydlu map lliw\n"
 " preifat ar arddangosydd 8-did"
 
-#: tdecore/kapplication.cpp:1439
+#: tdecore/tdeapplication.cpp:1439
 msgid ""
 "Limits the number of colors allocated in the color\n"
 "cube on an 8-bit display, if the application is\n"
@@ -2840,11 +2840,11 @@ msgstr ""
 " lliw ar arddangosydd 8-did, os mae'r cymhwysiad\n"
 " yn defnyddio y penodiad QApplication::ManyColor"
 
-#: tdecore/kapplication.cpp:1440
+#: tdecore/tdeapplication.cpp:1440
 msgid "tells Qt to never grab the mouse or the keyboard"
 msgstr "Dweud wrth QT na ddylai fyth dwyn y llygoden na'r bysellfwrdd"
 
-#: tdecore/kapplication.cpp:1441
+#: tdecore/tdeapplication.cpp:1441
 msgid ""
 "running under a debugger can cause an implicit\n"
 "-nograb, use -dograb to override"
@@ -2852,15 +2852,15 @@ msgstr ""
 "gall redeg dan ddadnamydd achosi -nograb\n"
 "ymhlyg, defnyddiwch -dograb i'w anwybyddu"
 
-#: tdecore/kapplication.cpp:1442
+#: tdecore/tdeapplication.cpp:1442
 msgid "switches to synchronous mode for debugging"
 msgstr "newid i fodd cydamseredig i ddadnamu"
 
-#: tdecore/kapplication.cpp:1444
+#: tdecore/tdeapplication.cpp:1444
 msgid "defines the application font"
 msgstr "diffinio wynebfath y cymhwysiad"
 
-#: tdecore/kapplication.cpp:1446
+#: tdecore/tdeapplication.cpp:1446
 msgid ""
 "sets the default background color and an\n"
 "application palette (light and dark shades are\n"
@@ -2870,23 +2870,23 @@ msgstr ""
 "palêt cymhwysiad (mae cysgodau\n"
 " golau a tywyll yn cael eu cyfrifo)"
 
-#: tdecore/kapplication.cpp:1448
+#: tdecore/tdeapplication.cpp:1448
 msgid "sets the default foreground color"
 msgstr "Gosod y lliw blaendir rhagosodol"
 
-#: tdecore/kapplication.cpp:1450
+#: tdecore/tdeapplication.cpp:1450
 msgid "sets the default button color"
 msgstr "Gosod y lliw botwm rhagosodol"
 
-#: tdecore/kapplication.cpp:1451
+#: tdecore/tdeapplication.cpp:1451
 msgid "sets the application name"
 msgstr "gosod enw'r cymhwysiad"
 
-#: tdecore/kapplication.cpp:1452
+#: tdecore/tdeapplication.cpp:1452
 msgid "sets the application title (caption)"
 msgstr "gosod teitl y cymhwysiad (egluryn)"
 
-#: tdecore/kapplication.cpp:1454
+#: tdecore/tdeapplication.cpp:1454
 msgid ""
 "forces the application to use a TrueColor visual on\n"
 "an 8-bit display"
@@ -2894,7 +2894,7 @@ msgstr ""
 "gorfod i'r cymhwysiad ddefnydio \n"
 " gwelediad WirLiw ar arddangosydd 8-did"
 
-#: tdecore/kapplication.cpp:1455
+#: tdecore/tdeapplication.cpp:1455
 msgid ""
 "sets XIM (X Input Method) input style. Possible\n"
 "values are onthespot, overthespot, offthespot and\n"
@@ -2903,76 +2903,76 @@ msgstr ""
 "gosod arddull fewnbwn XIM (X Input Method). Gwerthoedd\n"
 "posib yw onthespot, overthespot, offthespot a root"
 
-#: tdecore/kapplication.cpp:1456
+#: tdecore/tdeapplication.cpp:1456
 msgid "set XIM server"
 msgstr "gosod gweinydd XIM"
 
-#: tdecore/kapplication.cpp:1457
+#: tdecore/tdeapplication.cpp:1457
 msgid "disable XIM"
 msgstr "analluogi XIM"
 
-#: tdecore/kapplication.cpp:1460
+#: tdecore/tdeapplication.cpp:1460
 msgid "forces the application to run as QWS Server"
 msgstr "gorfod i'r cymhwysiad redeg fel Gweinydd QWS"
 
-#: tdecore/kapplication.cpp:1462
+#: tdecore/tdeapplication.cpp:1462
 msgid "mirrors the whole layout of widgets"
 msgstr "adlewyrchu gosodiad cyfan y celfigion"
 
-#: tdecore/kapplication.cpp:1468
+#: tdecore/tdeapplication.cpp:1468
 msgid "Use 'caption' as name in the titlebar"
 msgstr "defnyddio 'egluryn' fel enw yn y bar-teitl"
 
-#: tdecore/kapplication.cpp:1469
+#: tdecore/tdeapplication.cpp:1469
 msgid "Use 'icon' as the application icon"
 msgstr "defnyddio 'eicon' fel eicon y cymhwysiad"
 
-#: tdecore/kapplication.cpp:1470
+#: tdecore/tdeapplication.cpp:1470
 msgid "Use 'icon' as the icon in the titlebar"
 msgstr "defnyddio 'eicon' fel eicon yn y bar-teitl"
 
-#: tdecore/kapplication.cpp:1471
+#: tdecore/tdeapplication.cpp:1471
 msgid "Use alternative configuration file"
 msgstr "defnyddio ffeil ffurfweddiad arall"
 
-#: tdecore/kapplication.cpp:1472
+#: tdecore/tdeapplication.cpp:1472
 msgid "Use the DCOP Server specified by 'server'"
 msgstr "defnyddio'r gweinydd DCOP a penodir gan 'gweinydd'"
 
-#: tdecore/kapplication.cpp:1473
+#: tdecore/tdeapplication.cpp:1473
 msgid "Disable crash handler, to get core dumps"
 msgstr "analluogi'r trinydd chwalfa, er mwyn cael dadlwythiadau craidd"
 
-#: tdecore/kapplication.cpp:1474
+#: tdecore/tdeapplication.cpp:1474
 msgid "Waits for a WM_NET compatible windowmanager"
 msgstr "aros am reolydd ffenestri sy'n gyfaddas i WM_NET"
 
-#: tdecore/kapplication.cpp:1475
+#: tdecore/tdeapplication.cpp:1475
 msgid "sets the application GUI style"
 msgstr "gosod arddull GUI y cymhwysiad"
 
-#: tdecore/kapplication.cpp:1476
+#: tdecore/tdeapplication.cpp:1476
 #, fuzzy
 msgid ""
 "sets the client geometry of the main widget - see man X for the argument format"
 msgstr "gosod geometreg dibynnol y prif gelfigyn"
 
-#: tdecore/kapplication.cpp:1516
+#: tdecore/tdeapplication.cpp:1516
 msgid ""
 "The style %1 was not found\n"
 msgstr ""
 "Methu darganfod yr ardull %1\n"
 
-#: tdecore/kapplication.cpp:1978 kstyles/klegacy/klegacystyle.cpp:3044
+#: tdecore/tdeapplication.cpp:1978 kstyles/klegacy/klegacystyle.cpp:3044
 #: kstyles/web/webstyle.cpp:1604
 msgid "modified"
 msgstr "newidwyd"
 
-#: tdecore/kapplication.cpp:2244 tdecore/kapplication.cpp:2279
+#: tdecore/tdeapplication.cpp:2244 tdecore/tdeapplication.cpp:2279
 msgid "Could not Launch Help Center"
 msgstr "Methodd gychwyn Canolfan Gymorth"
 
-#: tdecore/kapplication.cpp:2245 tdecore/kapplication.cpp:2280
+#: tdecore/tdeapplication.cpp:2245 tdecore/tdeapplication.cpp:2280
 #, c-format
 msgid ""
 "Could not launch the TDE Help Center:\n"
@@ -2983,11 +2983,11 @@ msgstr ""
 "\n"
 "%1"
 
-#: tdecore/kapplication.cpp:2550
+#: tdecore/tdeapplication.cpp:2550
 msgid "Could not Launch Mail Client"
 msgstr "Methodd gychwyn Dibynnydd Ebost"
 
-#: tdecore/kapplication.cpp:2551
+#: tdecore/tdeapplication.cpp:2551
 #, c-format
 msgid ""
 "Could not launch the mail client:\n"
@@ -2998,11 +2998,11 @@ msgstr ""
 "\n"
 "%1"
 
-#: tdecore/kapplication.cpp:2572
+#: tdecore/tdeapplication.cpp:2572
 msgid "Could not Launch Browser"
 msgstr "Methodd gychwyn Porydd"
 
-#: tdecore/kapplication.cpp:2573
+#: tdecore/tdeapplication.cpp:2573
 #, c-format
 msgid ""
 "Could not launch the browser:\n"
@@ -3013,15 +3013,15 @@ msgstr ""
 "\n"
 "%1"
 
-#: tdecore/kapplication.cpp:2637
+#: tdecore/tdeapplication.cpp:2637
 msgid ""
 "Could not register with DCOP.\n"
 msgstr ""
 "Methodd gofrestru gyda DCOP.\n"
 
-#: tdecore/kapplication.cpp:2672
+#: tdecore/tdeapplication.cpp:2672
 msgid ""
-"KLauncher could not be reached via DCOP.\n"
+"TDELauncher could not be reached via DCOP.\n"
 msgstr ""
 "Methodd gyrraedd Klauncher drwy DCOP.\n"
 
@@ -3030,31 +3030,31 @@ msgstr ""
 msgid "Desktop %1"
 msgstr "Penbwrdd %1"
 
-#: tdecore/kconfigbackend.cpp:1107 tdecore/kconfigbackend.cpp:1116
+#: tdecore/tdeconfigbackend.cpp:1107 tdecore/tdeconfigbackend.cpp:1116
 msgid ""
 "Will not save configuration.\n"
 msgstr ""
 "Ni fydd yn cadw'r ffurfweddiad.\n"
 
-#: tdecore/kconfigbackend.cpp:1109 tdecore/kconfigbackend.cpp:1117
+#: tdecore/tdeconfigbackend.cpp:1109 tdecore/tdeconfigbackend.cpp:1117
 msgid ""
 "Configuration file \"%1\" not writable.\n"
 msgstr ""
 "Methu ysgrifennu i'r ffeil ffurfweddiad \"%1\". \n"
 
-#: tdecore/kconfigbackend.cpp:1124
+#: tdecore/tdeconfigbackend.cpp:1124
 msgid "Please contact your system administrator."
 msgstr "Cysylltwch a'ch gwasanaethwr cysodau."
 
-#: tdecore/kcmdlineargs.cpp:500 tdecore/kcmdlineargs.cpp:516
+#: tdecore/tdecmdlineargs.cpp:500 tdecore/tdecmdlineargs.cpp:516
 msgid "Unknown option '%1'."
 msgstr "Dewis anhysbys '%1'."
 
-#: tdecore/kcmdlineargs.cpp:524
+#: tdecore/tdecmdlineargs.cpp:524
 msgid "'%1' missing."
 msgstr "'%1' ar goll."
 
-#: tdecore/kcmdlineargs.cpp:619
+#: tdecore/tdecmdlineargs.cpp:619
 msgid ""
 "_: the 2nd argument is a list of name+address, one on each line\n"
 "%1 was written by\n"
@@ -3063,12 +3063,12 @@ msgstr ""
 "ysgrifennwyd %1 gan\n"
 "%2"
 
-#: tdecore/kcmdlineargs.cpp:622
+#: tdecore/tdecmdlineargs.cpp:622
 #, fuzzy
 msgid "This application was written by somebody who wants to remain anonymous."
 msgstr "Ysgrifennwyd %1 gan berson sy'n dymuno aros yn anhysbys."
 
-#: tdecore/kcmdlineargs.cpp:629
+#: tdecore/tdecmdlineargs.cpp:629
 #, fuzzy
 msgid ""
 "Please use http://bugs.kde.org to report bugs.\n"
@@ -3076,7 +3076,7 @@ msgstr ""
 "Defnyddiwch http://bugs.kde.org er mwyn adrodd namau, peidiwch ac anfon ebost "
 "i'r awduron yn uniongyrchol.\n"
 
-#: tdecore/kcmdlineargs.cpp:632 tdecore/kcmdlineargs.cpp:634
+#: tdecore/tdecmdlineargs.cpp:632 tdecore/tdecmdlineargs.cpp:634
 #, fuzzy
 msgid ""
 "Please report bugs to %1.\n"
@@ -3084,15 +3084,15 @@ msgstr ""
 "Defnyddiwch %1 er mwyn adrodd namau, peidiwch ac anfon ebost i'r awduron yn "
 "uniongyrchol.\n"
 
-#: tdecore/kcmdlineargs.cpp:660
+#: tdecore/tdecmdlineargs.cpp:660
 msgid "Unexpected argument '%1'."
 msgstr "Ymresymiad annisgwyl '%1'."
 
-#: tdecore/kcmdlineargs.cpp:765
+#: tdecore/tdecmdlineargs.cpp:765
 msgid "Use --help to get a list of available command line options."
 msgstr "Defnyddiwch --help i gael rhestr o ddewisiadau llinell gorchymyn."
 
-#: tdecore/kcmdlineargs.cpp:780
+#: tdecore/tdecmdlineargs.cpp:780
 msgid ""
 "\n"
 "%1:\n"
@@ -3100,57 +3100,57 @@ msgstr ""
 "\n"
 "%1:\n"
 
-#: tdecore/kcmdlineargs.cpp:789
+#: tdecore/tdecmdlineargs.cpp:789
 msgid "[options] "
 msgstr "[dewisiadau]"
 
-#: tdecore/kcmdlineargs.cpp:796
+#: tdecore/tdecmdlineargs.cpp:796
 msgid "[%1-options]"
 msgstr "[%1-dewisiadau]"
 
-#: tdecore/kcmdlineargs.cpp:816
+#: tdecore/tdecmdlineargs.cpp:816
 msgid ""
 "Usage: %1 %2\n"
 msgstr ""
 "Defnyddir: %1 %2\n"
 
-#: tdecore/kcmdlineargs.cpp:819
+#: tdecore/tdecmdlineargs.cpp:819
 msgid "Generic options"
 msgstr "Dewisiadau generig"
 
-#: tdecore/kcmdlineargs.cpp:820
+#: tdecore/tdecmdlineargs.cpp:820
 msgid "Show help about options"
 msgstr "Dangos cymorth am ddewisiadau"
 
-#: tdecore/kcmdlineargs.cpp:828
+#: tdecore/tdecmdlineargs.cpp:828
 msgid "Show %1 specific options"
 msgstr "Dangos %1 dewisiadau penodol"
 
-#: tdecore/kcmdlineargs.cpp:835
+#: tdecore/tdecmdlineargs.cpp:835
 msgid "Show all options"
 msgstr "Dangos y dewisiadau i gyd"
 
-#: tdecore/kcmdlineargs.cpp:836
+#: tdecore/tdecmdlineargs.cpp:836
 msgid "Show author information"
 msgstr "Dangos gwybodaeth awdur"
 
-#: tdecore/kcmdlineargs.cpp:837
+#: tdecore/tdecmdlineargs.cpp:837
 msgid "Show version information"
 msgstr "Dangos gwybodaeth fersiwn"
 
-#: tdecore/kcmdlineargs.cpp:838
+#: tdecore/tdecmdlineargs.cpp:838
 msgid "Show license information"
 msgstr "Dangos gwybodaeth trwydded"
 
-#: tdecore/kcmdlineargs.cpp:839
+#: tdecore/tdecmdlineargs.cpp:839
 msgid "End of options"
 msgstr "Diwedd y dewisiadau"
 
-#: tdecore/kcmdlineargs.cpp:861
+#: tdecore/tdecmdlineargs.cpp:861
 msgid "%1 options"
 msgstr "%1 o ddewisiadau"
 
-#: tdecore/kcmdlineargs.cpp:863
+#: tdecore/tdecmdlineargs.cpp:863
 msgid ""
 "\n"
 "Options:\n"
@@ -3158,7 +3158,7 @@ msgstr ""
 "\n"
 "Dewisiadau:\n"
 
-#: tdecore/kcmdlineargs.cpp:920
+#: tdecore/tdecmdlineargs.cpp:920
 msgid ""
 "\n"
 "Arguments:\n"
@@ -3166,7 +3166,7 @@ msgstr ""
 "\n"
 "Ymresymiadau:\n"
 
-#: tdecore/kcmdlineargs.cpp:1282
+#: tdecore/tdecmdlineargs.cpp:1282
 msgid "The files/URLs opened by the application will be deleted after use"
 msgstr ""
 "Bydd y ffeiliau/URLau a agorir gan y cymhwysiad yn cael eiu dileu wedi'u "
@@ -3210,149 +3210,149 @@ msgstr "<h2>Gwaredwyd cyflymyddion</h2>"
 msgid "<h2>Accelerators added (just for your info)</h2>"
 msgstr "<h2>Ychwanegwyd cyflymyddion (er eich gwybodaeth)</h2>"
 
-#: tdecore/kstdaccel.cpp:54
+#: tdecore/tdestdaccel.cpp:54
 msgid "New"
 msgstr "Newydd"
 
-#: tdecore/kstdaccel.cpp:65
+#: tdecore/tdestdaccel.cpp:65
 msgid "Paste Selection"
 msgstr "Gludo'r Dewisiad"
 
-#: tdecore/kstdaccel.cpp:67
+#: tdecore/tdestdaccel.cpp:67
 msgid "Deselect"
 msgstr "Dad-ddewis"
 
-#: tdecore/kstdaccel.cpp:68
+#: tdecore/tdestdaccel.cpp:68
 msgid "Delete Word Backwards"
 msgstr "Dileu Gair yn Ôl"
 
-#: tdecore/kstdaccel.cpp:69
+#: tdecore/tdestdaccel.cpp:69
 msgid "Delete Word Forward"
 msgstr "Dileu Gair Ymlaen"
 
-#: tdecore/kkeyserver_x11.cpp:135 tdecore/kstdaccel.cpp:70
+#: tdecore/kkeyserver_x11.cpp:135 tdecore/tdestdaccel.cpp:70
 #: tdeui/keditcl2.cpp:107 tdeui/keditcl2.cpp:120 tdeui/keditcl2.cpp:377
-#: tdeui/keditcl2.cpp:390 tdeui/keditcl2.cpp:700 kutils/kfinddialog.cpp:119
+#: tdeui/keditcl2.cpp:390 tdeui/keditcl2.cpp:700 tdeutils/kfinddialog.cpp:119
 msgid "Find"
 msgstr "Canfod"
 
-#: tdecore/kstdaccel.cpp:71 kutils/kfind.cpp:47
+#: tdecore/tdestdaccel.cpp:71 tdeutils/kfind.cpp:47
 msgid "Find Next"
 msgstr "Canfod Nesaf"
 
-#: tdecore/kstdaccel.cpp:72
+#: tdecore/tdestdaccel.cpp:72
 msgid "Find Prev"
 msgstr "Canfod Blaenorol"
 
-#: tdecore/kstdaccel.cpp:74
+#: tdecore/tdestdaccel.cpp:74
 msgid "Navigation"
 msgstr "Morlywiaeth"
 
-#: tdecore/kstdaccel.cpp:75
+#: tdecore/tdestdaccel.cpp:75
 msgid ""
 "_: Opposite to End\n"
 "Home"
 msgstr "Cartref"
 
-#: tdecore/kstdaccel.cpp:76
+#: tdecore/tdestdaccel.cpp:76
 msgid "End"
 msgstr "Diwedd"
 
-#: tdecore/kstdaccel.cpp:77
+#: tdecore/tdestdaccel.cpp:77
 msgid "Beginning of Line"
 msgstr "Dechrau'r Llinell"
 
-#: tdecore/kstdaccel.cpp:78 kutils/kfinddialog.cpp:451
+#: tdecore/tdestdaccel.cpp:78 tdeutils/kfinddialog.cpp:451
 msgid "End of Line"
 msgstr "Diwedd y Llinell"
 
-#: tdecore/kstdaccel.cpp:79
+#: tdecore/tdestdaccel.cpp:79
 msgid "Prior"
 msgstr "Cynt"
 
-#: tdecore/kstdaccel.cpp:80
+#: tdecore/tdestdaccel.cpp:80
 msgid ""
 "_: Opposite to Prior\n"
 "Next"
 msgstr "Nesaf"
 
-#: tdecore/kstdaccel.cpp:81 tdeui/keditcl2.cpp:976
+#: tdecore/tdestdaccel.cpp:81 tdeui/keditcl2.cpp:976
 msgid "Go to Line"
 msgstr "Mynd i Linell"
 
-#: tdecore/kstdaccel.cpp:82
+#: tdecore/tdestdaccel.cpp:82
 msgid "Add Bookmark"
 msgstr "Ychwanegu Tudnod"
 
-#: tdecore/kstdaccel.cpp:83
+#: tdecore/tdestdaccel.cpp:83
 msgid "Zoom In"
 msgstr "Nesàu"
 
-#: tdecore/kstdaccel.cpp:84
+#: tdecore/tdestdaccel.cpp:84
 msgid "Zoom Out"
 msgstr "Pellhàu"
 
-#: tdecore/kstdaccel.cpp:85
+#: tdecore/tdestdaccel.cpp:85
 msgid "Up"
 msgstr "I fyny"
 
-#: tdecore/kstdaccel.cpp:87
+#: tdecore/tdestdaccel.cpp:87
 msgid "Forward"
 msgstr "Ymlaen"
 
-#: tdecore/kstdaccel.cpp:89
+#: tdecore/tdestdaccel.cpp:89
 msgid "Popup Menu Context"
 msgstr "Cyd-destun Naidlen"
 
-#: tdecore/kstdaccel.cpp:90
+#: tdecore/tdestdaccel.cpp:90
 msgid "Show Menu Bar"
 msgstr "Dangos y Bar Dewislen"
 
-#: tdecore/kstdaccel.cpp:91
+#: tdecore/tdestdaccel.cpp:91
 msgid "Backward Word"
 msgstr "Yn Ôl un Gair"
 
-#: tdecore/kstdaccel.cpp:92
+#: tdecore/tdestdaccel.cpp:92
 msgid "Forward Word"
 msgstr "Ymlaen un Gair"
 
-#: tdecore/kstdaccel.cpp:93
+#: tdecore/tdestdaccel.cpp:93
 msgid "Activate Next Tab"
 msgstr "Gweithredoli'r Tab Nesaf"
 
-#: tdecore/kstdaccel.cpp:94
+#: tdecore/tdestdaccel.cpp:94
 msgid "Activate Previous Tab"
 msgstr "Gweithredoli'r Tab Cynt"
 
-#: tdecore/kstdaccel.cpp:95
+#: tdecore/tdestdaccel.cpp:95
 msgid "Full Screen Mode"
 msgstr "Modd Sgrîn Llawn"
 
-#: tdecore/kstdaccel.cpp:98
+#: tdecore/tdestdaccel.cpp:98
 msgid "What's This"
 msgstr "Beth yw Hwn"
 
-#: tdecore/kstdaccel.cpp:99 tdecore/kstdaccel.cpp:100 tdeui/klineedit.cpp:886
+#: tdecore/tdestdaccel.cpp:99 tdecore/tdestdaccel.cpp:100 tdeui/klineedit.cpp:886
 msgid "Text Completion"
 msgstr "Cwblhâd testun"
 
-#: tdecore/kstdaccel.cpp:101
+#: tdecore/tdestdaccel.cpp:101
 msgid "Previous Completion Match"
 msgstr "Cydweddiad Cwblhâd Blaenorol"
 
-#: tdecore/kstdaccel.cpp:102
+#: tdecore/tdestdaccel.cpp:102
 msgid "Next Completion Match"
 msgstr "Cydweddiad Cwblhâd Nesaf"
 
-#: tdecore/kstdaccel.cpp:103
+#: tdecore/tdestdaccel.cpp:103
 msgid "Substring Completion"
 msgstr "Cwblhâd Is-linyn"
 
-#: tdecore/kstdaccel.cpp:104
+#: tdecore/tdestdaccel.cpp:104
 msgid "Previous Item in List"
 msgstr "Eitem Cynt yn y Rhestr"
 
-#: tdecore/kstdaccel.cpp:105
+#: tdecore/tdestdaccel.cpp:105
 msgid "Next Item in List"
 msgstr "Eitem Nesaf yn y Rhestr"
 
@@ -3556,7 +3556,7 @@ msgstr "Yaum al-Sabt"
 msgid "Yaum al-Ahad"
 msgstr "Yaum al-Ahad"
 
-#: tdecore/klocale.cpp:217
+#: tdecore/tdelocale.cpp:217
 msgid ""
 "_: Dear translator, please do not translate this string in any form, but pick "
 "the _right_ value out of NoPlural/TwoForms/French... If not sure what to do "
@@ -3565,265 +3565,265 @@ msgid ""
 "Definition of PluralForm - to be set by the translator of tdelibs.po"
 msgstr "TwoForms"
 
-#: tdecore/kcalendarsystemgregorian.cpp:91 tdecore/klocale.cpp:553
+#: tdecore/kcalendarsystemgregorian.cpp:91 tdecore/tdelocale.cpp:553
 msgid ""
 "_: January\n"
 "Jan"
 msgstr "Ion"
 
-#: tdecore/kcalendarsystemgregorian.cpp:93 tdecore/klocale.cpp:554
+#: tdecore/kcalendarsystemgregorian.cpp:93 tdecore/tdelocale.cpp:554
 msgid ""
 "_: February\n"
 "Feb"
 msgstr "Chwe"
 
-#: tdecore/kcalendarsystemgregorian.cpp:95 tdecore/klocale.cpp:555
+#: tdecore/kcalendarsystemgregorian.cpp:95 tdecore/tdelocale.cpp:555
 msgid ""
 "_: March\n"
 "Mar"
 msgstr "Maw"
 
-#: tdecore/kcalendarsystemgregorian.cpp:97 tdecore/klocale.cpp:556
+#: tdecore/kcalendarsystemgregorian.cpp:97 tdecore/tdelocale.cpp:556
 msgid ""
 "_: April\n"
 "Apr"
 msgstr "Ebr"
 
-#: tdecore/kcalendarsystemgregorian.cpp:99 tdecore/klocale.cpp:557
+#: tdecore/kcalendarsystemgregorian.cpp:99 tdecore/tdelocale.cpp:557
 msgid ""
 "_: May short\n"
 "May"
 msgstr "Mai"
 
-#: tdecore/kcalendarsystemgregorian.cpp:101 tdecore/klocale.cpp:558
+#: tdecore/kcalendarsystemgregorian.cpp:101 tdecore/tdelocale.cpp:558
 msgid ""
 "_: June\n"
 "Jun"
 msgstr "Meh"
 
-#: tdecore/kcalendarsystemgregorian.cpp:103 tdecore/klocale.cpp:559
+#: tdecore/kcalendarsystemgregorian.cpp:103 tdecore/tdelocale.cpp:559
 msgid ""
 "_: July\n"
 "Jul"
 msgstr "Gor"
 
-#: tdecore/kcalendarsystemgregorian.cpp:105 tdecore/klocale.cpp:560
+#: tdecore/kcalendarsystemgregorian.cpp:105 tdecore/tdelocale.cpp:560
 msgid ""
 "_: August\n"
 "Aug"
 msgstr "Awst"
 
-#: tdecore/kcalendarsystemgregorian.cpp:107 tdecore/klocale.cpp:561
+#: tdecore/kcalendarsystemgregorian.cpp:107 tdecore/tdelocale.cpp:561
 msgid ""
 "_: September\n"
 "Sep"
 msgstr "Medi"
 
-#: tdecore/kcalendarsystemgregorian.cpp:109 tdecore/klocale.cpp:562
+#: tdecore/kcalendarsystemgregorian.cpp:109 tdecore/tdelocale.cpp:562
 msgid ""
 "_: October\n"
 "Oct"
 msgstr "Hydr"
 
-#: tdecore/kcalendarsystemgregorian.cpp:111 tdecore/klocale.cpp:563
+#: tdecore/kcalendarsystemgregorian.cpp:111 tdecore/tdelocale.cpp:563
 msgid ""
 "_: November\n"
 "Nov"
 msgstr "Tach"
 
-#: tdecore/kcalendarsystemgregorian.cpp:113 tdecore/klocale.cpp:564
+#: tdecore/kcalendarsystemgregorian.cpp:113 tdecore/tdelocale.cpp:564
 msgid ""
 "_: December\n"
 "Dec"
 msgstr "Rhag"
 
-#: tdecore/kcalendarsystemgregorian.cpp:119 tdecore/klocale.cpp:569
+#: tdecore/kcalendarsystemgregorian.cpp:119 tdecore/tdelocale.cpp:569
 msgid "January"
 msgstr "Ionawr"
 
-#: tdecore/kcalendarsystemgregorian.cpp:121 tdecore/klocale.cpp:570
+#: tdecore/kcalendarsystemgregorian.cpp:121 tdecore/tdelocale.cpp:570
 msgid "February"
 msgstr "Chwefror"
 
-#: tdecore/kcalendarsystemgregorian.cpp:123 tdecore/klocale.cpp:571
+#: tdecore/kcalendarsystemgregorian.cpp:123 tdecore/tdelocale.cpp:571
 msgid "March"
 msgstr "Mawrth"
 
-#: tdecore/kcalendarsystemgregorian.cpp:125 tdecore/klocale.cpp:572
+#: tdecore/kcalendarsystemgregorian.cpp:125 tdecore/tdelocale.cpp:572
 msgid "April"
 msgstr "Ebrill"
 
-#: tdecore/kcalendarsystemgregorian.cpp:127 tdecore/klocale.cpp:573
+#: tdecore/kcalendarsystemgregorian.cpp:127 tdecore/tdelocale.cpp:573
 msgid ""
 "_: May long\n"
 "May"
 msgstr "Mai"
 
-#: tdecore/kcalendarsystemgregorian.cpp:129 tdecore/klocale.cpp:574
+#: tdecore/kcalendarsystemgregorian.cpp:129 tdecore/tdelocale.cpp:574
 msgid "June"
 msgstr "Mehefin"
 
-#: tdecore/kcalendarsystemgregorian.cpp:131 tdecore/klocale.cpp:575
+#: tdecore/kcalendarsystemgregorian.cpp:131 tdecore/tdelocale.cpp:575
 msgid "July"
 msgstr "Gorfennaf"
 
-#: tdecore/kcalendarsystemgregorian.cpp:133 tdecore/klocale.cpp:576
+#: tdecore/kcalendarsystemgregorian.cpp:133 tdecore/tdelocale.cpp:576
 msgid "August"
 msgstr "Awst"
 
-#: tdecore/kcalendarsystemgregorian.cpp:135 tdecore/klocale.cpp:577
+#: tdecore/kcalendarsystemgregorian.cpp:135 tdecore/tdelocale.cpp:577
 msgid "September"
 msgstr "Medi"
 
-#: tdecore/kcalendarsystemgregorian.cpp:137 tdecore/klocale.cpp:578
+#: tdecore/kcalendarsystemgregorian.cpp:137 tdecore/tdelocale.cpp:578
 msgid "October"
 msgstr "Hydref"
 
-#: tdecore/kcalendarsystemgregorian.cpp:139 tdecore/klocale.cpp:579
+#: tdecore/kcalendarsystemgregorian.cpp:139 tdecore/tdelocale.cpp:579
 msgid "November"
 msgstr "Tachwedd"
 
-#: tdecore/kcalendarsystemgregorian.cpp:141 tdecore/klocale.cpp:580
+#: tdecore/kcalendarsystemgregorian.cpp:141 tdecore/tdelocale.cpp:580
 msgid "December"
 msgstr "Rhagfyr"
 
-#: tdecore/kcalendarsystemgregorian.cpp:156 tdecore/klocale.cpp:591
+#: tdecore/kcalendarsystemgregorian.cpp:156 tdecore/tdelocale.cpp:591
 msgid ""
 "_: of January\n"
 "of Jan"
 msgstr "o Ionawr"
 
-#: tdecore/kcalendarsystemgregorian.cpp:158 tdecore/klocale.cpp:592
+#: tdecore/kcalendarsystemgregorian.cpp:158 tdecore/tdelocale.cpp:592
 msgid ""
 "_: of February\n"
 "of Feb"
 msgstr "o Chwefror"
 
-#: tdecore/kcalendarsystemgregorian.cpp:160 tdecore/klocale.cpp:593
+#: tdecore/kcalendarsystemgregorian.cpp:160 tdecore/tdelocale.cpp:593
 msgid ""
 "_: of March\n"
 "of Mar"
 msgstr "o Fawrth"
 
-#: tdecore/kcalendarsystemgregorian.cpp:162 tdecore/klocale.cpp:594
+#: tdecore/kcalendarsystemgregorian.cpp:162 tdecore/tdelocale.cpp:594
 msgid ""
 "_: of April\n"
 "of Apr"
 msgstr "o Ebrill"
 
-#: tdecore/kcalendarsystemgregorian.cpp:164 tdecore/klocale.cpp:595
+#: tdecore/kcalendarsystemgregorian.cpp:164 tdecore/tdelocale.cpp:595
 msgid ""
 "_: of May short\n"
 "of May"
 msgstr "o Fai"
 
-#: tdecore/kcalendarsystemgregorian.cpp:166 tdecore/klocale.cpp:596
+#: tdecore/kcalendarsystemgregorian.cpp:166 tdecore/tdelocale.cpp:596
 msgid ""
 "_: of June\n"
 "of Jun"
 msgstr "o Fehefin"
 
-#: tdecore/kcalendarsystemgregorian.cpp:168 tdecore/klocale.cpp:597
+#: tdecore/kcalendarsystemgregorian.cpp:168 tdecore/tdelocale.cpp:597
 msgid ""
 "_: of July\n"
 "of Jul"
 msgstr "o Orfennaf"
 
-#: tdecore/kcalendarsystemgregorian.cpp:170 tdecore/klocale.cpp:598
+#: tdecore/kcalendarsystemgregorian.cpp:170 tdecore/tdelocale.cpp:598
 msgid ""
 "_: of August\n"
 "of Aug"
 msgstr "o Awst"
 
-#: tdecore/kcalendarsystemgregorian.cpp:172 tdecore/klocale.cpp:599
+#: tdecore/kcalendarsystemgregorian.cpp:172 tdecore/tdelocale.cpp:599
 msgid ""
 "_: of September\n"
 "of Sep"
 msgstr "o Fedi"
 
-#: tdecore/kcalendarsystemgregorian.cpp:174 tdecore/klocale.cpp:600
+#: tdecore/kcalendarsystemgregorian.cpp:174 tdecore/tdelocale.cpp:600
 msgid ""
 "_: of October\n"
 "of Oct"
 msgstr "o Hydref"
 
-#: tdecore/kcalendarsystemgregorian.cpp:176 tdecore/klocale.cpp:601
+#: tdecore/kcalendarsystemgregorian.cpp:176 tdecore/tdelocale.cpp:601
 msgid ""
 "_: of November\n"
 "of Nov"
 msgstr "o Dachwedd"
 
-#: tdecore/kcalendarsystemgregorian.cpp:178 tdecore/klocale.cpp:602
+#: tdecore/kcalendarsystemgregorian.cpp:178 tdecore/tdelocale.cpp:602
 msgid ""
 "_: of December\n"
 "of Dec"
 msgstr "o Ragfyr"
 
-#: tdecore/kcalendarsystemgregorian.cpp:184 tdecore/klocale.cpp:607
+#: tdecore/kcalendarsystemgregorian.cpp:184 tdecore/tdelocale.cpp:607
 msgid "of January"
 msgstr "o Ionawr"
 
-#: tdecore/kcalendarsystemgregorian.cpp:186 tdecore/klocale.cpp:608
+#: tdecore/kcalendarsystemgregorian.cpp:186 tdecore/tdelocale.cpp:608
 msgid "of February"
 msgstr "o Chwefror"
 
-#: tdecore/kcalendarsystemgregorian.cpp:188 tdecore/klocale.cpp:609
+#: tdecore/kcalendarsystemgregorian.cpp:188 tdecore/tdelocale.cpp:609
 msgid "of March"
 msgstr "o Fawrth"
 
-#: tdecore/kcalendarsystemgregorian.cpp:190 tdecore/klocale.cpp:610
+#: tdecore/kcalendarsystemgregorian.cpp:190 tdecore/tdelocale.cpp:610
 msgid "of April"
 msgstr "o Ebrill"
 
-#: tdecore/kcalendarsystemgregorian.cpp:192 tdecore/klocale.cpp:611
+#: tdecore/kcalendarsystemgregorian.cpp:192 tdecore/tdelocale.cpp:611
 msgid ""
 "_: of May long\n"
 "of May"
 msgstr "o Fai"
 
-#: tdecore/kcalendarsystemgregorian.cpp:194 tdecore/klocale.cpp:612
+#: tdecore/kcalendarsystemgregorian.cpp:194 tdecore/tdelocale.cpp:612
 msgid "of June"
 msgstr "o Fehefin"
 
-#: tdecore/kcalendarsystemgregorian.cpp:196 tdecore/klocale.cpp:613
+#: tdecore/kcalendarsystemgregorian.cpp:196 tdecore/tdelocale.cpp:613
 msgid "of July"
 msgstr "o Orfennaf"
 
-#: tdecore/kcalendarsystemgregorian.cpp:198 tdecore/klocale.cpp:614
+#: tdecore/kcalendarsystemgregorian.cpp:198 tdecore/tdelocale.cpp:614
 msgid "of August"
 msgstr "o Awst"
 
-#: tdecore/kcalendarsystemgregorian.cpp:200 tdecore/klocale.cpp:615
+#: tdecore/kcalendarsystemgregorian.cpp:200 tdecore/tdelocale.cpp:615
 msgid "of September"
 msgstr "o Fedi"
 
-#: tdecore/kcalendarsystemgregorian.cpp:202 tdecore/klocale.cpp:616
+#: tdecore/kcalendarsystemgregorian.cpp:202 tdecore/tdelocale.cpp:616
 msgid "of October"
 msgstr "o Hydref"
 
-#: tdecore/kcalendarsystemgregorian.cpp:204 tdecore/klocale.cpp:617
+#: tdecore/kcalendarsystemgregorian.cpp:204 tdecore/tdelocale.cpp:617
 msgid "of November"
 msgstr "o Dachwedd"
 
-#: tdecore/kcalendarsystemgregorian.cpp:206 tdecore/klocale.cpp:618
+#: tdecore/kcalendarsystemgregorian.cpp:206 tdecore/tdelocale.cpp:618
 msgid "of December"
 msgstr "o Ragfyr"
 
-#: tdecore/klocale.cpp:1773 tdecore/klocale.cpp:1913
+#: tdecore/tdelocale.cpp:1773 tdecore/tdelocale.cpp:1913
 msgid "pm"
 msgstr "yp"
 
-#: tdecore/klocale.cpp:1782 tdecore/klocale.cpp:1915
+#: tdecore/tdelocale.cpp:1782 tdecore/tdelocale.cpp:1915
 msgid "am"
 msgstr "yb"
 
-#: tdecore/klocale.cpp:1956
+#: tdecore/tdelocale.cpp:1956
 msgid ""
 "_: concatenation of dates and time\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: tdecore/klocale.cpp:2447
+#: tdecore/tdelocale.cpp:2447
 msgid "&Next"
 msgstr "&Nesaf"
 
@@ -4063,15 +4063,15 @@ msgstr "Ategion"
 msgid "Front"
 msgstr "Ffront"
 
-#: tdecore/kcharsets.cpp:44 khtml/khtml_part.cpp:280
+#: tdecore/kcharsets.cpp:44 tdehtml/tdehtml_part.cpp:280
 msgid "Arabic"
 msgstr "Arabaidd"
 
-#: tdecore/kcharsets.cpp:45 khtml/khtml_part.cpp:281
+#: tdecore/kcharsets.cpp:45 tdehtml/tdehtml_part.cpp:281
 msgid "Baltic"
 msgstr "Baltig"
 
-#: tdecore/kcharsets.cpp:46 khtml/khtml_part.cpp:282
+#: tdecore/kcharsets.cpp:46 tdehtml/tdehtml_part.cpp:282
 msgid "Central European"
 msgstr "Canol Ewrop"
 
@@ -4087,16 +4087,16 @@ msgstr "Tsieineeg Traddodiadol"
 msgid "Cyrillic"
 msgstr "Cyrilig"
 
-#: tdecore/kcharsets.cpp:50 khtml/khtml_part.cpp:284
+#: tdecore/kcharsets.cpp:50 tdehtml/tdehtml_part.cpp:284
 msgid "Greek"
 msgstr "Groeg"
 
 #: tdecore/kcharsets.cpp:51 tdeui/ksconfig.cpp:235 tdeui/ksconfig.cpp:395
-#: tdeui/ksconfig.cpp:656 khtml/khtml_part.cpp:285
+#: tdeui/ksconfig.cpp:656 tdehtml/tdehtml_part.cpp:285
 msgid "Hebrew"
 msgstr "Hebraeg"
 
-#: tdecore/kcharsets.cpp:52 khtml/khtml_part.cpp:286
+#: tdecore/kcharsets.cpp:52 tdehtml/tdehtml_part.cpp:286
 msgid "Japanese"
 msgstr "Siapaneeg"
 
@@ -4109,11 +4109,11 @@ msgid "Thai"
 msgstr "Taieg"
 
 #: tdecore/kcharsets.cpp:55 tdeui/ksconfig.cpp:240 tdeui/ksconfig.cpp:400
-#: tdeui/ksconfig.cpp:661 khtml/khtml_part.cpp:290
+#: tdeui/ksconfig.cpp:661 tdehtml/tdehtml_part.cpp:290
 msgid "Turkish"
 msgstr "Twrceg"
 
-#: tdecore/kcharsets.cpp:56 khtml/khtml_part.cpp:293
+#: tdecore/kcharsets.cpp:56 tdehtml/tdehtml_part.cpp:293
 msgid "Western European"
 msgstr "Gorllewin Ewrop"
 
@@ -4144,7 +4144,7 @@ msgid ""
 "%1 ( %2 )"
 msgstr "%1 ( %2 )"
 
-#: tdecore/kglobalsettings.cpp:494
+#: tdecore/tdeglobalsettings.cpp:494
 msgid "Trash"
 msgstr "Sbwriel"
 
@@ -4226,7 +4226,7 @@ msgstr "Adar I"
 msgid "Adar II"
 msgstr "Adar II"
 
-#: tdecore/kaboutdata.cpp:388
+#: tdecore/tdeaboutdata.cpp:388
 #, fuzzy
 msgid ""
 "_: replace this with information about your translation team\n"
@@ -4241,7 +4241,7 @@ msgstr ""
 "http://i18n.kde.org.</p>Am ragor o wybodaeth ar TDE a meddalwedd rhydd yn "
 "Gymraeg, ewch i http://www.kyfieithu.co.uk</p>"
 
-#: tdecore/kaboutdata.cpp:444
+#: tdecore/tdeaboutdata.cpp:444
 msgid ""
 "No licensing terms for this program have been specified.\n"
 "Please check the documentation or the source for any\n"
@@ -4251,7 +4251,7 @@ msgstr ""
 "Gwiriwch y ddogfeniaeth neu'r côd am unrhyw dermau \n"
 "trwyddedu.\n"
 
-#: tdecore/kaboutdata.cpp:451
+#: tdecore/tdeaboutdata.cpp:451
 #, c-format
 msgid "This program is distributed under the terms of the %1."
 msgstr "Dosbarthir y rhaglen yma dan dermau'r %1."
@@ -4306,23 +4306,23 @@ msgstr "dibynnydd NEC SOCKS"
 msgid "Dante SOCKS client"
 msgstr "dibynnydd Dante SOCKS"
 
-#: tdecore/kconfig_compiler/kconfig_compiler.cpp:45
+#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:45
 msgid "Directory to generate files in"
 msgstr "Cyfeiriadur i greu ffeiliau ynddo"
 
-#: tdecore/kconfig_compiler/kconfig_compiler.cpp:46
+#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:46
 msgid "Input kcfg XML file"
 msgstr "Mewnosod ffeil XML kcfg"
 
-#: tdecore/kconfig_compiler/kconfig_compiler.cpp:47
+#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:47
 msgid "Code generation options file"
 msgstr "Ffeil ddewisiadau am greu côd"
 
-#: tdecore/kconfig_compiler/kconfig_compiler.cpp:955
+#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:955
 msgid "TDE .kcfg compiler"
 msgstr "Crynhoydd .kcfg TDE"
 
-#: tdecore/kconfig_compiler/kconfig_compiler.cpp:956
+#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:956
 msgid "TDEConfig Compiler"
 msgstr "Crynhoydd TDEConfig"
 
@@ -4469,7 +4469,7 @@ msgid "Share Hot New Stuff"
 msgstr "Rhannu y Diweddaraf"
 
 #: tdeui/kcolordialog.cpp:1133 knewstuff/uploaddialog.cpp:58
-#: kresources/configdialog.cpp:53
+#: tderesources/configdialog.cpp:53
 msgid "Name:"
 msgstr "Enw:"
 
@@ -4539,7 +4539,7 @@ msgstr ""
 msgid "The file '%1' already exists. Do you want to overwrite it?"
 msgstr "Mae'r ffeil '%1' mewn bod eisoes.  Ydych eisiau ysgrifennu drosto?"
 
-#: khtml/khtml_ext.cpp:828 knewstuff/knewstuffgeneric.cpp:141
+#: tdehtml/tdehtml_ext.cpp:828 knewstuff/knewstuffgeneric.cpp:141
 msgid "Overwrite"
 msgstr " Dros-ysgrifennu"
 
@@ -4589,7 +4589,7 @@ msgstr "Dyddiad Rhyddháu"
 msgid "Install"
 msgstr "Arsefydlu"
 
-#: tdeui/kmessagebox.cpp:246 knewstuff/downloaddialog.cpp:295
+#: tdeui/tdemessagebox.cpp:246 knewstuff/downloaddialog.cpp:295
 #: knewstuff/downloaddialog.cpp:505
 msgid "Details"
 msgstr " Manylion"
@@ -4832,11 +4832,11 @@ msgstr ""
 msgid "Get hot new stuff:"
 msgstr "Nôl y diweddaraf:"
 
-#: knewstuff/khotnewstuff.cpp:31
+#: knewstuff/tdehotnewstuff.cpp:31
 msgid "Display only media of this type"
 msgstr "Arddangos cyfryngau o'r math yma yn unig"
 
-#: knewstuff/khotnewstuff.cpp:32
+#: knewstuff/tdehotnewstuff.cpp:32
 msgid "Provider list to use"
 msgstr "Rhestr darparwyr i'w defnyddio"
 
@@ -5157,7 +5157,7 @@ msgstr "Norwyeg"
 msgid "Polish"
 msgstr "Pwyleg"
 
-#: tdeui/ksconfig.cpp:324 khtml/khtml_part.cpp:288
+#: tdeui/ksconfig.cpp:324 tdehtml/tdehtml_part.cpp:288
 msgid "Russian"
 msgstr "Rwsieg"
 
@@ -5181,7 +5181,7 @@ msgstr "Swedeg"
 msgid "Swiss German"
 msgstr "Almaeneg y Swistir"
 
-#: tdeui/ksconfig.cpp:342 khtml/khtml_part.cpp:291
+#: tdeui/ksconfig.cpp:342 tdehtml/tdehtml_part.cpp:291
 msgid "Ukrainian"
 msgstr "Wcraneg"
 
@@ -5228,19 +5228,19 @@ msgid ""
 "Default - %1"
 msgstr "Rhagosodiad - %1"
 
-#: tdeui/kfontrequester.cpp:38
+#: tdeui/tdefontrequester.cpp:38
 msgid "Choose..."
 msgstr "Dewis..."
 
-#: tdeui/kfontrequester.cpp:102
+#: tdeui/tdefontrequester.cpp:102
 msgid "Click to select a font"
 msgstr "Cliciwch i ddewis wynebfath"
 
-#: tdeui/kfontrequester.cpp:109
+#: tdeui/tdefontrequester.cpp:109
 msgid "Preview of the selected font"
 msgstr "Rhagolwg y r wynebfath penodol"
 
-#: tdeui/kfontrequester.cpp:111
+#: tdeui/tdefontrequester.cpp:111
 msgid ""
 "This is a preview of the selected font. You can change it by clicking the "
 "\"Choose...\" button."
@@ -5248,11 +5248,11 @@ msgstr ""
 "Mae hyn yn rhagolwg yr wynebfath penodol.  Cewch ei newid gan glicio'r botwm "
 "\"Dewis...\"."
 
-#: tdeui/kfontrequester.cpp:117
+#: tdeui/tdefontrequester.cpp:117
 msgid "Preview of the \"%1\" font"
 msgstr "Rhagolwg y font \"%1\""
 
-#: tdeui/kfontrequester.cpp:119
+#: tdeui/tdefontrequester.cpp:119
 msgid ""
 "This is a preview of the \"%1\" font. You can change it by clicking the "
 "\"Choose...\" button."
@@ -5261,11 +5261,11 @@ msgstr ""
 "\"Dewis...\"."
 
 #. i18n "??" is displayed as (pseudo-)version when no data is known about the application
-#: tdeui/kaboutapplication.cpp:63
+#: tdeui/tdeaboutapplication.cpp:63
 msgid "??"
 msgstr "??"
 
-#: tdeui/kaboutapplication.cpp:67
+#: tdeui/tdeaboutapplication.cpp:67
 msgid ""
 "No information available.\n"
 "The supplied TDEAboutData object does not exist."
@@ -5273,15 +5273,15 @@ msgstr ""
 "Dim gwybodaeth ar gael. \n"
 " Nid ydy'r gwrthrych TDEAboutData a ddarparwyd ddim yn bodoli."
 
-#: tdeui/kaboutapplication.cpp:107
+#: tdeui/tdeaboutapplication.cpp:107
 msgid "A&uthor"
 msgstr "A&wdur"
 
-#: tdeui/kaboutapplication.cpp:107
+#: tdeui/tdeaboutapplication.cpp:107
 msgid "A&uthors"
 msgstr "A&wduron"
 
-#: tdeui/kaboutapplication.cpp:117
+#: tdeui/tdeaboutapplication.cpp:117
 #, fuzzy
 msgid ""
 "Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> "
@@ -5290,7 +5290,7 @@ msgstr ""
 "Defnyddiwch <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> "
 "er mwyn adrodd namau; peidiwch ac anfon ebost i'r awduron yn uniongyrchol."
 
-#: tdeui/kaboutapplication.cpp:121 tdeui/kaboutapplication.cpp:124
+#: tdeui/tdeaboutapplication.cpp:121 tdeui/tdeaboutapplication.cpp:124
 #, fuzzy
 msgid ""
 "Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
@@ -5298,106 +5298,106 @@ msgstr ""
 "Defnyddiwch <a href=\"mailto:%1\">%1</a> er mwyn adrodd namau; peidiwch ac "
 "anfon ebost i'r awduron yn uniongyrchol.\n"
 
-#: tdeui/kaboutapplication.cpp:149
+#: tdeui/tdeaboutapplication.cpp:149
 msgid "&Thanks To"
 msgstr "&Diolch i"
 
-#: tdeui/kaboutapplication.cpp:176
+#: tdeui/tdeaboutapplication.cpp:176
 msgid "T&ranslation"
 msgstr "C&yfieithiad"
 
-#: tdeui/kaboutapplication.cpp:181
+#: tdeui/tdeaboutapplication.cpp:181
 msgid "&License Agreement"
 msgstr "Cytundeb &Trwydded"
 
-#: tdeui/kfontdialog.cpp:101
+#: tdeui/tdefontdialog.cpp:101
 msgid "Here you can choose the font to be used."
 msgstr "Yma y dewisir yr wynebfath a ddefnyddir."
 
-#: tdeui/kfontdialog.cpp:113
+#: tdeui/tdefontdialog.cpp:113
 msgid "Requested Font"
 msgstr "Wynebfath a Ddymunwyd"
 
-#: tdeui/kfontdialog.cpp:136
+#: tdeui/tdefontdialog.cpp:136
 msgid "Change font family?"
 msgstr "Newid y teulu wynebfath?"
 
-#: tdeui/kfontdialog.cpp:138
+#: tdeui/tdefontdialog.cpp:138
 msgid "Enable this checkbox to change the font family settings."
 msgstr "Alluogi'r blwch britho yma er mwyn newid gosodiadau'r teulu wynebfath."
 
-#: tdeui/kcharselect.cpp:383 tdeui/kfontdialog.cpp:144
+#: tdeui/kcharselect.cpp:383 tdeui/tdefontdialog.cpp:144
 msgid "Font:"
 msgstr "Wynebfath:"
 
-#: tdeui/kfontdialog.cpp:151
+#: tdeui/tdefontdialog.cpp:151
 msgid "Font style"
 msgstr "Ardull wynebfath"
 
-#: tdeui/kfontdialog.cpp:155
+#: tdeui/tdefontdialog.cpp:155
 msgid "Change font style?"
 msgstr "Newid ardull wynebfath?"
 
-#: tdeui/kfontdialog.cpp:157
+#: tdeui/tdefontdialog.cpp:157
 msgid "Enable this checkbox to change the font style settings."
 msgstr ""
 "Alluogi'r blwch britho yma er mwyn newid gosodiadau'r arddull wynebfath."
 
-#: tdeui/kfontdialog.cpp:163
+#: tdeui/tdefontdialog.cpp:163
 msgid "Font style:"
 msgstr "Ardull wynebfath:"
 
-#: tdeui/kfontdialog.cpp:171
+#: tdeui/tdefontdialog.cpp:171
 msgid "Size"
 msgstr "Maint"
 
-#: tdeui/kfontdialog.cpp:175
+#: tdeui/tdefontdialog.cpp:175
 msgid "Change font size?"
 msgstr "Newid maint yr wynebfath?"
 
-#: tdeui/kfontdialog.cpp:177
+#: tdeui/tdefontdialog.cpp:177
 msgid "Enable this checkbox to change the font size settings."
 msgstr ""
 "Alluogi'r blwch britho yma er mwyn newid gosodiadau maint yr wynebfath."
 
-#: tdeui/kfontdialog.cpp:183
+#: tdeui/tdefontdialog.cpp:183
 msgid "Size:"
 msgstr "Maint:"
 
-#: tdeui/kfontdialog.cpp:199
+#: tdeui/tdefontdialog.cpp:199
 msgid "Here you can choose the font family to be used."
 msgstr "Yma y dewisir y teulu wynebfath a ddefnyddir."
 
-#: tdeui/kfontdialog.cpp:221
+#: tdeui/tdefontdialog.cpp:221
 msgid "Here you can choose the font style to be used."
 msgstr "Yma y dewisir yr arddull wynebfath a ddefnyddir."
 
-#: tdeui/kfontdialog.cpp:224 tdeui/kfontdialog.cpp:473
-#: tdeui/kfontdialog.cpp:475 tdeui/kfontdialog.cpp:484
-#: tdeui/kfontdialog.cpp:485
+#: tdeui/tdefontdialog.cpp:224 tdeui/tdefontdialog.cpp:473
+#: tdeui/tdefontdialog.cpp:475 tdeui/tdefontdialog.cpp:484
+#: tdeui/tdefontdialog.cpp:485
 msgid "Regular"
 msgstr "Cyffredin"
 
-#: tdeui/kfontdialog.cpp:226
+#: tdeui/tdefontdialog.cpp:226
 msgid "Bold"
 msgstr "Trwm"
 
-#: tdeui/kfontdialog.cpp:227
+#: tdeui/tdefontdialog.cpp:227
 msgid "Bold Italic"
 msgstr "Trwm Italig"
 
-#: tdeui/kfontdialog.cpp:244
+#: tdeui/tdefontdialog.cpp:244
 msgid "Relative"
 msgstr " Cymharol"
 
-#: tdeui/kfontdialog.cpp:246
+#: tdeui/tdefontdialog.cpp:246
 msgid "Font size<br><i>fixed</i> or <i>relative</i><br>to environment"
 msgstr ""
 "Mae maint yr wynebfath yn "
 "<br><i>osodedig</i> neu <i>gymharol</i>"
 "<br> i'r amgylchedd"
 
-#: tdeui/kfontdialog.cpp:248
+#: tdeui/tdefontdialog.cpp:248
 msgid ""
 "Here you can switch between fixed font size and font size to be calculated "
 "dynamically and adjusted to changing environment (e.g. widget dimensions, paper "
@@ -5407,16 +5407,16 @@ msgstr ""
 "chyfrifir yn ddinamig ac a  addasir i amgychedd sy'n newid (e.e. dimensiynau'r "
 "celfigyn, maint y papur)."
 
-#: tdeui/kfontdialog.cpp:272
+#: tdeui/tdefontdialog.cpp:272
 msgid "Here you can choose the font size to be used."
 msgstr "Yma y dewisir maint yr wynebfath a ddefnyddir."
 
 #. i18n: This is a classical test phrase. (It contains all letters from A to Z.)
-#: tdeui/kfontdialog.cpp:296
+#: tdeui/tdefontdialog.cpp:296
 msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
 msgstr "Duw a'm gwaredo, ni allaf ddianc rhag hon"
 
-#: tdeui/kfontdialog.cpp:301
+#: tdeui/tdefontdialog.cpp:301
 msgid ""
 "This sample text illustrates the current settings. You may edit it to test "
 "special characters."
@@ -5424,15 +5424,15 @@ msgstr ""
 "Mae'r testun engraifft yma yn dangos y gosodiadau cyfredol. Cewch ei golygu er "
 "mwyn arbrofi llythrennau arbennig."
 
-#: tdeui/kfontdialog.cpp:310 tdeui/kfontdialog.cpp:320
+#: tdeui/tdefontdialog.cpp:310 tdeui/tdefontdialog.cpp:320
 msgid "Actual Font"
 msgstr "Gwir Wynebfath"
 
-#: tdeui/kactionselector.cpp:69
+#: tdeui/tdeactionselector.cpp:69
 msgid "&Available:"
 msgstr "&Ar gael:"
 
-#: tdeui/kactionselector.cpp:84
+#: tdeui/tdeactionselector.cpp:84
 msgid "&Selected:"
 msgstr "&Wedi'u dewis:"
 
@@ -5457,18 +5457,18 @@ msgstr "Tabl:"
 msgid "&Unicode code point:"
 msgstr "Pwynt nod &Unicode:"
 
-#: tdeui/kmessagebox.cpp:428 tdeui/kmessagebox.cpp:479
+#: tdeui/tdemessagebox.cpp:428 tdeui/tdemessagebox.cpp:479
 msgid "Question"
 msgstr "Cwestiwn"
 
-#: tdeui/kmessagebox.cpp:442 tdeui/kmessagebox.cpp:494
-#: tdeui/kmessagebox.cpp:575 tdeui/kmessagebox.cpp:647
-#: tdeui/kmessagebox.cpp:723
+#: tdeui/tdemessagebox.cpp:442 tdeui/tdemessagebox.cpp:494
+#: tdeui/tdemessagebox.cpp:575 tdeui/tdemessagebox.cpp:647
+#: tdeui/tdemessagebox.cpp:723
 msgid "Do not ask again"
 msgstr "Peidiwch a gofyn eto"
 
-#: tdeui/kaboutdialog.cpp:1535 tdeui/khelpmenu.cpp:227
-#: tdeui/kmessagebox.cpp:975
+#: tdeui/tdeaboutdialog.cpp:1535 tdeui/khelpmenu.cpp:227
+#: tdeui/tdemessagebox.cpp:975
 #, c-format
 msgid "About %1"
 msgstr "Ynglyn â %1"
@@ -5493,7 +5493,7 @@ msgstr "Awtomatig Byr"
 msgid "Dropdown List && Automatic"
 msgstr "Rhestr Cwymplen && Ymysgogol"
 
-#: tdeui/kaboutkde.cpp:34
+#: tdeui/tdeabouttde.cpp:34
 #, fuzzy
 msgid ""
 "The <b>K Desktop Environment</b> is written and maintained by the TDE Team, a "
@@ -5517,7 +5517,7 @@ msgstr ""
 "<br>Ewch i <A HREF=\"http://www.kde.org/\">http://www.kde.org</A>"
 "am fwy o fanylion am y cywaith TDE."
 
-#: tdeui/kaboutkde.cpp:43
+#: tdeui/tdeabouttde.cpp:43
 msgid ""
 "Software can always be improved, and the TDE Team is ready to do so. However, "
 "you - the user - must tell us when something does not work as expected or could "
@@ -5544,7 +5544,7 @@ msgstr ""
 "dilyn namau i cofnodi eich dymuniad. Cofiwch defnyddio'r llymder \"Rhestr "
 "dymuniadau\"."
 
-#: tdeui/kaboutkde.cpp:54
+#: tdeui/tdeabouttde.cpp:54
 msgid ""
 "You do not have to be a software developer to be a member of the TDE team. You "
 "can join the national teams that translate program interfaces. You can provide "
@@ -5570,7 +5570,7 @@ msgstr ""
 "HREF=\"http://developer.kde.org/\">http://developer.kde.org</A> "
 "i gael popeth sydd angen."
 
-#: tdeui/kaboutkde.cpp:67
+#: tdeui/tdeabouttde.cpp:67
 msgid ""
 "TDE is available free of charge, but making it is not free."
 "<br>"
@@ -5603,34 +5603,34 @@ msgstr ""
 "<br>"
 "<br>Diolch yn fawr iawn i chi ymlaen llaw am eich cefnogaeth. "
 
-#: tdeui/kaboutkde.cpp:81
+#: tdeui/tdeabouttde.cpp:81
 #, c-format
 msgid "K Desktop Environment. Release %1"
 msgstr "Amgylchedd Penbwrdd TDE.  Rhyddhad %1"
 
-#: tdeui/kaboutkde.cpp:83
+#: tdeui/tdeabouttde.cpp:83
 msgid ""
 "_: About TDE\n"
 "&About"
 msgstr "&Ynghylch"
 
-#: tdeui/kaboutkde.cpp:84
+#: tdeui/tdeabouttde.cpp:84
 msgid "&Report Bugs or Wishes"
 msgstr "&Adrodd Namau neu Dymuniadau"
 
-#: tdeui/kaboutkde.cpp:85
+#: tdeui/tdeabouttde.cpp:85
 msgid "&Join the TDE Team"
 msgstr "&Ymaelodi a'r tîm TDE"
 
-#: tdeui/kaboutkde.cpp:86
+#: tdeui/tdeabouttde.cpp:86
 msgid "&Support TDE"
 msgstr "&Cefnogi TDE"
 
-#: tdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804
+#: tdeui/kstdguiitem.cpp:110 tdehtml/java/kjavaappletserver.cpp:804
 msgid "&Yes"
 msgstr "&Ie"
 
-#: tdeui/kstdguiitem.cpp:115 khtml/java/kjavaappletserver.cpp:797
+#: tdeui/kstdguiitem.cpp:115 tdehtml/java/kjavaappletserver.cpp:797
 msgid "&No"
 msgstr "&Nage"
 
@@ -5785,7 +5785,7 @@ msgid "Confi&gure..."
 msgstr "Ffurf&weddu..."
 
 #: tdeui/keditcl2.cpp:701 tdeui/keditcl2.cpp:833 tdeui/kstdguiitem.cpp:254
-#: kutils/kfinddialog.cpp:239
+#: tdeutils/kfinddialog.cpp:239
 msgid "&Find"
 msgstr "&Canfod"
 
@@ -5832,15 +5832,15 @@ msgstr "Analluogir golygu"
 msgid "Editing enabled"
 msgstr "Alluogir golygu"
 
-#: tdeui/ktoolbarhandler.cpp:86
+#: tdeui/tdetoolbarhandler.cpp:86
 msgid "Show Toolbar"
 msgstr "Dangos Bar Offer"
 
-#: tdeui/ktoolbarhandler.cpp:87
+#: tdeui/tdetoolbarhandler.cpp:87
 msgid "Hide Toolbar"
 msgstr "Cuddio Bar Offer"
 
-#: tdeui/ktoolbarhandler.cpp:91
+#: tdeui/tdetoolbarhandler.cpp:91
 msgid "Toolbars"
 msgstr "Barrau Offer:"
 
@@ -5894,11 +5894,11 @@ msgstr ""
 "hoffech ein helpu ni gan ddisgrifio'r celfigyn, croeso i chi <a "
 "href=\"submit-whatsthis\">anfon cymorth \"Beth yw Hwn?\"</a> ar ei gyfer."
 
-#: tdeui/kshortcutdialog.cpp:68
+#: tdeui/tdeshortcutdialog.cpp:68
 msgid "Configure Shortcut"
 msgstr "Ffurfweddu Byrlwybr"
 
-#: tdeui/kshortcutdialog.cpp:71
+#: tdeui/tdeshortcutdialog.cpp:71
 msgid "Advanced"
 msgstr "Uwch"
 
@@ -5926,8 +5926,8 @@ msgstr ""
 msgid "Reset Toolbars"
 msgstr "Barrau Offer:"
 
-#: tdeui/kedittoolbar.cpp:447 khtml/html/html_formimpl.cpp:2129
-#: khtml/khtmlview.cpp:2541 khtml/khtmlview.cpp:2574
+#: tdeui/kedittoolbar.cpp:447 tdehtml/html/html_formimpl.cpp:2129
+#: tdehtml/tdehtmlview.cpp:2541 tdehtml/tdehtmlview.cpp:2574
 msgid "Reset"
 msgstr "Ail-osod"
 
@@ -6202,15 +6202,15 @@ msgstr ""
 msgid "Passwords match"
 msgstr "Mae'r cyfrineiriau yn cydweddu"
 
-#: tdeui/kspelldlg.cpp:53 kspell2/ui/dialog.cpp:62
+#: tdeui/tdespelldlg.cpp:53 tdespell2/ui/dialog.cpp:62
 msgid "Check Spelling"
 msgstr "Gwirio Sillafu"
 
-#: tdeui/kspelldlg.cpp:54 kspell2/ui/dialog.cpp:64
+#: tdeui/tdespelldlg.cpp:54 tdespell2/ui/dialog.cpp:64
 msgid "&Finished"
 msgstr "Wedi'i Orffe&n"
 
-#: tdeui/kcombobox.cpp:444 khtml/rendering/render_form.cpp:388
+#: tdeui/kcombobox.cpp:444 tdehtml/rendering/render_form.cpp:388
 msgid "Clear &History"
 msgstr "Gwaredu &Hanes"
 
@@ -6560,29 +6560,29 @@ msgstr "&Ynglyn a %1"
 msgid "About &TDE"
 msgstr "Ynglyn a &Kde"
 
-#: tdeui/kactionclasses.cpp:2072
+#: tdeui/tdeactionclasses.cpp:2072
 msgid "Exit F&ull Screen Mode"
 msgstr "Gadael &Modd Sgrîn Llawn"
 
-#: tdeui/kactionclasses.cpp:2077 tdeui/kstdaction_p.h:98
+#: tdeui/tdeactionclasses.cpp:2077 tdeui/kstdaction_p.h:98
 msgid "F&ull Screen Mode"
 msgstr "&Modd Sgrîn Llawn"
 
-#: tdeui/klistviewsearchline.cpp:243
+#: tdeui/tdelistviewsearchline.cpp:243
 msgid "Search Columns"
 msgstr "Chwilio Colofnau"
 
-#: tdeui/klistviewsearchline.cpp:245
+#: tdeui/tdelistviewsearchline.cpp:245
 msgid "All Visible Columns"
 msgstr "Pob Colofn Weledig"
 
-#: tdeui/klistviewsearchline.cpp:260
+#: tdeui/tdelistviewsearchline.cpp:260
 msgid ""
 "_: Column number %1\n"
 "Column No. %1"
 msgstr "Colofn %1"
 
-#: tdeui/klistviewsearchline.cpp:455
+#: tdeui/tdelistviewsearchline.cpp:455
 msgid "S&earch:"
 msgstr "C&hwilio"
 
@@ -6600,107 +6600,107 @@ msgstr ""
 msgid "&Show tips on startup"
 msgstr "&Dangos awgrymiadau wrth gychwyn"
 
-#: tdeui/ktoolbar.cpp:2040
+#: tdeui/tdetoolbar.cpp:2040
 msgid "Toolbar Menu"
 msgstr "Dewislen Bar Offer"
 
-#: tdeui/ktoolbar.cpp:2043
+#: tdeui/tdetoolbar.cpp:2043
 msgid ""
 "_: toolbar position string\n"
 "Top"
 msgstr " Top"
 
-#: tdeui/ktoolbar.cpp:2044
+#: tdeui/tdetoolbar.cpp:2044
 msgid ""
 "_: toolbar position string\n"
 "Left"
 msgstr "Chwith"
 
-#: tdeui/ktoolbar.cpp:2045
+#: tdeui/tdetoolbar.cpp:2045
 msgid ""
 "_: toolbar position string\n"
 "Right"
 msgstr "De"
 
-#: tdeui/ktoolbar.cpp:2046
+#: tdeui/tdetoolbar.cpp:2046
 msgid ""
 "_: toolbar position string\n"
 "Bottom"
 msgstr " Gwaelod"
 
-#: tdeui/ktoolbar.cpp:2048
+#: tdeui/tdetoolbar.cpp:2048
 msgid ""
 "_: toolbar position string\n"
 "Floating"
 msgstr "Arnofio"
 
-#: tdeui/ktoolbar.cpp:2049
+#: tdeui/tdetoolbar.cpp:2049
 msgid ""
 "_: min toolbar\n"
 "Flat"
 msgstr " Gwastad"
 
-#: tdeui/ktoolbar.cpp:2052
+#: tdeui/tdetoolbar.cpp:2052
 msgid "Icons Only"
 msgstr "Eiconau yn Unig"
 
-#: tdeui/ktoolbar.cpp:2053
+#: tdeui/tdetoolbar.cpp:2053
 msgid "Text Only"
 msgstr "Testun yn Unig"
 
-#: tdeui/ktoolbar.cpp:2054
+#: tdeui/tdetoolbar.cpp:2054
 msgid "Text Alongside Icons"
 msgstr "Testun wrth Ochr Eiconau"
 
-#: tdeui/ktoolbar.cpp:2055
+#: tdeui/tdetoolbar.cpp:2055
 msgid "Text Under Icons"
 msgstr "Testun dan Eiconau"
 
-#: tdeui/ktoolbar.cpp:2080 tdeui/ktoolbar.cpp:2101
+#: tdeui/tdetoolbar.cpp:2080 tdeui/tdetoolbar.cpp:2101
 msgid "Small (%1x%2)"
 msgstr "Bach (%1x%2)"
 
-#: tdeui/ktoolbar.cpp:2082 tdeui/ktoolbar.cpp:2103
+#: tdeui/tdetoolbar.cpp:2082 tdeui/tdetoolbar.cpp:2103
 msgid "Medium (%1x%2)"
 msgstr "Canol (%1x%2)"
 
-#: tdeui/ktoolbar.cpp:2084 tdeui/ktoolbar.cpp:2105
+#: tdeui/tdetoolbar.cpp:2084 tdeui/tdetoolbar.cpp:2105
 msgid "Large (%1x%2)"
 msgstr "Mawr (%1x%2)"
 
-#: tdeui/ktoolbar.cpp:2086 tdeui/ktoolbar.cpp:2107
+#: tdeui/tdetoolbar.cpp:2086 tdeui/tdetoolbar.cpp:2107
 msgid "Huge (%1x%2)"
 msgstr "Enfawr (%1x%2)"
 
-#: tdeui/ktoolbar.cpp:2118
+#: tdeui/tdetoolbar.cpp:2118
 msgid "Text Position"
 msgstr "Lleoliad Testun"
 
-#: tdeui/ktoolbar.cpp:2120
+#: tdeui/tdetoolbar.cpp:2120
 msgid "Icon Size"
 msgstr "Maint Eicon"
 
-#: tdeui/kaboutdialog.cpp:93
+#: tdeui/tdeaboutdialog.cpp:93
 msgid "Task"
 msgstr "Tasg"
 
-#: tdeui/kaboutdialog.cpp:704
+#: tdeui/tdeaboutdialog.cpp:704
 msgid "%1 %2 (Using TDE %3)"
 msgstr "%1 %2 (Defnyddio TDE %3)"
 
-#: tdeui/kaboutdialog.cpp:706
+#: tdeui/tdeaboutdialog.cpp:706
 msgid "%1 %2, %3"
 msgstr "%1 %2, %3"
 
-#: tdeui/kaboutdialog.cpp:1326
+#: tdeui/tdeaboutdialog.cpp:1326
 msgid "Other Contributors:"
 msgstr "Cyfrannwyr Eraill:"
 
-#: tdeui/kaboutdialog.cpp:1327
+#: tdeui/tdeaboutdialog.cpp:1327
 msgid "(No logo available)"
 msgstr "(dim logo ar gael)"
 
-#: tdeui/kaboutdialog.cpp:1772
+#: tdeui/tdeaboutdialog.cpp:1772
 msgid "Image missing"
 msgstr "Llun ar goll"
 
@@ -6736,7 +6736,7 @@ msgstr "Canfod:"
 msgid "Case &sensitive"
 msgstr "Mae llythrennau bras o &bwys"
 
-#: tdeui/keditcl2.cpp:730 tdeui/keditcl2.cpp:870 kutils/kfinddialog.cpp:171
+#: tdeui/keditcl2.cpp:730 tdeui/keditcl2.cpp:870 tdeutils/kfinddialog.cpp:171
 msgid "Find &backwards"
 msgstr "Canfod &yn ôl"
 
@@ -6780,15 +6780,15 @@ msgstr "Hunan-wirio Sillafu"
 msgid "Allow Tabulations"
 msgstr "Gadael Tablyddion"
 
-#: tdeui/ktextedit.cpp:353 khtml/rendering/render_form.cpp:331
+#: tdeui/ktextedit.cpp:353 tdehtml/rendering/render_form.cpp:331
 msgid "Spell Checking"
 msgstr "Cywiro Sillafu"
 
-#: tdeui/kspell.cpp:1176
+#: tdeui/tdespell.cpp:1176
 msgid "You have to restart the dialog for changes to take effect"
 msgstr "Rhaid i chi ailgychwyn yr ymgom i'r newidiadau gymryd effaith"
 
-#: tdeui/kspell.cpp:1402
+#: tdeui/tdespell.cpp:1402
 msgid "Spell Checker"
 msgstr "Cywirydd Sillafu"
 
@@ -6813,159 +6813,159 @@ msgstr "Dadwneud: %1"
 msgid "Redo: %1"
 msgstr "Ail-wneud: %1"
 
-#: khtml/khtmlimage.cpp:199
+#: tdehtml/tdehtmlimage.cpp:199
 msgid "%1 (%2 - %3x%4 Pixels)"
 msgstr "%1 (%2 - %3x%4 o Bicseli)"
 
-#: khtml/khtmlimage.cpp:201
+#: tdehtml/tdehtmlimage.cpp:201
 msgid "%1 - %2x%3 Pixels"
 msgstr "%1 - %2x%3 o Bicseli"
 
-#: khtml/khtmlimage.cpp:206
+#: tdehtml/tdehtmlimage.cpp:206
 msgid "%1 (%2x%3 Pixels)"
 msgstr "%1 (%2x%3 o Bicseli)"
 
-#: khtml/khtmlimage.cpp:208
+#: tdehtml/tdehtmlimage.cpp:208
 msgid "Image - %1x%2 Pixels"
 msgstr "Delwedd - %1x%2 o Bicseli"
 
-#: khtml/khtmlimage.cpp:214
+#: tdehtml/tdehtmlimage.cpp:214
 msgid "Done."
 msgstr "Wedi gorffen."
 
-#: khtml/khtml_ext.cpp:434
+#: tdehtml/tdehtml_ext.cpp:434
 msgid "&Copy Text"
 msgstr "&Copïo Testun"
 
-#: khtml/khtml_ext.cpp:480
+#: tdehtml/tdehtml_ext.cpp:480
 #, fuzzy
 msgid "Search for '%1' with %2"
 msgstr "Chwilio '%1' yn '%2'"
 
-#: khtml/khtml_ext.cpp:489
+#: tdehtml/tdehtml_ext.cpp:489
 #, fuzzy
 msgid "Search for '%1' with"
 msgstr "Chwilio '%1' yn '%2'"
 
-#: khtml/khtml_ext.cpp:518
+#: tdehtml/tdehtml_ext.cpp:518
 msgid "Open '%1'"
 msgstr "Agor '%1'"
 
-#: khtml/khtml_ext.cpp:525 khtml/khtml_ext.cpp:582
+#: tdehtml/tdehtml_ext.cpp:525 tdehtml/tdehtml_ext.cpp:582
 msgid "Stop Animations"
 msgstr "Atal Bywluniadau"
 
-#: khtml/khtml_ext.cpp:533
+#: tdehtml/tdehtml_ext.cpp:533
 msgid "Copy Email Address"
 msgstr "Copïo Cyfeiriad Ebost"
 
-#: khtml/khtml_ext.cpp:538
+#: tdehtml/tdehtml_ext.cpp:538
 msgid "&Save Link As..."
 msgstr "&Cadw Cyswllt Fel ..."
 
-#: khtml/khtml_ext.cpp:540
+#: tdehtml/tdehtml_ext.cpp:540
 msgid "Copy &Link Address"
 msgstr "Copïo Cyfeiriad C&yswllt"
 
-#: khtml/khtml_ext.cpp:550
+#: tdehtml/tdehtml_ext.cpp:550
 msgid "Open in New &Window"
 msgstr "Agor mewn &Ffenest Newydd"
 
-#: khtml/khtml_ext.cpp:552
+#: tdehtml/tdehtml_ext.cpp:552
 msgid "Open in &This Window"
 msgstr "Agor yn y Ffenest &Hon"
 
-#: khtml/khtml_ext.cpp:554
+#: tdehtml/tdehtml_ext.cpp:554
 msgid "Open in &New Tab"
 msgstr "Agor mewn Tab New&ydd"
 
-#: khtml/khtml_ext.cpp:556
+#: tdehtml/tdehtml_ext.cpp:556
 msgid "Reload Frame"
 msgstr "Ail-lwytho Ffrâm"
 
-#: khtml/khtml_ext.cpp:561
+#: tdehtml/tdehtml_ext.cpp:561
 #, fuzzy
 msgid "Block IFrame..."
 msgstr "Copïo Delwedd"
 
-#: khtml/khtml_ext.cpp:564 khtml/khtml_part.cpp:256
+#: tdehtml/tdehtml_ext.cpp:564 tdehtml/tdehtml_part.cpp:256
 msgid "View Frame Source"
 msgstr "Gweld Ffynhonell y Ffram"
 
-#: khtml/khtml_ext.cpp:566
+#: tdehtml/tdehtml_ext.cpp:566
 msgid "View Frame Information"
 msgstr "Gweld Gwybodaeth Ffrâm"
 
-#: khtml/khtml_ext.cpp:570 khtml/khtml_part.cpp:404
+#: tdehtml/tdehtml_ext.cpp:570 tdehtml/tdehtml_part.cpp:404
 msgid "Print Frame..."
 msgstr "Argraffu Ffrâm ..."
 
-#: khtml/khtml_ext.cpp:571 khtml/khtml_part.cpp:262
+#: tdehtml/tdehtml_ext.cpp:571 tdehtml/tdehtml_part.cpp:262
 msgid "Save &Frame As..."
 msgstr "Cadw &Ffram Fel ..."
 
-#: khtml/khtml_ext.cpp:601
+#: tdehtml/tdehtml_ext.cpp:601
 msgid "Save Image As..."
 msgstr "Cadw Delwedd Fel ..."
 
-#: khtml/khtml_ext.cpp:603
+#: tdehtml/tdehtml_ext.cpp:603
 msgid "Send Image..."
 msgstr "Anfon Delwedd ..."
 
-#: khtml/khtml_ext.cpp:608
+#: tdehtml/tdehtml_ext.cpp:608
 msgid "Copy Image"
 msgstr "Copïo Delwedd"
 
-#: khtml/khtml_ext.cpp:613
+#: tdehtml/tdehtml_ext.cpp:613
 msgid "Copy Image Location"
 msgstr "Copïo Lleoliad Delwedd"
 
-#: khtml/khtml_ext.cpp:618
+#: tdehtml/tdehtml_ext.cpp:618
 msgid "View Image (%1)"
 msgstr "Gweld Delwedd (%1)"
 
-#: khtml/khtml_ext.cpp:623
+#: tdehtml/tdehtml_ext.cpp:623
 #, fuzzy
 msgid "Block Image..."
 msgstr "Copïo Delwedd"
 
-#: khtml/khtml_ext.cpp:629
+#: tdehtml/tdehtml_ext.cpp:629
 #, c-format
 msgid "Block Images From %1"
 msgstr ""
 
-#: khtml/khtml_ext.cpp:653
+#: tdehtml/tdehtml_ext.cpp:653
 msgid "Save Link As"
 msgstr "Cadw Cyswllt Fel"
 
-#: khtml/khtml_ext.cpp:673
+#: tdehtml/tdehtml_ext.cpp:673
 msgid "Save Image As"
 msgstr "Cadw Delwedd Fel"
 
-#: khtml/khtml_ext.cpp:687 khtml/khtml_ext.cpp:700
+#: tdehtml/tdehtml_ext.cpp:687 tdehtml/tdehtml_ext.cpp:700
 msgid "Add URL to Filter"
 msgstr ""
 
-#: khtml/khtml_ext.cpp:688 khtml/khtml_ext.cpp:701
+#: tdehtml/tdehtml_ext.cpp:688 tdehtml/tdehtml_ext.cpp:701
 msgid "Enter the URL:"
 msgstr ""
 
-#: khtml/khtml_ext.cpp:828
+#: tdehtml/tdehtml_ext.cpp:828
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
 msgstr ""
 "Mae ffeil o'r enw \"%1\" yn bodoli yn barod. Ydych chi'n sicr yr ydych eisiau "
 "sgrifennu drosto?"
 
-#: khtml/khtml_ext.cpp:828
+#: tdehtml/tdehtml_ext.cpp:828
 msgid "Overwrite File?"
 msgstr "Ysgrifennu dros y Ffeil?"
 
-#: khtml/khtml_ext.cpp:889 kparts/browserrun.cpp:390
+#: tdehtml/tdehtml_ext.cpp:889 tdeparts/browserrun.cpp:390
 msgid "The Download Manager (%1) could not be found in your $PATH "
 msgstr "Methu canfod y Rheolydd Lawrlwytho (%1) yn eich $PATH"
 
-#: khtml/khtml_ext.cpp:890 kparts/browserrun.cpp:391
+#: tdehtml/tdehtml_ext.cpp:890 tdeparts/browserrun.cpp:391
 msgid ""
 "Try to reinstall it  \n"
 "\n"
@@ -6975,17 +6975,17 @@ msgstr ""
 "\n"
 " Analluogir yr integreiddio efo Konqueror!"
 
-#: khtml/khtml_ext.cpp:983
+#: tdehtml/tdehtml_ext.cpp:983
 #, no-c-format
 msgid "Default Font Size (100%)"
 msgstr "Maint yr Wynebfath Rhagosodol (100%)"
 
-#: khtml/khtml_ext.cpp:996
+#: tdehtml/tdehtml_ext.cpp:996
 #, no-c-format
 msgid "%1%"
 msgstr "%1%"
 
-#: khtml/khtml_printsettings.cpp:31
+#: tdehtml/tdehtml_printsettings.cpp:31
 msgid ""
 "<qt>"
 "<p><strong>'Print images'</strong></p>"
@@ -6996,7 +6996,7 @@ msgid ""
 "or toner.</p> </qt>"
 msgstr ""
 
-#: khtml/khtml_printsettings.cpp:43
+#: tdehtml/tdehtml_printsettings.cpp:43
 msgid ""
 "<qt>"
 "<p><strong>'Print header'</strong></p>"
@@ -7007,7 +7007,7 @@ msgid ""
 "contain such a header line.</p> </qt>"
 msgstr ""
 
-#: khtml/khtml_printsettings.cpp:56
+#: tdehtml/tdehtml_printsettings.cpp:56
 msgid ""
 "<qt>"
 "<p><strong>'Printerfriendly mode'</strong></p>"
@@ -7021,39 +7021,39 @@ msgid ""
 "ink.</p> </qt>"
 msgstr ""
 
-#: khtml/khtml_printsettings.cpp:71
+#: tdehtml/tdehtml_printsettings.cpp:71
 msgid "HTML Settings"
 msgstr "Gosodiadau HTML"
 
-#: khtml/khtml_printsettings.cpp:73
+#: tdehtml/tdehtml_printsettings.cpp:73
 msgid "Printer friendly mode (black text, no background)"
 msgstr "Modd sy'n gyfeillgar i argraffyddion (testun du, dim cefndir)"
 
-#: khtml/khtml_printsettings.cpp:76
+#: tdehtml/tdehtml_printsettings.cpp:76
 msgid "Print images"
 msgstr "Argraffu delweddau"
 
-#: khtml/khtml_printsettings.cpp:79
+#: tdehtml/tdehtml_printsettings.cpp:79
 msgid "Print header"
 msgstr "Pennawd argraffydd"
 
-#: khtml/khtml_part.cpp:255
+#: tdehtml/tdehtml_part.cpp:255
 msgid "View Do&cument Source"
 msgstr "Gweld Côd Ta&rddiad y Ddogfen"
 
-#: khtml/khtml_part.cpp:257
+#: tdehtml/tdehtml_part.cpp:257
 msgid "View Document Information"
 msgstr "Gweld Gwybodaeth y Ddogfen"
 
-#: khtml/khtml_part.cpp:258
+#: tdehtml/tdehtml_part.cpp:258
 msgid "Save &Background Image As..."
 msgstr "Cadw Delwedd &Gefndir fel ..."
 
-#: khtml/khtml_part.cpp:263
+#: tdehtml/tdehtml_part.cpp:263
 msgid "Security..."
 msgstr "Diogelwch..."
 
-#: khtml/khtml_part.cpp:264
+#: tdehtml/tdehtml_part.cpp:264
 msgid ""
 "Security Settings"
 "<p>Shows the certificate of the displayed page. Only pages that have been "
@@ -7068,45 +7068,45 @@ msgstr ""
 "<p> Awgrymiad: Os mae'r ddelwedd yn dangos clo wedi'i gau, mae'r dudalen wedi'i "
 "throsglwyddo dros gysylltiad diogel."
 
-#: khtml/khtml_part.cpp:270
+#: tdehtml/tdehtml_part.cpp:270
 msgid "Print Rendering Tree to STDOUT"
 msgstr "Argraffu'r Goeden Drosi i STDOUT"
 
-#: khtml/khtml_part.cpp:271
+#: tdehtml/tdehtml_part.cpp:271
 msgid "Print DOM Tree to STDOUT"
 msgstr "Argraffu'r Goeden DOM i STDOUT"
 
-#: khtml/khtml_part.cpp:272
+#: tdehtml/tdehtml_part.cpp:272
 msgid "Stop Animated Images"
 msgstr "Stopio Delweddau Animeiddiedig"
 
-#: khtml/khtml_part.cpp:274
+#: tdehtml/tdehtml_part.cpp:274
 msgid "Set &Encoding"
 msgstr "&Gosod Amgodiad"
 
-#: khtml/khtml_part.cpp:279
+#: tdehtml/tdehtml_part.cpp:279
 msgid "Semi-Automatic"
 msgstr "Hanner-Awtomatig"
 
-#: khtml/khtml_part.cpp:297 khtml/khtml_part.cpp:2298
+#: tdehtml/tdehtml_part.cpp:297 tdehtml/tdehtml_part.cpp:2298
 msgid "Automatic Detection"
 msgstr "Datganiad Awtomatig"
 
-#: khtml/khtml_part.cpp:302
+#: tdehtml/tdehtml_part.cpp:302
 msgid ""
 "_: short for Manual Detection\n"
 "Manual"
 msgstr "Â Llaw"
 
-#: khtml/khtml_part.cpp:357
+#: tdehtml/tdehtml_part.cpp:357
 msgid "Use S&tylesheet"
 msgstr "&Defynddio Dalen Arddull"
 
-#: khtml/khtml_part.cpp:361
+#: tdehtml/tdehtml_part.cpp:361
 msgid "Enlarge Font"
 msgstr "Cynyddu Maint yr Wynebfath"
 
-#: khtml/khtml_part.cpp:363
+#: tdehtml/tdehtml_part.cpp:363
 msgid ""
 "Enlarge Font"
 "<p>Make the font in this window bigger. Click and hold down the mouse button "
@@ -7116,11 +7116,11 @@ msgstr ""
 "<p> Gwnewch yr wynebfath yn y ffenestr yma yn fwy.  Cliciwch a cadw'r botwm "
 "llygoden i lawr am ddewislen efo pob maint wynebfath sydd ar gael."
 
-#: khtml/khtml_part.cpp:367
+#: tdehtml/tdehtml_part.cpp:367
 msgid "Shrink Font"
 msgstr "Lleihau Wynebfath"
 
-#: khtml/khtml_part.cpp:369
+#: tdehtml/tdehtml_part.cpp:369
 msgid ""
 "Shrink Font"
 "<p>Make the font in this window smaller. Click and hold down the mouse button "
@@ -7130,7 +7130,7 @@ msgstr ""
 "<p>Gwnewch yr wynebfath yn y ffenestr yma yn llai.  Cliciwch a cadw'r botwm "
 "llygoden i lawr am ddewislen efo pob maint wynebfath sydd ar gael."
 
-#: khtml/khtml_part.cpp:375
+#: tdehtml/tdehtml_part.cpp:375
 msgid ""
 "Find text"
 "<p>Shows a dialog that allows you to find text on the displayed page."
@@ -7139,7 +7139,7 @@ msgstr ""
 "<p>Dangos ymgom sy'n gadael i chi ganfod testun ar y dudalen sy'n cael ei "
 "arddangos."
 
-#: khtml/khtml_part.cpp:379
+#: tdehtml/tdehtml_part.cpp:379
 msgid ""
 "Find next"
 "<p>Find the next occurrence of the text that you have found using the <b>"
@@ -7149,7 +7149,7 @@ msgstr ""
 "<p>Canfod y digwyddiad nesaf o'r testun yr ydych wedi ei ganfod wrth "
 "ddefnyddio'r ffwythiant <b>Canfod Testun</b>"
 
-#: khtml/khtml_part.cpp:384
+#: tdehtml/tdehtml_part.cpp:384
 #, fuzzy
 msgid ""
 "Find previous"
@@ -7160,17 +7160,17 @@ msgstr ""
 "<p>Canfod y digwyddiad nesaf o'r testun yr ydych wedi ei ganfod wrth "
 "ddefnyddio'r ffwythiant <b>Canfod Testun</b>"
 
-#: khtml/khtml_part.cpp:388
+#: tdehtml/tdehtml_part.cpp:388
 #, fuzzy
 msgid "Find Text as You Type"
 msgstr "Dechrau -- canfod testun wrth deipio"
 
-#: khtml/khtml_part.cpp:390
+#: tdehtml/tdehtml_part.cpp:390
 #, fuzzy
 msgid "Find Links as You Type"
 msgstr "Dechrau -- canfod cysylltau wrth deipio"
 
-#: khtml/khtml_part.cpp:405
+#: tdehtml/tdehtml_part.cpp:405
 msgid ""
 "Print Frame"
 "<p>Some pages have several frames. To print only a single frame, click on it "
@@ -7180,103 +7180,103 @@ msgstr ""
 "<p>Mae gan rhai tudalennau fwy nag un ffram.  I argraffu dim ond un ffram, "
 "cliciwch arno, ac wedyn defnyddiwch y ffwythiant yma."
 
-#: khtml/khtml_part.cpp:413
+#: tdehtml/tdehtml_part.cpp:413
 msgid "Toggle Caret Mode"
 msgstr "Dangos/Cuddio Modd To Bach"
 
-#: khtml/khtml_part.cpp:618
+#: tdehtml/tdehtml_part.cpp:618
 msgid "The fake user-agent '%1' is in use."
 msgstr "Mae'r ffug asiant-defnyddiwr '%1' mewn defnydd."
 
-#: khtml/khtml_part.cpp:1081
+#: tdehtml/tdehtml_part.cpp:1081
 msgid "This web page contains coding errors."
 msgstr "Mae'r dudalen wê yma yn cynnwys gwallau codio."
 
-#: khtml/khtml_part.cpp:1123
+#: tdehtml/tdehtml_part.cpp:1123
 msgid "&Hide Errors"
 msgstr "C&uddio Gwallau"
 
-#: khtml/khtml_part.cpp:1124
+#: tdehtml/tdehtml_part.cpp:1124
 msgid "&Disable Error Reporting"
 msgstr "A&nalluogi Adrodd Gwallau"
 
-#: khtml/khtml_part.cpp:1164
+#: tdehtml/tdehtml_part.cpp:1164
 msgid "<b>Error</b>: %1: %2"
 msgstr "<b>Gwall</b>: %1: %2"
 
-#: khtml/khtml_part.cpp:1208
+#: tdehtml/tdehtml_part.cpp:1208
 msgid "<b>Error</b>: node %1: %2"
 msgstr "<b>Gwall</b>: nôd %1: %2"
 
-#: khtml/khtml_part.cpp:1351
+#: tdehtml/tdehtml_part.cpp:1351
 msgid "Display Images on Page"
 msgstr "Arddangos Delweddau ar y Dudalen"
 
-#: khtml/khtml_part.cpp:1539 khtml/khtml_part.cpp:1629
+#: tdehtml/tdehtml_part.cpp:1539 tdehtml/tdehtml_part.cpp:1629
 msgid "Session is secured with %1 bit %2."
 msgstr "Diogelir y sesiwn gan %1 did %2."
 
-#: khtml/khtml_part.cpp:1540 khtml/khtml_part.cpp:1631
+#: tdehtml/tdehtml_part.cpp:1540 tdehtml/tdehtml_part.cpp:1631
 msgid "Session is not secured."
 msgstr "Ni ddiogelir y sesiwn."
 
-#: khtml/khtml_part.cpp:1727
+#: tdehtml/tdehtml_part.cpp:1727
 #, c-format
 msgid "Error while loading %1"
 msgstr "Gwall wrth lwytho ffeil %1"
 
-#: khtml/khtml_part.cpp:1729
+#: tdehtml/tdehtml_part.cpp:1729
 msgid "An error occurred while loading <B>%1</B>:"
 msgstr "Gwall wrth lwytho <B>%1</B>:"
 
-#: khtml/khtml_part.cpp:1764
+#: tdehtml/tdehtml_part.cpp:1764
 msgid "Error: "
 msgstr "Gwall:"
 
-#: khtml/khtml_part.cpp:1767
+#: tdehtml/tdehtml_part.cpp:1767
 msgid "The requested operation could not be completed"
 msgstr "Methu cwblhau'r gweithrediad ceisiedig"
 
-#: khtml/khtml_part.cpp:1773
+#: tdehtml/tdehtml_part.cpp:1773
 msgid "Technical Reason: "
 msgstr "Rheswm Technegol:"
 
-#: khtml/khtml_part.cpp:1778
+#: tdehtml/tdehtml_part.cpp:1778
 msgid "Details of the Request:"
 msgstr "Manylion y Cais:"
 
-#: khtml/khtml_part.cpp:1780
+#: tdehtml/tdehtml_part.cpp:1780
 #, c-format
 msgid "URL: %1"
 msgstr "URL: %1"
 
-#: khtml/khtml_part.cpp:1787
+#: tdehtml/tdehtml_part.cpp:1787
 #, c-format
 msgid "Date and Time: %1"
 msgstr "Dyddiad ac Amser: %1"
 
-#: khtml/khtml_part.cpp:1789
+#: tdehtml/tdehtml_part.cpp:1789
 #, c-format
 msgid "Additional Information: %1"
 msgstr "Gwybodaeth Ychwanegol: %1"
 
-#: khtml/khtml_part.cpp:1791
+#: tdehtml/tdehtml_part.cpp:1791
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: khtml/khtml_part.cpp:1797
+#: tdehtml/tdehtml_part.cpp:1797
 msgid "Possible Causes:"
 msgstr "Achosion Posib:"
 
-#: khtml/khtml_part.cpp:1804
+#: tdehtml/tdehtml_part.cpp:1804
 msgid "Possible Solutions:"
 msgstr "Datrysiadau Posib:"
 
-#: khtml/khtml_part.cpp:2135
+#: tdehtml/tdehtml_part.cpp:2135
 msgid "Page loaded."
 msgstr "Ffeil wedi ei ail-lwytho."
 
-#: khtml/khtml_part.cpp:2137
+#: tdehtml/tdehtml_part.cpp:2137
 msgid ""
 "_n: %n Image of %1 loaded.\n"
 "%n Images of %1 loaded."
@@ -7284,48 +7284,48 @@ msgstr ""
 "Llwythwyd %n o %1 Delwedd...\n"
 "Llwythwyd %n o %1 Delwedd..."
 
-#: khtml/khtml_part.cpp:3738 khtml/khtml_part.cpp:3825
-#: khtml/khtml_part.cpp:3836
+#: tdehtml/tdehtml_part.cpp:3738 tdehtml/tdehtml_part.cpp:3825
+#: tdehtml/tdehtml_part.cpp:3836
 msgid " (In new window)"
 msgstr "(Mewn ffenest newydd)"
 
-#: khtml/khtml_part.cpp:3777
+#: tdehtml/tdehtml_part.cpp:3777
 msgid "Symbolic Link"
 msgstr "Cyswllt Symbolaidd"
 
-#: khtml/khtml_part.cpp:3779
+#: tdehtml/tdehtml_part.cpp:3779
 msgid "%1 (Link)"
 msgstr "%1 (Cyswllt)"
 
-#: khtml/khtml_part.cpp:3799
+#: tdehtml/tdehtml_part.cpp:3799
 msgid "%2 (%1 bytes)"
 msgstr "%2 (%1 beit)"
 
-#: khtml/khtml_part.cpp:3803
+#: tdehtml/tdehtml_part.cpp:3803
 msgid "%2 (%1 K)"
 msgstr "%2 (%1 K)"
 
-#: khtml/khtml_part.cpp:3838
+#: tdehtml/tdehtml_part.cpp:3838
 msgid " (In other frame)"
 msgstr "(Mewn ffram arall)"
 
-#: khtml/khtml_part.cpp:3843
+#: tdehtml/tdehtml_part.cpp:3843
 msgid "Email to: "
 msgstr "E-bostio i:"
 
-#: khtml/khtml_part.cpp:3849
+#: tdehtml/tdehtml_part.cpp:3849
 msgid " - Subject: "
 msgstr "- Pwnc:"
 
-#: khtml/khtml_part.cpp:3851
+#: tdehtml/tdehtml_part.cpp:3851
 msgid " - CC: "
 msgstr "- CC:"
 
-#: khtml/khtml_part.cpp:3853
+#: tdehtml/tdehtml_part.cpp:3853
 msgid " - BCC: "
 msgstr " - BCC:"
 
-#: khtml/khtml_part.cpp:3942
+#: tdehtml/tdehtml_part.cpp:3942
 msgid ""
 "<qt>This untrusted page links to<BR><B>%1</B>.<BR>Do you want to follow the "
 "link?"
@@ -7333,31 +7333,31 @@ msgstr ""
 "<qt>Mae'r dudalen ddiymddiried yma yn cysylltu â  <BR><B>%1</B>.<BR> "
 "Hoffech ddilyn y cyswllt?"
 
-#: khtml/khtml_part.cpp:3943
+#: tdehtml/tdehtml_part.cpp:3943
 msgid "Follow"
 msgstr "Dilyn"
 
-#: khtml/khtml_part.cpp:4043
+#: tdehtml/tdehtml_part.cpp:4043
 msgid "Frame Information"
 msgstr "Gwybodaeth Ffrâm"
 
-#: khtml/khtml_part.cpp:4049
+#: tdehtml/tdehtml_part.cpp:4049
 msgid "   <a href=\"%1\">[Properties]</a>"
 msgstr "<a href=\"%1\">[Priodweddau]</a>"
 
-#: khtml/khtml_part.cpp:4129
+#: tdehtml/tdehtml_part.cpp:4129
 msgid "Save Background Image As"
 msgstr "Cadw Delwedd y Gefndir Fel ..."
 
-#: khtml/khtml_part.cpp:4216
+#: tdehtml/tdehtml_part.cpp:4216
 msgid "Save Frame As"
 msgstr "Cadw Ffram Fel"
 
-#: khtml/khtml_part.cpp:4256
+#: tdehtml/tdehtml_part.cpp:4256
 msgid "&Find in Frame..."
 msgstr "&Canfod mewn Ffrâm ..."
 
-#: khtml/khtml_part.cpp:4763
+#: tdehtml/tdehtml_part.cpp:4763
 msgid ""
 "Warning:  This is a secure form but it is attempting to send your data back "
 "unencrypted.\n"
@@ -7369,16 +7369,16 @@ msgstr ""
 " Gall rhywun arall ryng-gipio a gweld yr wybodaeth yma. \n"
 " Ydych yn siwr eich bod chi eisiau fynd ymlaen?"
 
-#: khtml/khtml_part.cpp:4766 khtml/khtml_part.cpp:4775
-#: khtml/khtml_part.cpp:4799
+#: tdehtml/tdehtml_part.cpp:4766 tdehtml/tdehtml_part.cpp:4775
+#: tdehtml/tdehtml_part.cpp:4799
 msgid "Network Transmission"
 msgstr "Trosglwyddiad Rhwydwaith"
 
-#: khtml/khtml_part.cpp:4766 khtml/khtml_part.cpp:4776
+#: tdehtml/tdehtml_part.cpp:4766 tdehtml/tdehtml_part.cpp:4776
 msgid "&Send Unencrypted"
 msgstr "&Anfon heb ei Gêl-ysgrifo"
 
-#: khtml/khtml_part.cpp:4773
+#: tdehtml/tdehtml_part.cpp:4773
 msgid ""
 "Warning: Your data is about to be transmitted across the network unencrypted.\n"
 "Are you sure you wish to continue?"
@@ -7387,7 +7387,7 @@ msgstr ""
 "rhwydwaith.\n"
 " Ydych yn siwr eich bod chi eisiau fynd ymlaen?"
 
-#: khtml/khtml_part.cpp:4797
+#: tdehtml/tdehtml_part.cpp:4797
 msgid ""
 "This site is attempting to submit form data via email.\n"
 "Do you want to continue?"
@@ -7395,11 +7395,11 @@ msgstr ""
 "Mae'r safwê yma yn ceisio cyflwyno data ffurflen drwy e-bost. \n"
 " Ydych eisiau fynd ymlaen?"
 
-#: khtml/khtml_part.cpp:4800
+#: tdehtml/tdehtml_part.cpp:4800
 msgid "&Send Email"
 msgstr "Anfon E&bost"
 
-#: khtml/khtml_part.cpp:4821
+#: tdehtml/tdehtml_part.cpp:4821
 msgid ""
 "<qt>The form will be submitted to <BR><B>%1</B><BR>on your local filesystem.<BR>"
 "Do you want to submit the form?"
@@ -7407,12 +7407,12 @@ msgstr ""
 "<qt>Bydd y ffurflen yn cael ei chyflwyno i <BR><B>%1</B><BR> "
 "ar eich cysawd ffeiliau lleol. <BR> Ydych eisiau cyflwyno'r ffurlen?"
 
-#: khtml/html/html_formimpl.cpp:1531 khtml/html/html_formimpl.cpp:2137
-#: khtml/khtml_part.cpp:4822 khtml/khtmlview.cpp:2527 khtml/khtmlview.cpp:2569
+#: tdehtml/html/html_formimpl.cpp:1531 tdehtml/html/html_formimpl.cpp:2137
+#: tdehtml/tdehtml_part.cpp:4822 tdehtml/tdehtmlview.cpp:2527 tdehtml/tdehtmlview.cpp:2569
 msgid "Submit"
 msgstr "Cyflwyno"
 
-#: khtml/khtml_part.cpp:4870
+#: tdehtml/tdehtml_part.cpp:4870
 msgid ""
 "This site attempted to attach a file from your computer in the form submission. "
 "The attachment was removed for your protection."
@@ -7420,41 +7420,41 @@ msgstr ""
 "Ceisiodd y safwê yma glymu ffeil oddiar eich cyfrifiadur yn y cyflwyniad "
 "ffurflen.  Tynnwyd yr atodiad er eich gwarchodaeth."
 
-#: khtml/khtml_part.cpp:4870
+#: tdehtml/tdehtml_part.cpp:4870
 msgid "TDE"
 msgstr "TDE"
 
-#: khtml/khtml_part.cpp:5776
+#: tdehtml/tdehtml_part.cpp:5776
 msgid "(%1/s)"
 msgstr "(%1/s)"
 
-#: khtml/khtml_part.cpp:6829
+#: tdehtml/tdehtml_part.cpp:6829
 msgid "Security Warning"
 msgstr "Rhybudd Diogelwch"
 
-#: khtml/khtml_part.cpp:6835
+#: tdehtml/tdehtml_part.cpp:6835
 msgid "<qt>Access by untrusted page to<BR><B>%1</B><BR> denied."
 msgstr "<qt>Gwaharddwyd cyrchiad gan dudalen ddiymddiried i <BR><B>%1</B><BR>."
 
-#: khtml/java/kjavaappletserver.cpp:784 khtml/khtml_part.cpp:6836
+#: tdehtml/java/kjavaappletserver.cpp:784 tdehtml/tdehtml_part.cpp:6836
 msgid "Security Alert"
 msgstr "Larwm Diogelwch"
 
-#: khtml/khtml_part.cpp:7261
+#: tdehtml/tdehtml_part.cpp:7261
 msgid "The wallet '%1' is open and being used for form data and passwords."
 msgstr ""
 "Mae'r waled '%1' ar agor, ac yn cael ei ddefnyddio am ddata ffurflen a "
 "cyfrineiriau."
 
-#: khtml/khtml_part.cpp:7315
+#: tdehtml/tdehtml_part.cpp:7315
 msgid "&Close Wallet"
 msgstr "&Cau'r Waled"
 
-#: khtml/khtml_part.cpp:7358
+#: tdehtml/tdehtml_part.cpp:7358
 msgid "JavaScript &Debugger"
 msgstr "&Dadnamydd JavaScript"
 
-#: khtml/khtml_part.cpp:7393
+#: tdehtml/tdehtml_part.cpp:7393
 #, fuzzy
 msgid "This page was prevented from opening a new window via JavaScript."
 msgstr ""
@@ -7462,146 +7462,146 @@ msgstr ""
 "Javascript. \n"
 " Ydych eisiau gadael hynny?"
 
-#: khtml/khtml_part.cpp:7399
+#: tdehtml/tdehtml_part.cpp:7399
 msgid "Popup Window Blocked"
 msgstr ""
 
-#: khtml/khtml_part.cpp:7399
+#: tdehtml/tdehtml_part.cpp:7399
 msgid ""
 "This page has attempted to open a popup window but was blocked.\n"
 "You can click on this icon in the status bar to control this behavior\n"
 "or to open the popup."
 msgstr ""
 
-#: khtml/khtml_part.cpp:7413
+#: tdehtml/tdehtml_part.cpp:7413
 #, c-format
 msgid ""
 "_n: &Show Blocked Popup Window\n"
 "Show %n Blocked Popup Windows"
 msgstr ""
 
-#: khtml/khtml_part.cpp:7414
+#: tdehtml/tdehtml_part.cpp:7414
 msgid "Show Blocked Window Passive Popup &Notification"
 msgstr ""
 
-#: khtml/khtml_part.cpp:7416
+#: tdehtml/tdehtml_part.cpp:7416
 msgid "&Configure JavaScript New Window Policies..."
 msgstr ""
 
-#: khtml/khtmlview.cpp:1625
+#: tdehtml/tdehtmlview.cpp:1625
 msgid "Find stopped."
 msgstr "Arhosodd y canfod."
 
-#: khtml/khtmlview.cpp:1636
+#: tdehtml/tdehtmlview.cpp:1636
 msgid "Starting -- find links as you type"
 msgstr "Dechrau -- canfod cysylltau wrth deipio"
 
-#: khtml/khtmlview.cpp:1642
+#: tdehtml/tdehtmlview.cpp:1642
 msgid "Starting -- find text as you type"
 msgstr "Dechrau -- canfod testun wrth deipio"
 
-#: khtml/khtmlview.cpp:1663
+#: tdehtml/tdehtmlview.cpp:1663
 msgid "Link found: \"%1\"."
 msgstr "Canfuwyd y cyswllt: \"%1\"."
 
-#: khtml/khtmlview.cpp:1668
+#: tdehtml/tdehtmlview.cpp:1668
 msgid "Link not found: \"%1\"."
 msgstr "Ni chanfuwyd y cyswllt: \"%1\"."
 
-#: khtml/khtmlview.cpp:1676
+#: tdehtml/tdehtmlview.cpp:1676
 msgid "Text found: \"%1\"."
 msgstr "Canfuwyd y testun: \"%1\"."
 
-#: khtml/khtmlview.cpp:1681
+#: tdehtml/tdehtmlview.cpp:1681
 msgid "Text not found: \"%1\"."
 msgstr "Ni chanfuwyd y testun: \"%1\"."
 
-#: khtml/khtmlview.cpp:1725
+#: tdehtml/tdehtmlview.cpp:1725
 msgid "Access Keys activated"
 msgstr "Gweithredoliwyd Bysellau Cyrchiad"
 
-#: khtml/khtmlview.cpp:2756
+#: tdehtml/tdehtmlview.cpp:2756
 #, c-format
 msgid "Print %1"
 msgstr "Argraffu %1"
 
-#: khtml/khtml_factory.cpp:177
-msgid "KHTML"
-msgstr "KHTML"
+#: tdehtml/tdehtml_factory.cpp:177
+msgid "TDEHTML"
+msgstr "TDEHTML"
 
-#: khtml/khtml_factory.cpp:178
+#: tdehtml/tdehtml_factory.cpp:178
 msgid "Embeddable HTML component"
 msgstr "Cydran HTML mewnadeiladedig"
 
-#: khtml/xml/xml_tokenizer.cpp:312
+#: tdehtml/xml/xml_tokenizer.cpp:312
 msgid "the document is not in the correct file format"
 msgstr "nid yw'r ddogfen yn y fformat ffeil cywir"
 
-#: khtml/xml/xml_tokenizer.cpp:318
+#: tdehtml/xml/xml_tokenizer.cpp:318
 msgid "fatal parsing error: %1 in line %2, column %3"
 msgstr "gwall gramadegu angheuol: %1 yn llinell %2, colofn %3"
 
-#: khtml/xml/xml_tokenizer.cpp:477
+#: tdehtml/xml/xml_tokenizer.cpp:477
 msgid "XML parsing error"
 msgstr "Gwall gramadegu XML"
 
-#: khtml/xml/dom_docimpl.cpp:2077
+#: tdehtml/xml/dom_docimpl.cpp:2077
 msgid "Basic Page Style"
 msgstr "Ardull Sylfaenol i Dudalen"
 
-#: khtml/ecma/kjs_debugwin.cpp:291
+#: tdehtml/ecma/kjs_debugwin.cpp:291
 msgid "JavaScript Error"
 msgstr "Gwall JavaScript"
 
-#: khtml/ecma/kjs_debugwin.cpp:305
+#: tdehtml/ecma/kjs_debugwin.cpp:305
 msgid "&Do not show this message again"
 msgstr "&Peidio a dangos y neges yma eto"
 
-#: khtml/ecma/kjs_debugwin.cpp:369
+#: tdehtml/ecma/kjs_debugwin.cpp:369
 msgid "JavaScript Debugger"
 msgstr "Dadfygiwr JavaScript"
 
-#: khtml/ecma/kjs_debugwin.cpp:383
+#: tdehtml/ecma/kjs_debugwin.cpp:383
 msgid "Call stack"
 msgstr "Pentwr galwadau"
 
-#: khtml/ecma/kjs_debugwin.cpp:418
+#: tdehtml/ecma/kjs_debugwin.cpp:418
 msgid "JavaScript console"
 msgstr "Terfynell JavaScript"
 
-#: khtml/ecma/kjs_debugwin.cpp:448
+#: tdehtml/ecma/kjs_debugwin.cpp:448
 msgid ""
 "_: Next breakpoint\n"
 "&Next"
 msgstr "&Nesaf"
 
-#: khtml/ecma/kjs_debugwin.cpp:450
+#: tdehtml/ecma/kjs_debugwin.cpp:450
 msgid "&Step"
 msgstr "&Cam"
 
-#: khtml/ecma/kjs_debugwin.cpp:455
+#: tdehtml/ecma/kjs_debugwin.cpp:455
 msgid "&Continue"
 msgstr "&Parhau"
 
-#: khtml/ecma/kjs_debugwin.cpp:459
+#: tdehtml/ecma/kjs_debugwin.cpp:459
 msgid "&Break at Next Statement"
 msgstr "&Torri wrth Ddatganiad Nesaf"
 
-#: khtml/ecma/kjs_debugwin.cpp:463
+#: tdehtml/ecma/kjs_debugwin.cpp:463
 msgid ""
 "_: Next breakpoint\n"
 "Next"
 msgstr "Nesaf"
 
-#: khtml/ecma/kjs_debugwin.cpp:464
+#: tdehtml/ecma/kjs_debugwin.cpp:464
 msgid "Step"
 msgstr "Cam"
 
-#: khtml/ecma/kjs_debugwin.cpp:826
+#: tdehtml/ecma/kjs_debugwin.cpp:826
 msgid "Parse error at %1 line %2"
 msgstr "Gwall dosrannu wrth %1 llinell %2"
 
-#: khtml/ecma/kjs_debugwin.cpp:837
+#: tdehtml/ecma/kjs_debugwin.cpp:837
 #, c-format
 msgid ""
 "An error occurred while attempting to run a script on this page.\n"
@@ -7612,7 +7612,7 @@ msgstr ""
 "\n"
 "%1"
 
-#: khtml/ecma/kjs_debugwin.cpp:846
+#: tdehtml/ecma/kjs_debugwin.cpp:846
 msgid ""
 "An error occurred while attempting to run a script on this page.\n"
 "\n"
@@ -7624,11 +7624,11 @@ msgstr ""
 "%1 llinell %2:\n"
 "%3"
 
-#: khtml/ecma/kjs_html.cpp:2160 khtml/ecma/kjs_window.cpp:1562
+#: tdehtml/ecma/kjs_html.cpp:2160 tdehtml/ecma/kjs_window.cpp:1562
 msgid "Confirmation: JavaScript Popup"
 msgstr "Cadarnhad: Naidlen Javascript"
 
-#: khtml/ecma/kjs_window.cpp:1565
+#: tdehtml/ecma/kjs_window.cpp:1565
 msgid ""
 "This site is requesting to open up a new browser window via JavaScript.\n"
 "Do you want to allow this?"
@@ -7637,7 +7637,7 @@ msgstr ""
 "Javascript. \n"
 " Ydych eisiau gadael hynny?"
 
-#: khtml/ecma/kjs_window.cpp:1568
+#: tdehtml/ecma/kjs_window.cpp:1568
 msgid ""
 "<qt>This site is requesting to open"
 "<p>%1</p>in a new browser window via JavaScript.<br />"
@@ -7647,24 +7647,24 @@ msgstr ""
 "<p>%1</p> mewn ffenestr newydd i borydd, wrth ddefnyddio Javascript. <br /> "
 "Ydych eisiau gadael hynny?</qt>"
 
-#: khtml/ecma/kjs_html.cpp:2167 khtml/ecma/kjs_window.cpp:1570
+#: tdehtml/ecma/kjs_html.cpp:2167 tdehtml/ecma/kjs_window.cpp:1570
 msgid "Allow"
 msgstr "Caniatáu"
 
-#: khtml/ecma/kjs_html.cpp:2167 khtml/ecma/kjs_window.cpp:1570
+#: tdehtml/ecma/kjs_html.cpp:2167 tdehtml/ecma/kjs_window.cpp:1570
 #, fuzzy
 msgid "Do Not Allow"
 msgstr "Mewnforio &Popeth"
 
-#: khtml/ecma/kjs_window.cpp:1862
+#: tdehtml/ecma/kjs_window.cpp:1862
 msgid "Close window?"
 msgstr "Cau'r ffenest?"
 
-#: khtml/ecma/kjs_window.cpp:1862
+#: tdehtml/ecma/kjs_window.cpp:1862
 msgid "Confirmation Required"
 msgstr "Angen Cadarnhad"
 
-#: khtml/ecma/kjs_window.cpp:2744
+#: tdehtml/ecma/kjs_window.cpp:2744
 msgid ""
 "Do you want a bookmark pointing to the location \"%1\" to be added to your "
 "collection?"
@@ -7672,7 +7672,7 @@ msgstr ""
 "Ydych eisiau i dudnod sy'n cyfeirio at y lleoliad \"%1\" gael ei ychwanegu i'ch "
 "casgliad?"
 
-#: khtml/ecma/kjs_window.cpp:2747
+#: tdehtml/ecma/kjs_window.cpp:2747
 msgid ""
 "Do you want a bookmark pointing to the location \"%1\" titled \"%2\" to be "
 "added to your collection?"
@@ -7680,33 +7680,33 @@ msgstr ""
 "Ydych eisiau i dudnod sy'n cyfeirio at y lleoliad \"%1\", efo'r teitl \"%2\",  "
 "gael ei ychwanegu i'ch casgliad?"
 
-#: khtml/ecma/kjs_window.cpp:2755
+#: tdehtml/ecma/kjs_window.cpp:2755
 msgid "JavaScript Attempted Bookmark Insert"
 msgstr "Ceisiodd JavaScript Mewnosod Tudnod"
 
-#: khtml/ecma/kjs_window.cpp:2759
+#: tdehtml/ecma/kjs_window.cpp:2759
 msgid "Disallow"
 msgstr "Gwrthwneud"
 
-#: khtml/ecma/kjs_proxy.cpp:405
+#: tdehtml/ecma/kjs_proxy.cpp:405
 msgid ""
-"A script on this page is causing KHTML to freeze. If it continues to run, other "
+"A script on this page is causing TDEHTML to freeze. If it continues to run, other "
 "applications may become less responsive.\n"
 "Do you want to abort the script?"
 msgstr ""
-"Mae sgript ar y dudalen yma yn achosi i KHTML rewi.  Os mae'n parhau rhedeg, "
+"Mae sgript ar y dudalen yma yn achosi i TDEHTML rewi.  Os mae'n parhau rhedeg, "
 "efallai bydd cymhwysiadau eraill yn dechrau mynd yn llai ymatebol.\n"
 "Ydych eisiau terfynu'r sgript?"
 
-#: khtml/ecma/kjs_proxy.cpp:405
+#: tdehtml/ecma/kjs_proxy.cpp:405
 msgid "JavaScript"
 msgstr "JavaScript"
 
-#: khtml/ecma/kjs_proxy.cpp:405
+#: tdehtml/ecma/kjs_proxy.cpp:405
 msgid "&Abort"
 msgstr "&Terfynnu"
 
-#: khtml/ecma/kjs_html.cpp:2162
+#: tdehtml/ecma/kjs_html.cpp:2162
 msgid ""
 "This site is submitting a form which will open up a new browser window via "
 "JavaScript.\n"
@@ -7716,7 +7716,7 @@ msgstr ""
 "Javascript. \n"
 " Ydych eisiau gadael i'r ffurflen gael ei anfon?"
 
-#: khtml/ecma/kjs_html.cpp:2165
+#: tdehtml/ecma/kjs_html.cpp:2165
 msgid ""
 "<qt>This site is submitting a form which will open "
 "<p>%1</p> in a new browser window via JavaScript.<br />"
@@ -7726,11 +7726,11 @@ msgstr ""
 "<p>%1</p> mewn ffenestr newydd i borydd, wrth ddefnyddio Javascript. <br />"
 "Ydych eisiau gadael i'r ffurflen gael ei anfon?</qt>"
 
-#: khtml/html/htmlparser.cpp:1709
+#: tdehtml/html/htmlparser.cpp:1709
 msgid "This is a searchable index. Enter search keywords: "
 msgstr "Mynegai chwiliadwy yw hwn.  Rhowch allweddeiriau i'r ymchwil: "
 
-#: khtml/html/html_formimpl.cpp:353
+#: tdehtml/html/html_formimpl.cpp:353
 msgid ""
 "The following files will not be uploaded because they could not be found.\n"
 "Do you want to continue?"
@@ -7739,15 +7739,15 @@ msgstr ""
 "arnynt.\n"
 "Hoffech fynd ymlaen?"
 
-#: khtml/html/html_formimpl.cpp:357
+#: tdehtml/html/html_formimpl.cpp:357
 msgid "Submit Confirmation"
 msgstr "Anfon Cadarnhad"
 
-#: khtml/html/html_formimpl.cpp:357
+#: tdehtml/html/html_formimpl.cpp:357
 msgid "&Submit Anyway"
 msgstr "Anfon S&erch Hynny"
 
-#: khtml/html/html_formimpl.cpp:368
+#: tdehtml/html/html_formimpl.cpp:368
 msgid ""
 "You're about to transfer the following files from your local computer to the "
 "Internet.\n"
@@ -7757,33 +7757,33 @@ msgstr ""
 "Rhyngrwyd.  \n"
 " Ydych wir eisiau mynd ymlaen?"
 
-#: khtml/html/html_formimpl.cpp:372
+#: tdehtml/html/html_formimpl.cpp:372
 msgid "Send Confirmation"
 msgstr "Anfon Cadarnhad"
 
-#: khtml/html/html_formimpl.cpp:372
+#: tdehtml/html/html_formimpl.cpp:372
 msgid "&Send Files"
 msgstr "Anfon &Ffeiliau"
 
-#: khtml/html/html_formimpl.cpp:609
+#: tdehtml/html/html_formimpl.cpp:609
 msgid "Save Login Information"
 msgstr "Cadw Gwybodaeth Fewngofnodi"
 
-#: khtml/html/html_formimpl.cpp:613
+#: tdehtml/html/html_formimpl.cpp:613
 #, fuzzy
 msgid "Store"
 msgstr "Stryd"
 
-#: khtml/html/html_formimpl.cpp:613
+#: tdehtml/html/html_formimpl.cpp:613
 msgid "Ne&ver for This Site"
 msgstr "&Byth am y Wefan Yma"
 
-#: khtml/html/html_formimpl.cpp:613
+#: tdehtml/html/html_formimpl.cpp:613
 #, fuzzy
 msgid "Do Not Store"
 msgstr "&Peidiwch â Chadw"
 
-#: khtml/html/html_formimpl.cpp:618
+#: tdehtml/html/html_formimpl.cpp:618
 #, fuzzy
 msgid ""
 "Konqueror has the ability to store the password in an encrypted wallet. When "
@@ -7794,7 +7794,7 @@ msgstr ""
 "y waled, gall adfer y wybodaeth fewngofnodi y tro nesaf yr ewch i'r wefan yma.  "
 "Ydych eisiau cadw'r wybodaeth rwan?"
 
-#: khtml/html/html_formimpl.cpp:623
+#: tdehtml/html/html_formimpl.cpp:623
 #, fuzzy
 msgid ""
 "Konqueror has the ability to store the password in an encrypted wallet. When "
@@ -7805,151 +7805,151 @@ msgstr ""
 "y waled, gall adfer y wybodaeth fewngofnodi y tro nesaf yr ewch i'r wefan yma.  "
 "Ydych eisiau cadw'r wybodaeth rwan?"
 
-#: khtml/java/kjavaappletviewer.cpp:122
+#: tdehtml/java/kjavaappletviewer.cpp:122
 msgid "Applet Parameters"
 msgstr "Paramedrau'r Rhaglennig"
 
-#: khtml/java/kjavaappletviewer.cpp:131
+#: tdehtml/java/kjavaappletviewer.cpp:131
 msgid "Parameter"
 msgstr "Paramedr"
 
-#: khtml/java/kjavaappletviewer.cpp:133
+#: tdehtml/java/kjavaappletviewer.cpp:133
 msgid "Class"
 msgstr "Dosbarth"
 
-#: khtml/java/kjavaappletviewer.cpp:137
+#: tdehtml/java/kjavaappletviewer.cpp:137
 msgid "Base URL"
 msgstr "URL Sylfaenol"
 
-#: khtml/java/kjavaappletviewer.cpp:141
+#: tdehtml/java/kjavaappletviewer.cpp:141
 msgid "Archives"
 msgstr "Archifau"
 
-#: khtml/java/kjavaappletviewer.cpp:451
+#: tdehtml/java/kjavaappletviewer.cpp:451
 msgid "TDE Java Applet Plugin"
 msgstr "Ategyn Rhaglennig Jave TDE"
 
-#: khtml/java/kjavaapplet.cpp:225
+#: tdehtml/java/kjavaapplet.cpp:225
 msgid "Initializing Applet \"%1\"..."
 msgstr "Ymgychwyn Rhaglennig \"%1\"..."
 
-#: khtml/java/kjavaapplet.cpp:232
+#: tdehtml/java/kjavaapplet.cpp:232
 msgid "Starting Applet \"%1\"..."
 msgstr "Cychwyn Rhaglennig \"%1\"..."
 
-#: khtml/java/kjavaapplet.cpp:239
+#: tdehtml/java/kjavaapplet.cpp:239
 msgid "Applet \"%1\" started"
 msgstr " Mae rhaglennig \"%1\" wedi cychwyn"
 
-#: khtml/java/kjavaapplet.cpp:245
+#: tdehtml/java/kjavaapplet.cpp:245
 msgid "Applet \"%1\" stopped"
 msgstr " Mae rhaglennig \"%1\" wedi aros"
 
-#: khtml/java/kjavaappletserver.cpp:145
+#: tdehtml/java/kjavaappletserver.cpp:145
 msgid "Loading Applet"
 msgstr "Llwytho rhaglennig"
 
-#: khtml/java/kjavaappletserver.cpp:149
+#: tdehtml/java/kjavaappletserver.cpp:149
 msgid "Error: java executable not found"
 msgstr "Gwall: methu canfod gweithredadwyn java"
 
-#: khtml/java/kjavaappletserver.cpp:633
+#: tdehtml/java/kjavaappletserver.cpp:633
 msgid "Signed by (validation: "
 msgstr "Llofnodwyd gan (dilysiant: "
 
-#: khtml/java/kjavaappletserver.cpp:635
+#: tdehtml/java/kjavaappletserver.cpp:635
 msgid "Certificate (validation: "
 msgstr "Tystysgrif (dilysiant: "
 
-#: khtml/java/kjavaappletserver.cpp:638
+#: tdehtml/java/kjavaappletserver.cpp:638
 msgid "Ok"
 msgstr "Iawn"
 
-#: khtml/java/kjavaappletserver.cpp:640
+#: tdehtml/java/kjavaappletserver.cpp:640
 msgid "NoCARoot"
 msgstr "DimGwraiddCA"
 
-#: khtml/java/kjavaappletserver.cpp:642
+#: tdehtml/java/kjavaappletserver.cpp:642
 msgid "InvalidPurpose"
 msgstr "DibenAnnilys"
 
-#: khtml/java/kjavaappletserver.cpp:644
+#: tdehtml/java/kjavaappletserver.cpp:644
 msgid "PathLengthExceeded"
 msgstr "AethpwydHydLlwybr"
 
-#: khtml/java/kjavaappletserver.cpp:646
+#: tdehtml/java/kjavaappletserver.cpp:646
 msgid "InvalidCA"
 msgstr "CAAnnilys"
 
-#: khtml/java/kjavaappletserver.cpp:648
+#: tdehtml/java/kjavaappletserver.cpp:648
 msgid "Expired"
 msgstr "Wedi Darfod"
 
-#: khtml/java/kjavaappletserver.cpp:650
+#: tdehtml/java/kjavaappletserver.cpp:650
 msgid "SelfSigned"
 msgstr "HunanLofnod"
 
-#: khtml/java/kjavaappletserver.cpp:652
+#: tdehtml/java/kjavaappletserver.cpp:652
 msgid "ErrorReadingRoot"
 msgstr "GwallDarllenGwraidd"
 
-#: khtml/java/kjavaappletserver.cpp:654
+#: tdehtml/java/kjavaappletserver.cpp:654
 msgid "Revoked"
 msgstr "Dirymwyd"
 
-#: khtml/java/kjavaappletserver.cpp:656
+#: tdehtml/java/kjavaappletserver.cpp:656
 msgid "Untrusted"
 msgstr "Ni ymddiriedir"
 
-#: khtml/java/kjavaappletserver.cpp:658
+#: tdehtml/java/kjavaappletserver.cpp:658
 msgid "SignatureFailed"
 msgstr "MethoddLlofnod"
 
-#: khtml/java/kjavaappletserver.cpp:660
+#: tdehtml/java/kjavaappletserver.cpp:660
 msgid "Rejected"
 msgstr "Gwrthodwyd"
 
-#: khtml/java/kjavaappletserver.cpp:662
+#: tdehtml/java/kjavaappletserver.cpp:662
 msgid "PrivateKeyFailed"
 msgstr "MethoddAllweddBreifat"
 
-#: khtml/java/kjavaappletserver.cpp:664
+#: tdehtml/java/kjavaappletserver.cpp:664
 msgid "InvalidHost"
 msgstr "GwesteiwrAnnilys"
 
-#: khtml/java/kjavaappletserver.cpp:667
+#: tdehtml/java/kjavaappletserver.cpp:667
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: khtml/java/kjavaappletserver.cpp:788
+#: tdehtml/java/kjavaappletserver.cpp:788
 msgid "Do you grant Java applet with certificate(s):"
 msgstr "Ydych am roi i'r rhaglennig Java gyda thystysgrif(au):"
 
-#: khtml/java/kjavaappletserver.cpp:790
+#: tdehtml/java/kjavaappletserver.cpp:790
 msgid "the following permission"
 msgstr "y caniatadau dilynol"
 
-#: khtml/java/kjavaappletserver.cpp:801
+#: tdehtml/java/kjavaappletserver.cpp:801
 msgid "&Reject All"
 msgstr "&Gwrthod Popeth"
 
-#: khtml/java/kjavaappletserver.cpp:807
+#: tdehtml/java/kjavaappletserver.cpp:807
 msgid "&Grant All"
 msgstr "&Caniatàu Popeth"
 
-#: khtml/kmultipart/kmultipart.cpp:320
+#: tdehtml/tdemultipart/tdemultipart.cpp:320
 msgid "No handler found for %1!"
 msgstr "Methu canfod trinydd i %1!"
 
-#: khtml/kmultipart/kmultipart.cpp:576
+#: tdehtml/tdemultipart/tdemultipart.cpp:576
 msgid "KMultiPart"
 msgstr "KMultiPart"
 
-#: khtml/kmultipart/kmultipart.cpp:578
+#: tdehtml/tdemultipart/tdemultipart.cpp:578
 msgid "Embeddable component for multipart/mixed"
 msgstr "Cydran mewnadeiladadwy i aml-ran/cymysglyd"
 
-#: khtml/rendering/render_frames.cpp:944
+#: tdehtml/rendering/render_frames.cpp:944
 msgid ""
 "No plugin found for '%1'.\n"
 "Do you want to download one from %2?"
@@ -7957,15 +7957,15 @@ msgstr ""
 "Methu canfod atodyn i '%1'. \n"
 " Ydych eisiau lawrlwytho un oddiwrth %2?"
 
-#: khtml/rendering/render_frames.cpp:945
+#: tdehtml/rendering/render_frames.cpp:945
 msgid "Missing Plugin"
 msgstr "Ategyn ar Goll"
 
-#: khtml/rendering/render_frames.cpp:945
+#: tdehtml/rendering/render_frames.cpp:945
 msgid "Download"
 msgstr "Lawrlwytho"
 
-#: khtml/rendering/render_frames.cpp:945
+#: tdehtml/rendering/render_frames.cpp:945
 #, fuzzy
 msgid "Do Not Download"
 msgstr "Lawrlwythir yn Amlaf"
@@ -8010,11 +8010,11 @@ msgstr ""
 
 #: tdeinit/tdelauncher_main.cpp:58
 msgid ""
-"klauncher: This program is not supposed to be started manually.\n"
-"klauncher: It is started automatically by tdeinit.\n"
+"tdelauncher: This program is not supposed to be started manually.\n"
+"tdelauncher: It is started automatically by tdeinit.\n"
 msgstr ""
-"klauncher: Ni ddylir cychwyn y rhaglen yma â llaw.\n"
-"klauncher: Cychwynnir yn ymysgogol gan tdeinit.\n"
+"tdelauncher: Ni ddylir cychwyn y rhaglen yma â llaw.\n"
+"tdelauncher: Cychwynnir yn ymysgogol gan tdeinit.\n"
 
 #: tdeinit/tdelauncher.cpp:743
 msgid "TDEInit could not launch '%1'."
@@ -8045,57 +8045,57 @@ msgid ""
 msgstr ""
 "Gwall wrth lwytho '%1'. \n"
 
-#: kconf_update/kconf_update.cpp:43
+#: tdeconf_update/tdeconf_update.cpp:43
 msgid "Keep output results from scripts"
 msgstr "Cadw canlyniadau allbwn o'r sgriptiau"
 
-#: kconf_update/kconf_update.cpp:44
+#: tdeconf_update/tdeconf_update.cpp:44
 msgid "Check whether config file itself requires updating"
 msgstr "Gwirio a yw'r ffeil ffurfweddu ei hun angen diweddaru"
 
-#: kconf_update/kconf_update.cpp:45
+#: tdeconf_update/tdeconf_update.cpp:45
 msgid "File to read update instructions from"
 msgstr "Ffeil i ddarllen cyfarwyddiadau diweddaru oddiwrtho."
 
-#: kconf_update/kconf_update.cpp:142
+#: tdeconf_update/tdeconf_update.cpp:142
 msgid "Only local files are supported."
 msgstr "Ni chynhelir ond ffeiliau lleol."
 
-#: kconf_update/kconf_update.cpp:943
+#: tdeconf_update/tdeconf_update.cpp:943
 msgid "KConf Update"
 msgstr "Diweddariad KConf"
 
-#: kconf_update/kconf_update.cpp:945
+#: tdeconf_update/tdeconf_update.cpp:945
 msgid "TDE Tool for updating user configuration files"
 msgstr "Erfyn TDE am ddiweddaru ffeiliau ffurfweddiad y defnyddwyr."
 
-#: kspell2/ui/configdialog.cpp:38
+#: tdespell2/ui/configdialog.cpp:38
 msgid "KSpell2 Configuration"
 msgstr "Ffurfweddiad KSpell2"
 
-#: kdewidgets/makekdewidgets.cpp:15
+#: kdewidgets/maketdewidgets.cpp:15
 msgid "Builds Qt widget plugins from an ini style description file."
 msgstr "Adeiladu ategion celfigyn Qt o ffeil ddisgrifiad arddull ini."
 
-#: kdewidgets/makekdewidgets.cpp:113
+#: kdewidgets/maketdewidgets.cpp:113
 msgid "Output file"
 msgstr "Ffeil allbwn"
 
-#: kdewidgets/makekdewidgets.cpp:114
+#: kdewidgets/maketdewidgets.cpp:114
 msgid "Name of the plugin class to generate"
 msgstr "Enw'r dosbarth ategyn i'w greu"
 
-#: kdewidgets/makekdewidgets.cpp:115
+#: kdewidgets/maketdewidgets.cpp:115
 msgid "Default widget group name to display in designer"
 msgstr "Enw rhagosodol i'r grŵp celfigion i'w arddangos yn y dylunydd"
 
-#: kdewidgets/makekdewidgets.cpp:116
+#: kdewidgets/maketdewidgets.cpp:116
 msgid "Embed pixmaps from a source directory"
 msgstr "Caethu picsfapiau o gyfeiriadur tarddiad"
 
-#: kdewidgets/makekdewidgets.cpp:129
-msgid "makekdewidgets"
-msgstr "makekdewidgets"
+#: kdewidgets/maketdewidgets.cpp:129
+msgid "maketdewidgets"
+msgstr "maketdewidgets"
 
 #: kstyles/web/plugin.cpp:9
 msgid "Web style plugin"
@@ -8113,42 +8113,42 @@ msgstr "Erfyn TDE i adeiladu rhestr gelc o bob thema picsfap a arsefydlwyd"
 msgid "KInstalltheme"
 msgstr "KInstalltheme"
 
-#: kunittest/modrunner.cpp:36
+#: tdeunittest/modrunner.cpp:36
 msgid "A command-line application that can be used to run KUnitTest modules."
 msgstr ""
 
-#: kunittest/modrunner.cpp:42
+#: tdeunittest/modrunner.cpp:42
 msgid "Only run modules whose filenames match the regexp."
 msgstr ""
 
-#: kunittest/modrunner.cpp:43
+#: tdeunittest/modrunner.cpp:43
 msgid ""
 "Only run tests modules which are found in the folder. Use the query option to "
 "select modules."
 msgstr ""
 
-#: kunittest/modrunner.cpp:44
+#: tdeunittest/modrunner.cpp:44
 msgid ""
 "Disables debug capturing. You typically use this option when you use the GUI."
 msgstr ""
 
-#: kunittest/modrunner.cpp:53
+#: tdeunittest/modrunner.cpp:53
 msgid "KUnitTest ModRunner"
 msgstr ""
 
-#: kparts/browserextension.cpp:485
+#: tdeparts/browserextension.cpp:485
 msgid "<qt>Do you want to search the Internet for <b>%1</b>?"
 msgstr "<qt>Ydych eisiau chwilio'r Rhyngrwyd am <b>%1</b>?"
 
-#: kparts/browserextension.cpp:486
+#: tdeparts/browserextension.cpp:486
 msgid "Internet Search"
 msgstr "Chwiliad Rhyngrwyd"
 
-#: kparts/browserextension.cpp:486
+#: tdeparts/browserextension.cpp:486
 msgid "&Search"
 msgstr " &Chwilio"
 
-#: kparts/part.cpp:492
+#: tdeparts/part.cpp:492
 msgid ""
 "The document \"%1\" has been modified.\n"
 "Do you want to save your changes or discard them?"
@@ -8156,23 +8156,23 @@ msgstr ""
 "Mae'r ddogfen \"%1\" wedi ei newid.\n"
 "Ydych eisiau cadw eich newidiadau, neu eu taflu?"
 
-#: kparts/part.cpp:494
+#: tdeparts/part.cpp:494
 msgid "Close Document"
 msgstr "Cau Dogfen"
 
-#: kparts/browserrun.cpp:275
+#: tdeparts/browserrun.cpp:275
 msgid "Do you really want to execute '%1'? "
 msgstr "Ydych wir eisiau gweithredu '%1'?"
 
-#: kparts/browserrun.cpp:276
+#: tdeparts/browserrun.cpp:276
 msgid "Execute File?"
 msgstr "Gweithredu Ffeil?"
 
-#: kparts/browserrun.cpp:276
+#: tdeparts/browserrun.cpp:276
 msgid "Execute"
 msgstr "Gweithredu"
 
-#: kparts/browserrun.cpp:294
+#: tdeparts/browserrun.cpp:294
 msgid ""
 "Open '%2'?\n"
 "Type: %1"
@@ -8180,7 +8180,7 @@ msgstr ""
 "Agor '%2'?\n"
 "Math: %1"
 
-#: kparts/browserrun.cpp:296
+#: tdeparts/browserrun.cpp:296
 msgid ""
 "Open '%3'?\n"
 "Name: %2\n"
@@ -8190,79 +8190,79 @@ msgstr ""
 "Enw: %2\n"
 "Math: %1"
 
-#: kparts/browserrun.cpp:310
+#: tdeparts/browserrun.cpp:310
 msgid "&Open with '%1'"
 msgstr "A&gor efo '%1'"
 
-#: kparts/browserrun.cpp:311
+#: tdeparts/browserrun.cpp:311
 msgid "&Open With..."
 msgstr "&Agor Gyda..."
 
-#: kparts/browserrun.cpp:353
+#: tdeparts/browserrun.cpp:353
 msgid "&Open"
 msgstr "&Agor"
 
-#: kutils/kfinddialog.cpp:55 kutils/kfinddialog.cpp:66
+#: tdeutils/kfinddialog.cpp:55 tdeutils/kfinddialog.cpp:66
 msgid "Find Text"
 msgstr "Canfod Testun"
 
-#: kutils/kfinddialog.cpp:77
+#: tdeutils/kfinddialog.cpp:77
 msgid "Replace Text"
 msgstr "Amnewid Testun"
 
-#: kutils/kfinddialog.cpp:126
+#: tdeutils/kfinddialog.cpp:126
 msgid "&Text to find:"
 msgstr "&Testun i ganfod:"
 
-#: kutils/kfinddialog.cpp:130
+#: tdeutils/kfinddialog.cpp:130
 msgid "Regular e&xpression"
 msgstr "&Mynegiad rheolaidd"
 
-#: kresources/configpage.cpp:129 kutils/kfinddialog.cpp:131
+#: tderesources/configpage.cpp:129 tdeutils/kfinddialog.cpp:131
 msgid "&Edit..."
 msgstr "&Golygu..."
 
-#: kutils/kfinddialog.cpp:140
+#: tdeutils/kfinddialog.cpp:140
 msgid "Replace With"
 msgstr "Amnewid Efo"
 
-#: kutils/kfinddialog.cpp:147
+#: tdeutils/kfinddialog.cpp:147
 msgid "Replace&ment text:"
 msgstr "Testun &amnewid:"
 
-#: kutils/kfinddialog.cpp:151
+#: tdeutils/kfinddialog.cpp:151
 msgid "Use p&laceholders"
 msgstr "De&fnyddio dalfannau"
 
-#: kutils/kfinddialog.cpp:152
+#: tdeutils/kfinddialog.cpp:152
 msgid "Insert Place&holder"
 msgstr "Mewnosod Da&lfan"
 
-#: kutils/kfinddialog.cpp:168
+#: tdeutils/kfinddialog.cpp:168
 msgid "C&ase sensitive"
 msgstr "Mae llythrennau bach/mawr o &bwys"
 
-#: kutils/kfinddialog.cpp:169
+#: tdeutils/kfinddialog.cpp:169
 msgid "&Whole words only"
 msgstr "D&im ond geiriau cyfan"
 
-#: kutils/kfinddialog.cpp:170
+#: tdeutils/kfinddialog.cpp:170
 msgid "From c&ursor"
 msgstr "&O'r cyrchyd"
 
-#: kutils/kfinddialog.cpp:172
+#: tdeutils/kfinddialog.cpp:172
 msgid "&Selected text"
 msgstr "&Testun dewisiedig"
 
-#: kutils/kfinddialog.cpp:179
+#: tdeutils/kfinddialog.cpp:179
 msgid "&Prompt on replace"
 msgstr "&Cofweini wrth amnewid"
 
-#: kutils/kfinddialog.cpp:232
+#: tdeutils/kfinddialog.cpp:232
 msgid "Start replace"
 msgstr "Dechrau amnewid"
 
-#: kutils/kfinddialog.cpp:233
+#: tdeutils/kfinddialog.cpp:233
 msgid ""
 "<qt>If you press the <b>Replace</b> button, the text you entered above is "
 "searched for within the document and any occurrence is replaced with the "
@@ -8272,11 +8272,11 @@ msgstr ""
 "cael ei chwilio amdano tu mewn y ddogfen, ac mae pob digwyddiad yn cael ei "
 "amnewid gan y testun amnewid.</qt>"
 
-#: kutils/kfinddialog.cpp:240
+#: tdeutils/kfinddialog.cpp:240
 msgid "Start searching"
 msgstr "Dechrau chwilio"
 
-#: kutils/kfinddialog.cpp:241
+#: tdeutils/kfinddialog.cpp:241
 msgid ""
 "<qt>If you press the <b>Find</b> button, the text you entered above is searched "
 "for within the document.</qt>"
@@ -8284,26 +8284,26 @@ msgstr ""
 "<qt>Os gwasgwch y botwm <b>Canfod</b>, mae'r testun a fewnosodwyd uchod yn cael "
 "ei chwilio amdano tu mewn i'r ddogfen.</qt>"
 
-#: kutils/kfinddialog.cpp:247
+#: tdeutils/kfinddialog.cpp:247
 msgid ""
 "Enter a pattern to search for, or select a previous pattern from the list."
 msgstr ""
 "Rhowch patrwm i chwilio amdano, neu ddewiswch patrwm blaenorol o'r rhestr."
 
-#: kutils/kfinddialog.cpp:250
+#: tdeutils/kfinddialog.cpp:250
 msgid "If enabled, search for a regular expression."
 msgstr "Os alluog, chwilio am fynegiad rheolaidd."
 
-#: kutils/kfinddialog.cpp:252
+#: tdeutils/kfinddialog.cpp:252
 msgid "Click here to edit your regular expression using a graphical editor."
 msgstr ""
 "Cliciwch yma i olygu eich mynegiad rheolaidd gan ddefnyddio golygydd graffegol."
 
-#: kutils/kfinddialog.cpp:254
+#: tdeutils/kfinddialog.cpp:254
 msgid "Enter a replacement string, or select a previous one from the list."
 msgstr "Rhowch llinyn amnewid, neu ddewiswch un blaenorol o'r rhestr."
 
-#: kutils/kfinddialog.cpp:256
+#: tdeutils/kfinddialog.cpp:256
 msgid ""
 "<qt>If enabled, any occurrence of <code><b>\\N</b></code>, where <code><b>N</b>"
 "</code> is a integer number, will be replaced with the corresponding capture "
@@ -8312,24 +8312,24 @@ msgid ""
 "extra backslash in front of it, like <code><b>\\\\N</b></code>.</qt>"
 msgstr ""
 
-#: kutils/kfinddialog.cpp:263
+#: tdeutils/kfinddialog.cpp:263
 msgid "Click for a menu of available captures."
 msgstr "Cliciwch am ddewislen o'r cipiadau sydd ar gael."
 
-#: kutils/kfinddialog.cpp:265
+#: tdeutils/kfinddialog.cpp:265
 msgid "Require word boundaries in both ends of a match to succeed."
 msgstr ""
 "Gofyn am ffiniau geiriau wrth ddechrau a diwedd cydweddiad er mwyn llwyddo."
 
-#: kutils/kfinddialog.cpp:267
+#: tdeutils/kfinddialog.cpp:267
 msgid "Start searching at the current cursor location rather than at the top."
 msgstr "Dechrau chwilio o leoliad cyfredol y cyrchydd yn lle o'r pen."
 
-#: kutils/kfinddialog.cpp:269
+#: tdeutils/kfinddialog.cpp:269
 msgid "Only search within the current selection."
 msgstr "Chwilio tu mewn y detholiad cyfredol yn unig."
 
-#: kutils/kfinddialog.cpp:271
+#: tdeutils/kfinddialog.cpp:271
 msgid ""
 "Perform a case sensitive search: entering the pattern 'Joe' will not match "
 "'joe' or 'JOE', only 'Joe'."
@@ -8337,79 +8337,79 @@ msgstr ""
 "Gweithredu chwiliad lle mae priflythrennau o bwys: ni fydd y patrwm 'Joe' yn "
 "cydweddu â 'joe' neu 'JOE', ond â 'Joe' yn unig."
 
-#: kutils/kfinddialog.cpp:274
+#: tdeutils/kfinddialog.cpp:274
 msgid "Search backwards."
 msgstr "Chwilio yn ôl."
 
-#: kutils/kfinddialog.cpp:276
+#: tdeutils/kfinddialog.cpp:276
 msgid "Ask before replacing each match found."
 msgstr "Gofyn cyn disodli pob cydweddiad a ganfyddir."
 
-#: kutils/kfinddialog.cpp:449
+#: tdeutils/kfinddialog.cpp:449
 msgid "Any Character"
 msgstr "Unrhyw Nod"
 
-#: kutils/kfinddialog.cpp:450
+#: tdeutils/kfinddialog.cpp:450
 msgid "Start of Line"
 msgstr "Dechrau'r Llinell"
 
-#: kutils/kfinddialog.cpp:452
+#: tdeutils/kfinddialog.cpp:452
 msgid "Set of Characters"
 msgstr "Set o Nodau"
 
-#: kutils/kfinddialog.cpp:453
+#: tdeutils/kfinddialog.cpp:453
 msgid "Repeats, Zero or More Times"
 msgstr "Ailadrodd, Sero neu Mwy o Weithiau"
 
-#: kutils/kfinddialog.cpp:454
+#: tdeutils/kfinddialog.cpp:454
 msgid "Repeats, One or More Times"
 msgstr "Ailadrodd, Un neu Mwy o Weithiau"
 
-#: kutils/kfinddialog.cpp:455
+#: tdeutils/kfinddialog.cpp:455
 msgid "Optional"
 msgstr "Dewisol"
 
-#: kutils/kfinddialog.cpp:456
+#: tdeutils/kfinddialog.cpp:456
 msgid "Escape"
 msgstr "Esc"
 
-#: kutils/kfinddialog.cpp:457
+#: tdeutils/kfinddialog.cpp:457
 msgid "TAB"
 msgstr "TAB"
 
-#: kutils/kfinddialog.cpp:458
+#: tdeutils/kfinddialog.cpp:458
 msgid "Newline"
 msgstr "Llinell newydd"
 
-#: kutils/kfinddialog.cpp:459
+#: tdeutils/kfinddialog.cpp:459
 msgid "Carriage Return"
 msgstr "Dychwelydd"
 
-#: kutils/kfinddialog.cpp:460
+#: tdeutils/kfinddialog.cpp:460
 msgid "White Space"
 msgstr "Gofodnod"
 
-#: kutils/kfinddialog.cpp:461
+#: tdeutils/kfinddialog.cpp:461
 msgid "Digit"
 msgstr "Digid"
 
-#: kutils/kfinddialog.cpp:510
+#: tdeutils/kfinddialog.cpp:510
 msgid "Complete Match"
 msgstr "Cydweddiad Cyfan"
 
-#: kutils/kfinddialog.cpp:515
+#: tdeutils/kfinddialog.cpp:515
 msgid "Captured Text (%1)"
 msgstr "Testun a Gipiwyd (%1)"
 
-#: kutils/kfinddialog.cpp:523
+#: tdeutils/kfinddialog.cpp:523
 msgid "You must enter some text to search for."
 msgstr "Rhaid i chi fewnosod testun i chwilio amdano."
 
-#: kutils/kfinddialog.cpp:534
+#: tdeutils/kfinddialog.cpp:534
 msgid "Invalid regular expression."
 msgstr "Mynegiad rheolaidd annilys."
 
-#: kutils/kcmoduleloader.cpp:98
+#: tdeutils/tdecmoduleloader.cpp:98
 msgid ""
 "<qt>There was an error when loading the module '%1'."
 "<br>"
@@ -8423,15 +8423,15 @@ msgstr ""
 "llwytho'r modiwl yn gywir serch hynny.  Mwy na thebyg roedd y datganiad ffatri "
 "yn anghywir, neu roedd y ffwythiant create_* ar goll.</qt>"
 
-#: kutils/kcmoduleloader.cpp:111
+#: tdeutils/tdecmoduleloader.cpp:111
 msgid "The specified library %1 could not be found."
 msgstr "Methu canfod y rhaglengell benodol %1."
 
-#: kutils/kcmoduleloader.cpp:132
+#: tdeutils/tdecmoduleloader.cpp:132
 msgid "The module %1 could not be found."
 msgstr "Methu canfod y modiwl %1."
 
-#: kutils/kcmoduleloader.cpp:133
+#: tdeutils/tdecmoduleloader.cpp:133
 msgid ""
 "<qt>"
 "<p>The diagnostics is:"
@@ -8441,15 +8441,15 @@ msgstr ""
 "<p>Y diagnosteg yw:"
 "<br>Ni allwyd dod o hyd i'r ffeil benbwrdd %1.</qt>"
 
-#: kutils/kcmoduleloader.cpp:152
+#: tdeutils/tdecmoduleloader.cpp:152
 msgid "The module %1 could not be loaded."
 msgstr "Methu llwytho'r modiwl %1."
 
-#: kutils/kcmoduleloader.cpp:171
+#: tdeutils/tdecmoduleloader.cpp:171
 msgid "The module %1 is not a valid configuration module."
 msgstr "Nid modiwl ffurfweddu dilys yw modiwl %1."
 
-#: kutils/kcmoduleloader.cpp:172
+#: tdeutils/tdecmoduleloader.cpp:172
 msgid ""
 "<qt>"
 "<p>The diagnostics is:"
@@ -8459,11 +8459,11 @@ msgstr ""
 "<p>Y diagnosteg yw: "
 "<br>Nid yw'r ffeil benbwrdd %1 yn penodi rhaglengell.</qt>"
 
-#: kutils/kcmoduleloader.cpp:206
+#: tdeutils/tdecmoduleloader.cpp:206
 msgid "There was an error loading the module."
 msgstr "Gwall wrth lwytho'r modiwl."
 
-#: kutils/kcmoduleloader.cpp:206 kutils/kcmoduleloader.cpp:274
+#: tdeutils/tdecmoduleloader.cpp:206 tdeutils/tdecmoduleloader.cpp:274
 msgid ""
 "<qt>"
 "<p>The diagnostics is:"
@@ -8489,23 +8489,23 @@ msgstr ""
 "enwi yn y neges gwall.  Os nid yw hyn yn gweithio, ystyriwch cysylltu â'ch "
 "dosbarthwr neu pecynnwr.</p></qt>"
 
-#: kutils/kreplace.cpp:49
+#: tdeutils/kreplace.cpp:49
 msgid "&All"
 msgstr "&Popeth"
 
-#: kutils/kreplace.cpp:49
+#: tdeutils/kreplace.cpp:49
 msgid "&Skip"
 msgstr "&Hepgor"
 
-#: kutils/kreplace.cpp:58
+#: tdeutils/kreplace.cpp:58
 msgid "Replace '%1' with '%2'?"
 msgstr "Amnewid '%1' efo '%2'?"
 
-#: kutils/kreplace.cpp:105 kutils/kreplace.cpp:300
+#: tdeutils/kreplace.cpp:105 tdeutils/kreplace.cpp:300
 msgid "No text was replaced."
 msgstr "Ni amnewidwyd testun. "
 
-#: kutils/kreplace.cpp:107 kutils/kreplace.cpp:302
+#: tdeutils/kreplace.cpp:107 tdeutils/kreplace.cpp:302
 #, c-format
 msgid ""
 "_n: 1 replacement done.\n"
@@ -8514,27 +8514,27 @@ msgstr ""
 "%n o amnewidau wedi eu gwneud. \n"
 "%n o amnewidau wedi eu gwneud."
 
-#: kutils/kfind.cpp:650 kutils/kreplace.cpp:307
+#: tdeutils/kfind.cpp:650 tdeutils/kreplace.cpp:307
 msgid "Beginning of document reached."
 msgstr " Wedi cyrraedd diwedd y ddogfen."
 
-#: kutils/kfind.cpp:652 kutils/kreplace.cpp:309
+#: tdeutils/kfind.cpp:652 tdeutils/kreplace.cpp:309
 msgid "End of document reached."
 msgstr " Wedi cyrraedd diwedd y ddogfen."
 
-#: kutils/kreplace.cpp:316
+#: tdeutils/kreplace.cpp:316
 msgid "Do you want to restart search from the end?"
 msgstr "Ydych eisiau ail-ddechrau'r chwiliad o'r diwedd?"
 
-#: kutils/kreplace.cpp:317
+#: tdeutils/kreplace.cpp:317
 msgid "Do you want to restart search at the beginning?"
 msgstr "Ydych eisiau ail-ddechrau'r chwiliad o'r dechrau?"
 
-#: kutils/kreplace.cpp:319
+#: tdeutils/kreplace.cpp:319
 msgid "Restart"
 msgstr "Ail-gychwyn"
 
-#: kutils/kpluginselector.cpp:111
+#: tdeutils/kpluginselector.cpp:111
 msgid ""
 "<qt>"
 "<table>"
@@ -8566,36 +8566,36 @@ msgstr ""
 "<td><b>Trwydded:</b></td>"
 "<td>%4</td></tr></table></qt>"
 
-#: kutils/kpluginselector.cpp:536
+#: tdeutils/kpluginselector.cpp:536
 msgid "(This plugin is not configurable)"
 msgstr "(Nid yw'r ategyn yma yn ffurfweddadwy)"
 
-#: kutils/kreplacedialog.cpp:142
+#: tdeutils/kreplacedialog.cpp:142
 msgid "Your replacement string is referencing a capture greater than '\\%1', "
 msgstr ""
 
-#: kutils/kreplacedialog.cpp:145
+#: tdeutils/kreplacedialog.cpp:145
 #, c-format
 msgid ""
 "_n: but your pattern only defines 1 capture.\n"
 "but your pattern only defines %n captures."
 msgstr ""
 
-#: kutils/kreplacedialog.cpp:146
+#: tdeutils/kreplacedialog.cpp:146
 msgid "but your pattern defines no captures."
 msgstr ""
 
-#: kutils/kreplacedialog.cpp:147
+#: tdeutils/kreplacedialog.cpp:147
 msgid ""
 "\n"
 "Please correct."
 msgstr ""
 
-#: kutils/kfind.cpp:53
+#: tdeutils/kfind.cpp:53
 msgid "<qt>Find next occurrence of '<b>%1</b>'?</qt>"
 msgstr "<qt>Canfod y digwyddiad nesaf o '<b>%1</b>'?</qt>"
 
-#: kutils/kfind.cpp:623 kutils/kfind.cpp:643
+#: tdeutils/kfind.cpp:623 tdeutils/kfind.cpp:643
 #, c-format
 msgid ""
 "_n: 1 match found.\n"
@@ -8604,33 +8604,33 @@ msgstr ""
 "Canfuwyd %n o gydweddiadau. \n"
 "Canfuwyd %n o gydweddiadau."
 
-#: kutils/kfind.cpp:625
+#: tdeutils/kfind.cpp:625
 msgid "<qt>No matches found for '<b>%1</b>'.</qt>"
 msgstr "<qt>Ni chanfuwyd cydweddiad am '<b>%1</b>'.</qt>"
 
-#: kutils/kfind.cpp:645
+#: tdeutils/kfind.cpp:645
 msgid "No matches found for '<b>%1</b>'."
 msgstr "Ni chanfuwyd cydweddiad am '<b>%1</b>'."
 
-#: kutils/kfind.cpp:659
+#: tdeutils/kfind.cpp:659
 #, fuzzy
 msgid "Continue from the end?"
 msgstr "Ewch ymlaen a'r gweithrediad"
 
-#: kutils/kfind.cpp:660
+#: tdeutils/kfind.cpp:660
 #, fuzzy
 msgid "Continue from the beginning?"
 msgstr ""
 " Wedi cyrraedd diwedd y ddogfen.\n"
 " Ail-ddechrau o'r dechrau?"
 
-#: kutils/kcmoduleproxy.cpp:212
+#: tdeutils/tdecmoduleproxy.cpp:212
 msgid ""
 "<b>Changes in this section requires root access.</b><br />"
 "Click the \"Administrator Mode\" button to allow modifications."
 msgstr ""
 
-#: kutils/kcmoduleproxy.cpp:219
+#: tdeutils/tdecmoduleproxy.cpp:219
 msgid ""
 "This section requires special permissions, probably for system-wide changes; "
 "therefore, it is required that you provide the root password to be able to "
@@ -8638,110 +8638,110 @@ msgid ""
 "will be disabled."
 msgstr ""
 
-#: kutils/kcmoduleproxy.cpp:251
+#: tdeutils/tdecmoduleproxy.cpp:251
 #, c-format
 msgid ""
 "_: Argument is application name\n"
 "This configuration section is already opened in %1"
 msgstr ""
 
-#: kutils/kcmoduleproxy.cpp:324
+#: tdeutils/tdecmoduleproxy.cpp:324
 msgid "<big>Loading...</big>"
 msgstr "<big>Yn Llwytho</big>"
 
-#: kutils/ksettings/componentsdialog.cpp:48
+#: tdeutils/ksettings/componentsdialog.cpp:48
 msgid "Select Components"
 msgstr "Dewis Cydrannau"
 
-#: kutils/ksettings/dialog.cpp:590
+#: tdeutils/ksettings/dialog.cpp:590
 msgid "Select Components..."
 msgstr "Dewis Cydrannau ..."
 
-#: kresources/resource.cpp:61
+#: tderesources/resource.cpp:61
 msgid "resource"
 msgstr "adnodd"
 
-#: kresources/selectdialog.cpp:95
+#: tderesources/selectdialog.cpp:95
 msgid "There is no resource available!"
 msgstr "Nid oes adnodd ar gael.!"
 
-#: kresources/kcmkresources.cpp:44
+#: tderesources/kcmkresources.cpp:44
 msgid "kcmkresources"
 msgstr "kcmkresources"
 
-#: kresources/kcmkresources.cpp:45
+#: tderesources/kcmkresources.cpp:45
 msgid "TDE Resources configuration module"
 msgstr "Modiwl ffurfweddu Adnoddau TDE."
 
-#: kresources/kcmkresources.cpp:47
+#: tderesources/kcmkresources.cpp:47
 msgid "(c) 2003 Tobias Koenig"
 msgstr "(c) 2003 Tobias Koenig"
 
-#: kresources/configdialog.cpp:40 kresources/configpage.cpp:103
-#: kresources/configpage.cpp:297
+#: tderesources/configdialog.cpp:40 tderesources/configpage.cpp:103
+#: tderesources/configpage.cpp:297
 msgid "Resource Configuration"
 msgstr "Ffurfweddiad Adnoddau"
 
-#: kresources/configdialog.cpp:51
+#: tderesources/configdialog.cpp:51
 msgid "General Settings"
 msgstr "Gosodiadau Cyffredinol"
 
-#: kresources/configdialog.cpp:57
+#: tderesources/configdialog.cpp:57
 msgid "Read-only"
 msgstr "Darllenadwy yn unig"
 
-#: kresources/configdialog.cpp:66
+#: tderesources/configdialog.cpp:66
 msgid "%1 Resource Settings"
 msgstr "%1 Gosodiadau Adnoddau"
 
-#: kresources/configdialog.cpp:107
+#: tderesources/configdialog.cpp:107
 msgid "Please enter a resource name."
 msgstr "Rhowch enw adnodd."
 
-#: kresources/configpage.cpp:120
+#: tderesources/configpage.cpp:120
 msgid "Type"
 msgstr "Math"
 
-#: kresources/configpage.cpp:121
+#: tderesources/configpage.cpp:121
 msgid "Standard"
 msgstr "Safonol"
 
-#: kresources/configpage.cpp:126
+#: tderesources/configpage.cpp:126
 msgid "&Add..."
 msgstr "&Ychwanegu"
 
-#: kresources/configpage.cpp:131
+#: tderesources/configpage.cpp:131
 msgid "&Use as Standard"
 msgstr "&Defnyddio fel Safon"
 
-#: kresources/configpage.cpp:283
+#: tderesources/configpage.cpp:283
 msgid "There is no standard resource! Please select one."
 msgstr "Does dim adnoddau safonol! Dewiswch un."
 
-#: kresources/configpage.cpp:298
+#: tderesources/configpage.cpp:298
 msgid "Please select type of the new resource:"
 msgstr "Dewiswch math yr adnodd newydd."
 
-#: kresources/configpage.cpp:308
+#: tderesources/configpage.cpp:308
 msgid "Unable to create resource of type '%1'."
 msgstr " Methu creu adnodd oddiwrth math '%1'."
 
-#: kresources/configpage.cpp:360
+#: tderesources/configpage.cpp:360
 msgid ""
 "You cannot remove your standard resource! Please select a new standard resource "
 "first."
 msgstr ""
 "Ni ellir dynnu eich adnodd safonol! Dewiswch adnodd safonol newydd yn gyntaf."
 
-#: kresources/configpage.cpp:394 kresources/configpage.cpp:413
+#: tderesources/configpage.cpp:394 tderesources/configpage.cpp:413
 msgid "You cannot use a read-only resource as standard!"
 msgstr "Ni ellir ddefnyddio adnodd sy'n ddarllenadwy yn unig fel un safonol!"
 
-#: kresources/configpage.cpp:418
+#: tderesources/configpage.cpp:418
 msgid "You cannot use an inactive resource as standard!"
 msgstr "Ni ellir ddefnyddio adnodd anweithredol fel un safonol!"
 
-#: kresources/configpage.cpp:498
+#: tderesources/configpage.cpp:498
 msgid ""
 "You cannot deactivate the standard resource. Choose another standard resource "
 "first."
@@ -8749,7 +8749,7 @@ msgstr ""
 "Ni allwch dad-weithredu'r adnodd safonol.  Dewiswch adnodd safonol arall yn "
 "gyntaf."
 
-#: kresources/configpage.cpp:528
+#: tderesources/configpage.cpp:528
 msgid ""
 "There is no valid standard resource! Please select one which is neither "
 "read-only nor inactive."
@@ -9154,154 +9154,154 @@ msgstr "Defnyddioldeb i arddangos negeseuon gwall aRts"
 msgid "Informational"
 msgstr "Gwybodaeth"
 
-#: kcert/kcertpart.cc:90 kcert/kcertpart.cc:113
+#: tdecert/tdecertpart.cc:90 tdecert/tdecertpart.cc:113
 msgid "Invalid certificate!"
 msgstr "Tystysgrif annilys!"
 
-#: kcert/kcertpart.cc:160
+#: tdecert/tdecertpart.cc:160
 msgid "Certificates"
 msgstr "Tystysgrifau"
 
-#: kcert/kcertpart.cc:161
+#: tdecert/tdecertpart.cc:161
 msgid "Signers"
 msgstr "Argraffyddion"
 
-#: kcert/kcertpart.cc:164
+#: tdecert/tdecertpart.cc:164
 msgid "Client"
 msgstr "Dibynnydd:"
 
-#: kcert/kcertpart.cc:170
+#: tdecert/tdecertpart.cc:170
 msgid "Import &All"
 msgstr "Mewnforio &Popeth"
 
-#: kcert/kcertpart.cc:183 kcert/kcertpart.cc:274 kcert/kcertpart.cc:359
+#: tdecert/tdecertpart.cc:183 tdecert/tdecertpart.cc:274 tdecert/tdecertpart.cc:359
 msgid "TDE Secure Certificate Import"
 msgstr "Mewnforio Tystysgrif Ddiogel TDE"
 
-#: kcert/kcertpart.cc:184
+#: tdecert/tdecertpart.cc:184
 msgid "Chain:"
 msgstr "Cadwyn:"
 
-#: kcert/kcertpart.cc:189 kcert/kcertpart.cc:276
+#: tdecert/tdecertpart.cc:189 tdecert/tdecertpart.cc:276
 msgid "Subject:"
 msgstr "Pwnc:"
 
-#: kcert/kcertpart.cc:190 kcert/kcertpart.cc:277
+#: tdecert/tdecertpart.cc:190 tdecert/tdecertpart.cc:277
 msgid "Issued by:"
 msgstr "Cyhoeddwyd gan:"
 
-#: kcert/kcertpart.cc:196 kcert/kcertpart.cc:283
+#: tdecert/tdecertpart.cc:196 tdecert/tdecertpart.cc:283
 msgid "File:"
 msgstr "Ffeil:"
 
-#: kcert/kcertpart.cc:199 kcert/kcertpart.cc:286
+#: tdecert/tdecertpart.cc:199 tdecert/tdecertpart.cc:286
 msgid "File format:"
 msgstr "Fformat ffeil:"
 
-#: kcert/kcertpart.cc:212 kcert/kcertpart.cc:299
+#: tdecert/tdecertpart.cc:212 tdecert/tdecertpart.cc:299
 msgid "State:"
 msgstr "Talaith:"
 
-#: kcert/kcertpart.cc:216 kcert/kcertpart.cc:303
+#: tdecert/tdecertpart.cc:216 tdecert/tdecertpart.cc:303
 msgid "Valid from:"
 msgstr "Yn ddilys o:"
 
-#: kcert/kcertpart.cc:220 kcert/kcertpart.cc:307
+#: tdecert/tdecertpart.cc:220 tdecert/tdecertpart.cc:307
 msgid "Valid until:"
 msgstr "Yn ddilys tan:"
 
-#: kcert/kcertpart.cc:224 kcert/kcertpart.cc:311
+#: tdecert/tdecertpart.cc:224 tdecert/tdecertpart.cc:311
 msgid "Serial number:"
 msgstr "Rhif cyfres:"
 
-#: kcert/kcertpart.cc:227 kcert/kcertpart.cc:314
+#: tdecert/tdecertpart.cc:227 tdecert/tdecertpart.cc:314
 msgid "State"
 msgstr "Talaith"
 
-#: kcert/kcertpart.cc:236 kcert/kcertpart.cc:323
+#: tdecert/tdecertpart.cc:236 tdecert/tdecertpart.cc:323
 msgid "MD5 digest:"
 msgstr "Crynodeb MD5:"
 
-#: kcert/kcertpart.cc:239 kcert/kcertpart.cc:326
+#: tdecert/tdecertpart.cc:239 tdecert/tdecertpart.cc:326
 msgid "Signature:"
 msgstr "Llofnod:"
 
-#: kcert/kcertpart.cc:244 kcert/kcertpart.cc:331
+#: tdecert/tdecertpart.cc:244 tdecert/tdecertpart.cc:331
 msgid "Signature"
 msgstr "Llofnod"
 
-#: kcert/kcertpart.cc:253 kcert/kcertpart.cc:340
+#: tdecert/tdecertpart.cc:253 tdecert/tdecertpart.cc:340
 msgid "Public key:"
 msgstr "Allwedd gyhoeddus:"
 
-#: kcert/kcertpart.cc:259 kcert/kcertpart.cc:346
+#: tdecert/tdecertpart.cc:259 tdecert/tdecertpart.cc:346
 msgid "Public Key"
 msgstr "Allwedd Gyhoeddus"
 
-#: kcert/kcertpart.cc:368
+#: tdecert/tdecertpart.cc:368
 msgid "&Crypto Manager..."
 msgstr "&Rheolwr Cêl-ysgrifaeth..."
 
-#: kcert/kcertpart.cc:369
+#: tdecert/tdecertpart.cc:369
 msgid "&Import"
 msgstr "&Mewnforio"
 
-#: kcert/kcertpart.cc:370
+#: tdecert/tdecertpart.cc:370
 msgid "&Save..."
 msgstr "&Cadw..."
 
-#: kcert/kcertpart.cc:371
+#: tdecert/tdecertpart.cc:371
 msgid "&Done"
 msgstr "&Wedi'i orffen"
 
-#: kcert/kcertpart.cc:418 kcert/kcertpart.cc:440
+#: tdecert/tdecertpart.cc:418 tdecert/tdecertpart.cc:440
 msgid "Save failed."
 msgstr "Methodd y cadw."
 
-#: kcert/kcertpart.cc:418 kcert/kcertpart.cc:440 kcert/kcertpart.cc:455
-#: kcert/kcertpart.cc:460 kcert/kcertpart.cc:496 kcert/kcertpart.cc:532
-#: kcert/kcertpart.cc:566 kcert/kcertpart.cc:600 kcert/kcertpart.cc:730
-#: kcert/kcertpart.cc:741 kcert/kcertpart.cc:746 kcert/kcertpart.cc:759
-#: kcert/kcertpart.cc:873
+#: tdecert/tdecertpart.cc:418 tdecert/tdecertpart.cc:440 tdecert/tdecertpart.cc:455
+#: tdecert/tdecertpart.cc:460 tdecert/tdecertpart.cc:496 tdecert/tdecertpart.cc:532
+#: tdecert/tdecertpart.cc:566 tdecert/tdecertpart.cc:600 tdecert/tdecertpart.cc:730
+#: tdecert/tdecertpart.cc:741 tdecert/tdecertpart.cc:746 tdecert/tdecertpart.cc:759
+#: tdecert/tdecertpart.cc:873
 msgid "Certificate Import"
 msgstr "Mewnforio Tystysgrif"
 
-#: kcert/kcertpart.cc:455
+#: tdecert/tdecertpart.cc:455
 #, fuzzy
 msgid "You do not seem to have compiled TDE with SSL support."
 msgstr "Ymddengys nad ydych wedi crynhoi TDE efo cynnal SSL."
 
-#: kcert/kcertpart.cc:460
+#: tdecert/tdecertpart.cc:460
 #, fuzzy
 msgid "Certificate file is empty."
 msgstr "Mewnforio Tystysgrif"
 
-#: kcert/kcertpart.cc:490
+#: tdecert/tdecertpart.cc:490
 msgid "Certificate Password"
 msgstr "Cyfrinair Tystysgrif"
 
-#: kcert/kcertpart.cc:496
+#: tdecert/tdecertpart.cc:496
 msgid "The certificate file could not be loaded. Try a different password?"
 msgstr "Methu llwytho'r ffeil tystysgrif. Ceisio cyfrinair gwahanol?"
 
-#: kcert/kcertpart.cc:496
+#: tdecert/tdecertpart.cc:496
 msgid "Try Different"
 msgstr ""
 
-#: kcert/kcertpart.cc:532 kcert/kcertpart.cc:566
+#: tdecert/tdecertpart.cc:532 tdecert/tdecertpart.cc:566
 msgid "This file cannot be opened."
 msgstr "Ni ellir agor y ffeil yma."
 
-#: kcert/kcertpart.cc:599
+#: tdecert/tdecertpart.cc:599
 #, fuzzy
 msgid "I do not know how to handle this type of file."
 msgstr "Ni wn sut i drin y math yma o ffeil."
 
-#: kcert/kcertpart.cc:619
+#: tdecert/tdecertpart.cc:619
 msgid "0 - Site Certificate"
 msgstr "0 - Tystysgrif Wefan"
 
-#: kcert/kcertpart.cc:729 kcert/kcertpart.cc:745
+#: tdecert/tdecertpart.cc:729 tdecert/tdecertpart.cc:745
 msgid ""
 "A certificate with that name already exists. Are you sure that you wish to "
 "replace it?"
@@ -9309,7 +9309,7 @@ msgstr ""
 "Mae tystysgrif gyda'r un enw yn bodoli'n barod. Ydych chi'n sicr yr ydych "
 "eisiau ei allnewid?"
 
-#: kcert/kcertpart.cc:741 kcert/kcertpart.cc:759
+#: tdecert/tdecertpart.cc:741 tdecert/tdecertpart.cc:759
 msgid ""
 "Certificate has been successfully imported into TDE.\n"
 "You can manage your certificate settings from the TDE Control Center."
@@ -9317,7 +9317,7 @@ msgstr ""
 "Mae'r dystysgrif wedi ei mewnforio yn llwyddiannus i mewn i TDE. \n"
 " Cewch reoli eich gosodiadau tystysgrif o'r Ganolfan Rheoli TDE."
 
-#: kcert/kcertpart.cc:873
+#: tdecert/tdecertpart.cc:873
 msgid ""
 "Certificates have been successfully imported into TDE.\n"
 "You can manage your certificate settings from the TDE Control Center."
@@ -9325,19 +9325,19 @@ msgstr ""
 "Mae tystysgrifau wedi eu mewnforio yn llwyddiannus i mewn i TDE. \n"
 " Cewch reoli eich gosodiadau tystysgrif o'r Ganolfan Rheoli TDE."
 
-#: kcert/kcertpart.cc:879
+#: tdecert/tdecertpart.cc:879
 msgid "TDE Certificate Part"
 msgstr "Rhan Tystysgrif TDE"
 
-#: khtml/khtml_settings.cc:152
+#: tdehtml/tdehtml_settings.cc:152
 msgid "Accept"
 msgstr "Derbyn"
 
-#: khtml/khtml_settings.cc:153
+#: tdehtml/tdehtml_settings.cc:153
 msgid "Reject"
 msgstr "Gwrthod"
 
-#: khtml/khtml_settings.cc:779
+#: tdehtml/tdehtml_settings.cc:779
 #, fuzzy
 msgid "Filter error"
 msgstr "Gwall Ffeil"
@@ -9602,7 +9602,7 @@ msgid "Includes/Headers"
 msgstr ""
 
 #: tdecore/tde-config.cpp.in:178
-msgid "Translation files for KLocale"
+msgid "Translation files for TDELocale"
 msgstr ""
 
 #: tdecore/tde-config.cpp.in:179
@@ -11120,8 +11120,8 @@ msgstr " gwall yn y datganiad testun o endid allanol "
 #~ msgid "Test Distribution Lists"
 #~ msgstr "Arbrofi Rhestrau Dosbarthu"
 
-#~ msgid "Test libkabc Lock"
-#~ msgstr "Arbrofi Clo libkabc"
+#~ msgid "Test libtdeabc Lock"
+#~ msgstr "Arbrofi Clo libtdeabc"
 
 #~ msgid "Allow selection of multiple addressees"
 #~ msgstr "Caniatàu dewis derbynnyddion lluosol"
diff --git a/tde-i18n-cy/messages/tdelibs/tdeprint.po b/tde-i18n-cy/messages/tdelibs/tdeprint.po
index 7794b353e14..98d7cccbffe 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeprint.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeprint.po
@@ -1647,7 +1647,7 @@ msgstr ""
 msgid "Additional Tags"
 msgstr "Tagiau Ychwanegol"
 
-#: cups/kptagspage.cpp:82 kfilelist.cpp:101 kpfilterpage.cpp:406
+#: cups/kptagspage.cpp:82 tdefilelist.cpp:101 kpfilterpage.cpp:406
 #: management/kmjobviewer.cpp:237 management/kmwend.cpp:51
 #: management/kxmlcommanddlg.cpp:141 management/kxmlcommanddlg.cpp:545
 msgid "Name"
@@ -3564,7 +3564,7 @@ msgstr "Esboniad"
 msgid "Confirmation"
 msgstr "Gwybodaeth"
 
-#: kfilelist.cpp:102 management/kmwend.cpp:50 management/kmwend.cpp:106
+#: tdefilelist.cpp:102 management/kmwend.cpp:50 management/kmwend.cpp:106
 #: management/kmwend.cpp:109
 msgid "Type"
 msgstr "Math"
@@ -3784,11 +3784,11 @@ msgstr "Ychwanegu dewisiad"
 msgid "Delete item"
 msgstr " Dileu eitem"
 
-#: kfilelist.cpp:135 management/kxmlcommanddlg.cpp:157
+#: tdefilelist.cpp:135 management/kxmlcommanddlg.cpp:157
 msgid "Move up"
 msgstr "Symud i fyny"
 
-#: kfilelist.cpp:142 management/kxmlcommanddlg.cpp:158
+#: tdefilelist.cpp:142 management/kxmlcommanddlg.cpp:158
 msgid "Move down"
 msgstr "Symud i lawr"
 
@@ -4522,7 +4522,7 @@ msgstr "Gosodiadau annilys. %1"
 msgid "Configuring %1"
 msgstr "Wrthi'n ffurfweddu %1"
 
-#: kfilelist.cpp:42
+#: tdefilelist.cpp:42
 msgid ""
 " <qt> <b>Add File button</b> "
 "<p>This button calls the <em>'File Open'</em> dialog to let you select a file "
@@ -4534,7 +4534,7 @@ msgid ""
 "\"multi-file job\" to the printing system. </ul> </qt>"
 msgstr ""
 
-#: kfilelist.cpp:54
+#: tdefilelist.cpp:54
 #, fuzzy
 msgid ""
 " <qt> <b>Remove File button</b> "
@@ -4544,7 +4544,7 @@ msgstr ""
 " <qt> Mae'r botwm yma yn gwaredu'r ffeil amlygedig o'r rhestr o ffeiliau i'w "
 "argraffu.</qt>"
 
-#: kfilelist.cpp:59
+#: tdefilelist.cpp:59
 #, fuzzy
 msgid ""
 " <qt> <b>Move File Up button</b> "
@@ -4557,7 +4557,7 @@ msgstr ""
 "argraffu.</p> "
 "<p>Mewn effaith, newida hwn trefn argraffu'r ffeiliau.</p> </qt>"
 
-#: kfilelist.cpp:66
+#: tdefilelist.cpp:66
 #, fuzzy
 msgid ""
 " <qt> <b>Move File Down button</b> "
@@ -4570,7 +4570,7 @@ msgstr ""
 "argraffu.</p> "
 "<p>Mewn effaith, newida hwn trefn argraffu'r ffeiliau.</p> </qt>"
 
-#: kfilelist.cpp:73
+#: tdefilelist.cpp:73
 #, fuzzy
 msgid ""
 " <qt> <b>File Open button</b> "
@@ -4585,7 +4585,7 @@ msgstr ""
 "<p>Os agorwch ffeiliau, bydd TDEArgraffu yn defnyddio'r cymhwysiad sy'n "
 "cydweddu math MIME y ffeil.</p> </qt>"
 
-#: kfilelist.cpp:82
+#: tdefilelist.cpp:82
 msgid ""
 " <qt> <b>File List view</b> "
 "<p>This list displays all the files you selected for printing. You can see the "
@@ -4602,23 +4602,23 @@ msgid ""
 "</qt>"
 msgstr ""
 
-#: kfilelist.cpp:103
+#: tdefilelist.cpp:103
 msgid "Path"
 msgstr "Llwybr"
 
-#: kfilelist.cpp:115
+#: tdefilelist.cpp:115
 msgid "Add file"
 msgstr "Ychwanegu  ffeil"
 
-#: kfilelist.cpp:121
+#: tdefilelist.cpp:121
 msgid "Remove file"
 msgstr "Gwaredu ffeil"
 
-#: kfilelist.cpp:128
+#: tdefilelist.cpp:128
 msgid "Open file"
 msgstr "Agor ffeil"
 
-#: kfilelist.cpp:149
+#: tdefilelist.cpp:149
 msgid ""
 "Drag file(s) here or use the button to open a file dialog. Leave empty for <b>"
 "&lt;STDIN&gt;</b>."
@@ -8431,15 +8431,15 @@ msgstr "E&raill"
 #~ msgid "Can not find io-slave for protocol '%1'."
 #~ msgstr "Methu canfod gwas-io i brotocol '%1'."
 
-#~ msgid "Can't talk to klauncher"
+#~ msgid "Can't talk to tdelauncher"
 #~ msgstr "Methu siarad efo Klauncher"
 
 #~ msgid ""
 #~ "Unable to create io-slave:\n"
-#~ "klauncher said: %1"
+#~ "tdelauncher said: %1"
 #~ msgstr ""
 #~ "Methu creu gwas-io:\n"
-#~ " dywedodd klauncher: %1"
+#~ " dywedodd tdelauncher: %1"
 
 #~ msgid "telnet service"
 #~ msgstr "gwasanaeth telnet"
@@ -8635,8 +8635,8 @@ msgstr "E&raill"
 #~ msgid "Supported MimeTypes:"
 #~ msgstr "Mathau Mime a Gynhelir"
 
-#~ msgid "kfile"
-#~ msgstr "kfile"
+#~ msgid "tdefile"
+#~ msgstr "tdefile"
 
 #~ msgid "A commandline tool to read and modify metadata of files."
 #~ msgstr "Erfyn llinell gorchymyn i ddarllen a newid metadata ffeiliau."
@@ -9606,8 +9606,8 @@ msgstr "E&raill"
 #~ msgid "Private"
 #~ msgstr "Preivat"
 
-#~ msgid "Error in libkabc"
-#~ msgstr "Gwall yn libkabc"
+#~ msgid "Error in libtdeabc"
+#~ msgstr "Gwall yn libtdeabc"
 
 #~ msgid "List of Emails"
 #~ msgstr "Rhestr o Gyfeiriadau Ebost"
@@ -10094,7 +10094,7 @@ msgstr "E&raill"
 #~ msgid "Could not register with DCOP.\n"
 #~ msgstr "Methu cofrestru gyda DCOP:\n"
 
-#~ msgid "KLauncher could not be reached via DCOP.\n"
+#~ msgid "TDELauncher could not be reached via DCOP.\n"
 #~ msgstr "Methu cyrraedd Klauncher drwy DCOP.\n"
 
 #~ msgid "Desktop %1"
@@ -12377,8 +12377,8 @@ msgstr "E&raill"
 #~ msgid "Print %1"
 #~ msgstr "Argraffu %1"
 
-#~ msgid "KHTML"
-#~ msgstr "KHTML"
+#~ msgid "TDEHTML"
+#~ msgstr "TDEHTML"
 
 #~ msgid "Embeddable HTML component"
 #~ msgstr "Cydran HTML mewnadeiladedig"
@@ -12470,10 +12470,10 @@ msgstr "E&raill"
 #~ msgstr "Analluogir"
 
 #~ msgid ""
-#~ "A script on this page is causing KHTML to freeze. If it continues to run, other applications may become less responsive.\n"
+#~ "A script on this page is causing TDEHTML to freeze. If it continues to run, other applications may become less responsive.\n"
 #~ "Do you want to abort the script?"
 #~ msgstr ""
-#~ "Mae sgript ar y dudalen yma yn achosi i KHTML rewi.  Os mae'n parhau rhedeg, efallai bydd cymhwysiadau eraill yn dechrau mynd yn llai ymatebol.\n"
+#~ "Mae sgript ar y dudalen yma yn achosi i TDEHTML rewi.  Os mae'n parhau rhedeg, efallai bydd cymhwysiadau eraill yn dechrau mynd yn llai ymatebol.\n"
 #~ "Ydych eisiau terfynu'r sgript?"
 
 #~ msgid "JavaScript"
diff --git a/tde-i18n-cy/messages/tdelibs/tdetexteditor_autobookmarker.po b/tde-i18n-cy/messages/tdelibs/tdetexteditor_autobookmarker.po
index 2e811dfc941..43486527932 100644
--- a/tde-i18n-cy/messages/tdelibs/tdetexteditor_autobookmarker.po
+++ b/tde-i18n-cy/messages/tdelibs/tdetexteditor_autobookmarker.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdelibs/ktexteditor_autobookmarker.po\n"
+"Project-Id-Version: ../cy/messages//tdelibs/tdetexteditor_autobookmarker.po\n"
 "POT-Creation-Date: 2005-06-14 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdetexteditor_docwordcompletion.po b/tde-i18n-cy/messages/tdelibs/tdetexteditor_docwordcompletion.po
index 5c4092df889..bc2e51e9b53 100644
--- a/tde-i18n-cy/messages/tdelibs/tdetexteditor_docwordcompletion.po
+++ b/tde-i18n-cy/messages/tdelibs/tdetexteditor_docwordcompletion.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdelibs/ktexteditor_docwordcompletion.po\n"
+"Project-Id-Version: ../cy/messages//tdelibs/tdetexteditor_docwordcompletion.po\n"
 "POT-Creation-Date: 2007-02-18 02:38+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdetexteditor_insertfile.po b/tde-i18n-cy/messages/tdelibs/tdetexteditor_insertfile.po
index 9a339157c1d..e32343a8da3 100644
--- a/tde-i18n-cy/messages/tdelibs/tdetexteditor_insertfile.po
+++ b/tde-i18n-cy/messages/tdelibs/tdetexteditor_insertfile.po
@@ -1,4 +1,4 @@
-# Translation of ktexteditor_insertfile.po to Cymraeg
+# Translation of tdetexteditor_insertfile.po to Cymraeg
 # TDE yn Gymraeg.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ktexteditor_insertfile\n"
+"Project-Id-Version: tdetexteditor_insertfile\n"
 "POT-Creation-Date: 2005-06-14 01:24+0200\n"
 "PO-Revision-Date: 2003-07-16 20:35+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdetexteditor_isearch.po b/tde-i18n-cy/messages/tdelibs/tdetexteditor_isearch.po
index 2ab92b7c4a8..41c0f42e5ff 100644
--- a/tde-i18n-cy/messages/tdelibs/tdetexteditor_isearch.po
+++ b/tde-i18n-cy/messages/tdelibs/tdetexteditor_isearch.po
@@ -1,4 +1,4 @@
-# Translation of ktexteditor_isearch.po to Cymraeg
+# Translation of tdetexteditor_isearch.po to Cymraeg
 # TDE yn Gymraeg.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ktexteditor_isearch\n"
+"Project-Id-Version: tdetexteditor_isearch\n"
 "POT-Creation-Date: 2007-05-29 02:14+0200\n"
 "PO-Revision-Date: 2003-07-16 20:36+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -130,7 +130,7 @@ msgstr "Cydweddiad Nesaf o'r Chwiliad Cynyddol"
 msgid "Previous Incremental Search Match"
 msgstr "Cydweddiad Cynt o'r Chwiliad Cynyddol"
 
-#. i18n: file ktexteditor_isearchui.rc line 9
+#. i18n: file tdetexteditor_isearchui.rc line 9
 #: rc.cpp:6
 #, no-c-format
 msgid "Search Toolbar"
diff --git a/tde-i18n-cy/messages/tdelibs/tdetexteditor_kdatatool.po b/tde-i18n-cy/messages/tdelibs/tdetexteditor_kdatatool.po
index 87771f5df58..afae0fbc984 100644
--- a/tde-i18n-cy/messages/tdelibs/tdetexteditor_kdatatool.po
+++ b/tde-i18n-cy/messages/tdelibs/tdetexteditor_kdatatool.po
@@ -1,4 +1,4 @@
-# Translation of ktexteditor_kdatatool.po to Cymraeg
+# Translation of tdetexteditor_kdatatool.po to Cymraeg
 # TDE yn Gymraeg.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ktexteditor_kdatatool\n"
+"Project-Id-Version: tdetexteditor_kdatatool\n"
 "POT-Creation-Date: 2005-05-18 21:23+0200\n"
 "PO-Revision-Date: 2003-07-16 20:37+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_au.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_au.po
index f2f3c628a9e..f889a8d39c4 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_au.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_au.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_au.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_au.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,58 +9,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_au.cpp:55
+#: tdefile_au.cpp:55
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_au.cpp:59
+#: tdefile_au.cpp:59
 msgid "Length"
 msgstr "Hyd"
 
-#: kfile_au.cpp:62
+#: tdefile_au.cpp:62
 msgid "Sample Rate"
 msgstr "Cyflymdra Enghreifftio"
 
-#: kfile_au.cpp:65
+#: tdefile_au.cpp:65
 msgid "Channels"
 msgstr "Sianeli"
 
-#: kfile_au.cpp:67
+#: tdefile_au.cpp:67
 msgid "Encoding"
 msgstr "Amgodiad"
 
-#: kfile_au.cpp:125
+#: tdefile_au.cpp:125
 msgid "8-bit ISDN u-law"
 msgstr ""
 
-#: kfile_au.cpp:129
+#: tdefile_au.cpp:129
 msgid "8-bit linear PCM [REF-PCM]"
 msgstr ""
 
-#: kfile_au.cpp:133
+#: tdefile_au.cpp:133
 msgid "16-bit linear PCM"
 msgstr ""
 
-#: kfile_au.cpp:137
+#: tdefile_au.cpp:137
 msgid "24-bit linear PCM"
 msgstr ""
 
-#: kfile_au.cpp:141
+#: tdefile_au.cpp:141
 msgid "32-bit linear PCM"
 msgstr ""
 
-#: kfile_au.cpp:145
+#: tdefile_au.cpp:145
 msgid "32-bit IEEE floating point"
 msgstr ""
 
-#: kfile_au.cpp:149
+#: tdefile_au.cpp:149
 msgid "64-bit IEEE floating point"
 msgstr ""
 
-#: kfile_au.cpp:153
+#: tdefile_au.cpp:153
 msgid "8-bit ISDN u-law compressed"
 msgstr ""
 
-#: kfile_au.cpp:157
+#: tdefile_au.cpp:157
 msgid "Unknown"
 msgstr "Anhysbys"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_avi.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_avi.po
index ad2cca1862f..94746474706 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_avi.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_avi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_avi.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_avi.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,38 +9,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_avi.cpp:57
+#: tdefile_avi.cpp:57
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_avi.cpp:61
+#: tdefile_avi.cpp:61
 msgid "Length"
 msgstr "Hyd"
 
-#: kfile_avi.cpp:64
+#: tdefile_avi.cpp:64
 msgid "Resolution"
 msgstr "Cydraniad"
 
-#: kfile_avi.cpp:66
+#: tdefile_avi.cpp:66
 msgid "Frame Rate"
 msgstr ""
 
-#: kfile_avi.cpp:67
+#: tdefile_avi.cpp:67
 msgid "fps"
 msgstr "fps"
 
-#: kfile_avi.cpp:69
+#: tdefile_avi.cpp:69
 msgid "Video Codec"
 msgstr ""
 
-#: kfile_avi.cpp:70
+#: tdefile_avi.cpp:70
 msgid "Audio Codec"
 msgstr ""
 
-#: kfile_avi.cpp:438 kfile_avi.cpp:527
+#: tdefile_avi.cpp:438 tdefile_avi.cpp:527
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: kfile_avi.cpp:532
+#: tdefile_avi.cpp:532
 msgid "None"
 msgstr "Dim"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_flac.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_flac.po
index 8462bbfc91e..ab30c575b63 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_flac.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_flac.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_flac.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_flac.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,82 +9,82 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_flac.cpp:79
+#: tdefile_flac.cpp:79
 msgid "Comment"
 msgstr "Sylwad"
 
-#: kfile_flac.cpp:85
+#: tdefile_flac.cpp:85
 msgid "Artist"
 msgstr "Artist"
 
-#: kfile_flac.cpp:89
+#: tdefile_flac.cpp:89
 msgid "Title"
 msgstr "Teitl"
 
-#: kfile_flac.cpp:93
+#: tdefile_flac.cpp:93
 msgid "Album"
 msgstr "Album:"
 
-#: kfile_flac.cpp:96
+#: tdefile_flac.cpp:96
 msgid "Genre"
 msgstr ""
 
-#: kfile_flac.cpp:99
+#: tdefile_flac.cpp:99
 msgid "Track Number"
 msgstr "Rhif trac:"
 
-#: kfile_flac.cpp:102
+#: tdefile_flac.cpp:102
 msgid "Date"
 msgstr "Dyddiad"
 
-#: kfile_flac.cpp:105
+#: tdefile_flac.cpp:105
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: kfile_flac.cpp:108
+#: tdefile_flac.cpp:108
 msgid "Organization"
 msgstr "Sefydliad"
 
-#: kfile_flac.cpp:111
+#: tdefile_flac.cpp:111
 msgid "Location"
 msgstr "Lleoliad"
 
-#: kfile_flac.cpp:114
+#: tdefile_flac.cpp:114
 msgid "Copyright"
 msgstr "Hawlfraint"
 
-#: kfile_flac.cpp:123
+#: tdefile_flac.cpp:123
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_flac.cpp:126
+#: tdefile_flac.cpp:126
 msgid "Channels"
 msgstr "Sianeli"
 
-#: kfile_flac.cpp:128
+#: tdefile_flac.cpp:128
 msgid "Sample Rate"
 msgstr "Cyflymdra Enghreifftio"
 
-#: kfile_flac.cpp:129
+#: tdefile_flac.cpp:129
 msgid " Hz"
 msgstr " Hz"
 
-#: kfile_flac.cpp:131
+#: tdefile_flac.cpp:131
 msgid "Sample Width"
 msgstr ""
 
-#: kfile_flac.cpp:132
+#: tdefile_flac.cpp:132
 msgid " bits"
 msgstr ""
 
-#: kfile_flac.cpp:134
+#: tdefile_flac.cpp:134
 msgid "Average Bitrate"
 msgstr ""
 
-#: kfile_flac.cpp:138
+#: tdefile_flac.cpp:138
 msgid " kbps"
 msgstr ""
 
-#: kfile_flac.cpp:140
+#: tdefile_flac.cpp:140
 msgid "Length"
 msgstr "Hyd"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_m3u.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_m3u.po
index b92a62f33a7..29879202a44 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_m3u.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_m3u.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_m3u.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_m3u.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,11 +9,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_m3u.cpp:51
+#: tdefile_m3u.cpp:51
 msgid "Tracks"
 msgstr "Traciau"
 
-#: kfile_m3u.cpp:78
+#: tdefile_m3u.cpp:78
 #, c-format
 msgid "Track %1"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_mp3.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_mp3.po
index d28074e2a69..cb9d600f2a8 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_mp3.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_mp3.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_mp3.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_mp3.po\n"
 "POT-Creation-Date: 2005-05-26 01:24+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,90 +9,90 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_mp3.cpp:56
+#: tdefile_mp3.cpp:56
 msgid "ID3 Tag"
 msgstr ""
 
-#: kfile_mp3.cpp:63
+#: tdefile_mp3.cpp:63
 msgid "Title"
 msgstr "Teitl"
 
-#: kfile_mp3.cpp:67
+#: tdefile_mp3.cpp:67
 msgid "Artist"
 msgstr "Artist"
 
-#: kfile_mp3.cpp:71
+#: tdefile_mp3.cpp:71
 msgid "Album"
 msgstr "Album:"
 
-#: kfile_mp3.cpp:74
+#: tdefile_mp3.cpp:74
 msgid "Year"
 msgstr "Blwyddyn"
 
-#: kfile_mp3.cpp:77
+#: tdefile_mp3.cpp:77
 msgid "Comment"
 msgstr "Sylwad"
 
-#: kfile_mp3.cpp:81
+#: tdefile_mp3.cpp:81
 msgid "Track"
 msgstr ""
 
-#: kfile_mp3.cpp:84
+#: tdefile_mp3.cpp:84
 msgid "Genre"
 msgstr ""
 
-#: kfile_mp3.cpp:89
+#: tdefile_mp3.cpp:89
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_mp3.cpp:91
+#: tdefile_mp3.cpp:91
 msgid "Version"
 msgstr "Fersiwn"
 
-#: kfile_mp3.cpp:92
+#: tdefile_mp3.cpp:92
 msgid "MPEG "
 msgstr ""
 
-#: kfile_mp3.cpp:94
+#: tdefile_mp3.cpp:94
 msgid "Layer"
 msgstr "Haen"
 
-#: kfile_mp3.cpp:95
+#: tdefile_mp3.cpp:95
 msgid "CRC"
 msgstr ""
 
-#: kfile_mp3.cpp:96
+#: tdefile_mp3.cpp:96
 msgid "Bitrate"
 msgstr ""
 
-#: kfile_mp3.cpp:99
+#: tdefile_mp3.cpp:99
 msgid " kbps"
 msgstr ""
 
-#: kfile_mp3.cpp:101
+#: tdefile_mp3.cpp:101
 msgid "Sample Rate"
 msgstr "Cyflymdra Enghreifftio"
 
-#: kfile_mp3.cpp:102
+#: tdefile_mp3.cpp:102
 msgid "Hz"
 msgstr "Hz"
 
-#: kfile_mp3.cpp:104
+#: tdefile_mp3.cpp:104
 msgid "Channels"
 msgstr "Sianeli"
 
-#: kfile_mp3.cpp:105
+#: tdefile_mp3.cpp:105
 msgid "Copyright"
 msgstr "Hawlfraint"
 
-#: kfile_mp3.cpp:106
+#: tdefile_mp3.cpp:106
 msgid "Original"
 msgstr "Gwreiddiol"
 
-#: kfile_mp3.cpp:107
+#: tdefile_mp3.cpp:107
 msgid "Length"
 msgstr "Hyd"
 
-#: kfile_mp3.cpp:110
+#: tdefile_mp3.cpp:110
 msgid "Emphasis"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_mpc.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_mpc.po
index c1c0245f7f4..0c9b57ce2fb 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_mpc.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_mpc.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_mpc.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_mpc.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,78 +9,78 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_mpc.cpp:62
+#: tdefile_mpc.cpp:62
 msgid "Comment"
 msgstr "Sylwad"
 
-#: kfile_mpc.cpp:68
+#: tdefile_mpc.cpp:68
 msgid "Artist"
 msgstr "Artist"
 
-#: kfile_mpc.cpp:72
+#: tdefile_mpc.cpp:72
 msgid "Title"
 msgstr "Teitl"
 
-#: kfile_mpc.cpp:76
+#: tdefile_mpc.cpp:76
 msgid "Album"
 msgstr "Album:"
 
-#: kfile_mpc.cpp:79
+#: tdefile_mpc.cpp:79
 msgid "Genre"
 msgstr ""
 
-#: kfile_mpc.cpp:82
+#: tdefile_mpc.cpp:82
 msgid "Track Number"
 msgstr "Rhif trac:"
 
-#: kfile_mpc.cpp:85
+#: tdefile_mpc.cpp:85
 msgid "Date"
 msgstr "Dyddiad"
 
-#: kfile_mpc.cpp:88
+#: tdefile_mpc.cpp:88
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: kfile_mpc.cpp:91
+#: tdefile_mpc.cpp:91
 msgid "Organization"
 msgstr "Sefydliad"
 
-#: kfile_mpc.cpp:94
+#: tdefile_mpc.cpp:94
 msgid "Location"
 msgstr "Lleoliad"
 
-#: kfile_mpc.cpp:97
+#: tdefile_mpc.cpp:97
 msgid "Copyright"
 msgstr "Hawlfraint"
 
-#: kfile_mpc.cpp:106
+#: tdefile_mpc.cpp:106
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_mpc.cpp:109
+#: tdefile_mpc.cpp:109
 msgid "Channels"
 msgstr "Sianeli"
 
-#: kfile_mpc.cpp:111
+#: tdefile_mpc.cpp:111
 msgid "Version"
 msgstr "Fersiwn"
 
-#: kfile_mpc.cpp:113
+#: tdefile_mpc.cpp:113
 msgid "Sample Rate"
 msgstr "Cyflymdra Enghreifftio"
 
-#: kfile_mpc.cpp:114
+#: tdefile_mpc.cpp:114
 msgid " Hz"
 msgstr " Hz"
 
-#: kfile_mpc.cpp:116
+#: tdefile_mpc.cpp:116
 msgid "Average Bitrate"
 msgstr ""
 
-#: kfile_mpc.cpp:120
+#: tdefile_mpc.cpp:120
 msgid " kbps"
 msgstr ""
 
-#: kfile_mpc.cpp:122
+#: tdefile_mpc.cpp:122
 msgid "Length"
 msgstr "Hyd"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_mpeg.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_mpeg.po
index 53ef7c7c6e9..43b89b6fb32 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_mpeg.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_mpeg.po
@@ -9,42 +9,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_mpeg.cpp:58
+#: tdefile_mpeg.cpp:58
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_mpeg.cpp:62
+#: tdefile_mpeg.cpp:62
 msgid "Length"
 msgstr "Hyd"
 
-#: kfile_mpeg.cpp:65
+#: tdefile_mpeg.cpp:65
 msgid "Resolution"
 msgstr "Cydraniad"
 
-#: kfile_mpeg.cpp:67
+#: tdefile_mpeg.cpp:67
 msgid "Frame Rate"
 msgstr ""
 
-#: kfile_mpeg.cpp:68
+#: tdefile_mpeg.cpp:68
 msgid "fps"
 msgstr "fps"
 
-#: kfile_mpeg.cpp:70
+#: tdefile_mpeg.cpp:70
 msgid "Video Codec"
 msgstr ""
 
-#: kfile_mpeg.cpp:71
+#: tdefile_mpeg.cpp:71
 msgid "Audio Codec"
 msgstr ""
 
-#: kfile_mpeg.cpp:73
+#: tdefile_mpeg.cpp:73
 msgid "Aspect ratio"
 msgstr "Cymhareb agwedd"
 
-#: kfile_mpeg.cpp:556
+#: tdefile_mpeg.cpp:556
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: kfile_mpeg.cpp:563
+#: tdefile_mpeg.cpp:563
 msgid "default"
 msgstr "rhagosodiad"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_ogg.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_ogg.po
index e3bb3c58698..f8dcb8e7deb 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_ogg.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_ogg.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_ogg.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_ogg.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,94 +9,94 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_ogg.cpp:48 kfile_ogg.cpp:85
+#: tdefile_ogg.cpp:48 tdefile_ogg.cpp:85
 msgid "Title"
 msgstr "Teitl"
 
-#: kfile_ogg.cpp:49 kfile_ogg.cpp:123
+#: tdefile_ogg.cpp:49 tdefile_ogg.cpp:123
 msgid "Version"
 msgstr "Fersiwn"
 
-#: kfile_ogg.cpp:50 kfile_ogg.cpp:89
+#: tdefile_ogg.cpp:50 tdefile_ogg.cpp:89
 msgid "Album"
 msgstr "Album:"
 
-#: kfile_ogg.cpp:51
+#: tdefile_ogg.cpp:51
 msgid "Tracknumber"
 msgstr ""
 
-#: kfile_ogg.cpp:52 kfile_ogg.cpp:81
+#: tdefile_ogg.cpp:52 tdefile_ogg.cpp:81
 msgid "Artist"
 msgstr "Artist"
 
-#: kfile_ogg.cpp:53 kfile_ogg.cpp:104
+#: tdefile_ogg.cpp:53 tdefile_ogg.cpp:104
 msgid "Organization"
 msgstr "Sefydliad"
 
-#: kfile_ogg.cpp:54 kfile_ogg.cpp:101
+#: tdefile_ogg.cpp:54 tdefile_ogg.cpp:101
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: kfile_ogg.cpp:55 kfile_ogg.cpp:92
+#: tdefile_ogg.cpp:55 tdefile_ogg.cpp:92
 msgid "Genre"
 msgstr ""
 
-#: kfile_ogg.cpp:56 kfile_ogg.cpp:98
+#: tdefile_ogg.cpp:56 tdefile_ogg.cpp:98
 msgid "Date"
 msgstr "Dyddiad"
 
-#: kfile_ogg.cpp:57 kfile_ogg.cpp:107
+#: tdefile_ogg.cpp:57 tdefile_ogg.cpp:107
 msgid "Location"
 msgstr "Lleoliad"
 
-#: kfile_ogg.cpp:58 kfile_ogg.cpp:110
+#: tdefile_ogg.cpp:58 tdefile_ogg.cpp:110
 msgid "Copyright"
 msgstr "Hawlfraint"
 
-#: kfile_ogg.cpp:75
+#: tdefile_ogg.cpp:75
 msgid "Comment"
 msgstr "Sylwad"
 
-#: kfile_ogg.cpp:95
+#: tdefile_ogg.cpp:95
 msgid "Track Number"
 msgstr "Rhif trac:"
 
-#: kfile_ogg.cpp:120
+#: tdefile_ogg.cpp:120
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_ogg.cpp:124
+#: tdefile_ogg.cpp:124
 msgid "Channels"
 msgstr "Sianeli"
 
-#: kfile_ogg.cpp:126
+#: tdefile_ogg.cpp:126
 msgid "Sample Rate"
 msgstr "Cyflymdra Enghreifftio"
 
-#: kfile_ogg.cpp:127
+#: tdefile_ogg.cpp:127
 msgid " Hz"
 msgstr " Hz"
 
-#: kfile_ogg.cpp:129
+#: tdefile_ogg.cpp:129
 msgid "Upper Bitrate"
 msgstr ""
 
-#: kfile_ogg.cpp:131 kfile_ogg.cpp:135 kfile_ogg.cpp:139 kfile_ogg.cpp:145
+#: tdefile_ogg.cpp:131 tdefile_ogg.cpp:135 tdefile_ogg.cpp:139 tdefile_ogg.cpp:145
 msgid " kbps"
 msgstr ""
 
-#: kfile_ogg.cpp:133
+#: tdefile_ogg.cpp:133
 msgid "Lower Bitrate"
 msgstr ""
 
-#: kfile_ogg.cpp:137
+#: tdefile_ogg.cpp:137
 msgid "Nominal Bitrate"
 msgstr ""
 
-#: kfile_ogg.cpp:141
+#: tdefile_ogg.cpp:141
 msgid "Average Bitrate"
 msgstr ""
 
-#: kfile_ogg.cpp:147
+#: tdefile_ogg.cpp:147
 msgid "Length"
 msgstr "Hyd"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_sid.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_sid.po
index db8d7855158..e2e98fef070 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_sid.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_sid.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_sid.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_sid.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,38 +9,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_sid.cpp:51
+#: tdefile_sid.cpp:51
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_sid.cpp:55
+#: tdefile_sid.cpp:55
 msgid "Title"
 msgstr "Teitl"
 
-#: kfile_sid.cpp:59
+#: tdefile_sid.cpp:59
 msgid "Artist"
 msgstr "Artist"
 
-#: kfile_sid.cpp:63
+#: tdefile_sid.cpp:63
 msgid "Copyright"
 msgstr "Hawlfraint"
 
-#: kfile_sid.cpp:68
+#: tdefile_sid.cpp:68
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_sid.cpp:70
+#: tdefile_sid.cpp:70
 msgid "Version"
 msgstr "Fersiwn"
 
-#: kfile_sid.cpp:71
+#: tdefile_sid.cpp:71
 msgid "PSID v"
 msgstr ""
 
-#: kfile_sid.cpp:73
+#: tdefile_sid.cpp:73
 msgid "Number of Songs"
 msgstr ""
 
-#: kfile_sid.cpp:74
+#: tdefile_sid.cpp:74
 msgid "Start Song"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_theora.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_theora.po
index cb73f121203..31efdb0a1cf 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_theora.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_theora.po
@@ -14,38 +14,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_theora.cpp:72
+#: tdefile_theora.cpp:72
 msgid "Video Details"
 msgstr ""
 
-#: kfile_theora.cpp:74
+#: tdefile_theora.cpp:74
 msgid "Length"
 msgstr "Hyd"
 
-#: kfile_theora.cpp:77
+#: tdefile_theora.cpp:77
 msgid "Resolution"
 msgstr "Cydraniad"
 
-#: kfile_theora.cpp:80
+#: tdefile_theora.cpp:80
 msgid "Frame Rate"
 msgstr ""
 
-#: kfile_theora.cpp:82
+#: tdefile_theora.cpp:82
 msgid "Target Bitrate"
 msgstr ""
 
-#: kfile_theora.cpp:84
+#: tdefile_theora.cpp:84
 msgid "Quality"
 msgstr "Ansawdd"
 
-#: kfile_theora.cpp:88
+#: tdefile_theora.cpp:88
 msgid "Audio Details"
 msgstr ""
 
-#: kfile_theora.cpp:90
+#: tdefile_theora.cpp:90
 msgid "Channels"
 msgstr "Sianeli"
 
-#: kfile_theora.cpp:92
+#: tdefile_theora.cpp:92
 msgid "Sample Rate"
 msgstr "Cyflymdra Enghreifftio"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_wav.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_wav.po
index 682979e8933..00d22d41839 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_wav.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_wav.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdemultimedia/kfile_wav.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_wav.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,30 +9,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_wav.cpp:56
+#: tdefile_wav.cpp:56
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_wav.cpp:60
+#: tdefile_wav.cpp:60
 msgid "Sample Size"
 msgstr ""
 
-#: kfile_wav.cpp:61
+#: tdefile_wav.cpp:61
 msgid " bits"
 msgstr ""
 
-#: kfile_wav.cpp:63
+#: tdefile_wav.cpp:63
 msgid "Sample Rate"
 msgstr "Cyflymdra Enghreifftio"
 
-#: kfile_wav.cpp:64
+#: tdefile_wav.cpp:64
 msgid " Hz"
 msgstr " Hz"
 
-#: kfile_wav.cpp:66
+#: tdefile_wav.cpp:66
 msgid "Channels"
 msgstr "Sianeli"
 
-#: kfile_wav.cpp:68
+#: tdefile_wav.cpp:68
 msgid "Length"
 msgstr "Hyd"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdeio_audiocd.po b/tde-i18n-cy/messages/tdemultimedia/tdeio_audiocd.po
index 51f9d6024af..9ceb85aa1b1 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdeio_audiocd.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdeio_audiocd.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdemultimedia/kio_audiocd.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/tdeio_audiocd.po\n"
 "POT-Creation-Date: 2007-01-19 02:40+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -59,7 +59,7 @@ msgid ""
 "if you have an IDE CD writer) then make sure you check that you have read and "
 "write permissions on the generic SCSI device, which is probably /dev/sg0, "
 "/dev/sg1, etc.. If it still does not work, try typing audiocd:/?device=/dev/sg0 "
-"(or similar) to tell kio_audiocd which device your CD-ROM is."
+"(or similar) to tell tdeio_audiocd which device your CD-ROM is."
 msgstr ""
 
 #: audiocd.cpp:835
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdemid.po b/tde-i18n-cy/messages/tdemultimedia/tdemid.po
index c6d26a8af64..c5fdba729d8 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdemid.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdemid.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdemultimedia/kmid.po\n"
+"Project-Id-Version: ../cy/messages//tdemultimedia/tdemid.po\n"
 "POT-Creation-Date: 2005-08-24 02:38+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -98,202 +98,202 @@ msgstr ""
 msgid "Enter the name of the selected collection:"
 msgstr ""
 
-#: kmid_part.cpp:51
+#: tdemid_part.cpp:51
 msgid "MIDI/Karaoke file player"
 msgstr ""
 
-#: kmid_part.cpp:52
+#: tdemid_part.cpp:52
 msgid "(c) 1997,98,99,2000, Antonio Larrosa Jimenez"
 msgstr ""
 
-#: kmid_part.cpp:55
+#: tdemid_part.cpp:55
 msgid "Original Developer/Maintainer"
 msgstr "Datblygwr/Cynhaliwr Gwreiddiol"
 
-#: kmid_part.cpp:80
+#: tdemid_part.cpp:80
 msgid "Play"
 msgstr "Chwarae"
 
-#: kmid_part.cpp:88
+#: tdemid_part.cpp:88
 msgid "Backward"
 msgstr ""
 
-#: kmid_part.cpp:93 kmidframe.cpp:113
+#: tdemid_part.cpp:93 tdemidframe.cpp:113
 msgid "Forward"
 msgstr "Ymlaen"
 
-#: kmidclient.cpp:101
+#: tdemidclient.cpp:101
 msgid "Tempo:"
 msgstr ""
 
-#: kmidclient.cpp:293
+#: tdemidclient.cpp:293
 msgid "The file %1 does not exist or cannot be opened."
 msgstr ""
 
-#: kmidclient.cpp:296
+#: tdemidclient.cpp:296
 msgid "The file %1 is not a MIDI file."
 msgstr ""
 
-#: kmidclient.cpp:298
+#: tdemidclient.cpp:298
 msgid ""
 "Ticks per quarter note is negative. Please send this file to larrosa@kde.org"
 msgstr ""
 
-#: kmidclient.cpp:300
+#: tdemidclient.cpp:300
 msgid "Not enough memory."
 msgstr ""
 
-#: kmidclient.cpp:302
+#: tdemidclient.cpp:302
 msgid "This file is corrupted or not well built."
 msgstr ""
 
-#: kmidclient.cpp:304
+#: tdemidclient.cpp:304
 msgid "%1 is not a regular file."
 msgstr ""
 
-#: kmidclient.cpp:305
+#: tdemidclient.cpp:305
 msgid "Unknown error message"
 msgstr ""
 
-#: kmidclient.cpp:510
+#: tdemidclient.cpp:510
 msgid "You must load a file before playing it."
 msgstr ""
 
-#: kmidclient.cpp:516
+#: tdemidclient.cpp:516
 msgid "A song is already being played."
 msgstr ""
 
-#: kmidclient.cpp:522
+#: tdemidclient.cpp:522
 msgid ""
 "Could not open /dev/sequencer.\n"
 "Probably there is another program using it."
 msgstr ""
 
-#: kmidframe.cpp:90
+#: tdemidframe.cpp:90
 msgid "&Save Lyrics..."
 msgstr ""
 
-#: kmidframe.cpp:94
+#: tdemidframe.cpp:94
 msgid "&Play"
 msgstr "&Chwarae"
 
-#: kmidframe.cpp:96
+#: tdemidframe.cpp:96
 msgid "P&ause"
 msgstr "S&eibio"
 
-#: kmidframe.cpp:98
+#: tdemidframe.cpp:98
 msgid "&Stop"
 msgstr "&Aros"
 
-#: kmidframe.cpp:101
+#: tdemidframe.cpp:101
 msgid "P&revious Song"
 msgstr ""
 
-#: kmidframe.cpp:104
+#: tdemidframe.cpp:104
 msgid "&Next Song"
 msgstr ""
 
-#: kmidframe.cpp:107
+#: tdemidframe.cpp:107
 msgid "&Loop"
 msgstr "&Cylchu"
 
-#: kmidframe.cpp:110
+#: tdemidframe.cpp:110
 msgid "Rewind"
 msgstr ""
 
-#: kmidframe.cpp:116
+#: tdemidframe.cpp:116
 msgid "&Organize..."
 msgstr ""
 
-#: kmidframe.cpp:120
+#: tdemidframe.cpp:120
 msgid "In Order"
 msgstr ""
 
-#: kmidframe.cpp:121
+#: tdemidframe.cpp:121
 msgid "Shuffle"
 msgstr "Cymysgu"
 
-#: kmidframe.cpp:123
+#: tdemidframe.cpp:123
 msgid "Play Order"
 msgstr "Trefn Canu"
 
-#: kmidframe.cpp:128
+#: tdemidframe.cpp:128
 msgid "Auto-Add to Collection"
 msgstr ""
 
-#: kmidframe.cpp:132
+#: tdemidframe.cpp:132
 msgid "&General MIDI"
 msgstr ""
 
-#: kmidframe.cpp:133
+#: tdemidframe.cpp:133
 msgid "&MT-32"
 msgstr ""
 
-#: kmidframe.cpp:135
+#: tdemidframe.cpp:135
 msgid "File Type"
 msgstr "Math Ffeil"
 
-#: kmidframe.cpp:141
+#: tdemidframe.cpp:141
 msgid "&Text Events"
 msgstr ""
 
-#: kmidframe.cpp:142
+#: tdemidframe.cpp:142
 msgid "&Lyric Events"
 msgstr ""
 
-#: kmidframe.cpp:144
+#: tdemidframe.cpp:144
 msgid "Display Events"
 msgstr ""
 
-#: kmidframe.cpp:150
+#: tdemidframe.cpp:150
 msgid "Automatic Text Chooser"
 msgstr ""
 
-#: kmidframe.cpp:154
+#: tdemidframe.cpp:154
 msgid "Show &Volume Bar"
 msgstr ""
 
-#: kmidframe.cpp:157
+#: tdemidframe.cpp:157
 msgid "Hide &Volume Bar"
 msgstr ""
 
-#: kmidframe.cpp:159
+#: tdemidframe.cpp:159
 msgid "Show &Channel View"
 msgstr ""
 
-#: kmidframe.cpp:162
+#: tdemidframe.cpp:162
 msgid "Hide &Channel View"
 msgstr ""
 
-#: kmidframe.cpp:164
+#: tdemidframe.cpp:164
 msgid "Channel View &Options..."
 msgstr ""
 
-#: kmidframe.cpp:168
+#: tdemidframe.cpp:168
 msgid "&Font Change..."
 msgstr ""
 
-#: kmidframe.cpp:172
+#: tdemidframe.cpp:172
 msgid "MIDI &Setup..."
 msgstr ""
 
-#: kmidframe.cpp:286 kmidframe.cpp:561 midicfgdlg.cpp:117
+#: tdemidframe.cpp:286 tdemidframe.cpp:561 midicfgdlg.cpp:117
 msgid "Only local files are currently supported."
 msgstr "Cynhelir ffeiliau lleol yn unig."
 
-#: kmidframe.cpp:469
+#: tdemidframe.cpp:469
 msgid ""
 "Could not open /dev/sequencer to get some info.\n"
 "Probably there is another program using it."
 msgstr ""
 
-#: kmidframe.cpp:570
+#: tdemidframe.cpp:570
 msgid ""
 "File %1 already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: kmidframe.cpp:571
+#: tdemidframe.cpp:571
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
@@ -317,13 +317,13 @@ msgstr ""
 msgid "None"
 msgstr "Dim"
 
-#. i18n: file kmidui.rc line 7
+#. i18n: file tdemidui.rc line 7
 #: rc.cpp:6
 #, no-c-format
 msgid "&Song"
 msgstr ""
 
-#. i18n: file kmidui.rc line 15
+#. i18n: file tdemidui.rc line 15
 #: rc.cpp:9
 #, no-c-format
 msgid "&Collections"
diff --git a/tde-i18n-cy/messages/tdenetwork/kcmwifi.po b/tde-i18n-cy/messages/tdenetwork/kcmwifi.po
index 4439b9b84b4..0f75eab7bb6 100644
--- a/tde-i18n-cy/messages/tdenetwork/kcmwifi.po
+++ b/tde-i18n-cy/messages/tdenetwork/kcmwifi.po
@@ -691,5 +691,5 @@ msgstr "Canfod Rhyngwyneb yn Ymysgogol"
 #~ msgid "Config &4"
 #~ msgstr "Ffurfwedd &4"
 
-#~ msgid "Helpful information about the kwifimanager_kcmodule module."
-#~ msgstr "Gwybodaeth ddefnyddiol am y modiwl kwifimanager_kcmodule."
+#~ msgid "Helpful information about the kwifimanager_tdecmodule module."
+#~ msgstr "Gwybodaeth ddefnyddiol am y modiwl kwifimanager_tdecmodule."
diff --git a/tde-i18n-cy/messages/tdenetwork/kget.po b/tde-i18n-cy/messages/tdenetwork/kget.po
index 3beeee8ab39..9b1b957b677 100644
--- a/tde-i18n-cy/messages/tdenetwork/kget.po
+++ b/tde-i18n-cy/messages/tdenetwork/kget.po
@@ -144,7 +144,7 @@ msgstr "Lleihau"
 msgid "Sticky"
 msgstr "Gludiog"
 
-#: kfileio.cpp:45
+#: tdefileio.cpp:45
 #, c-format
 msgid ""
 "The specified file does not exist:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "Nid yw'r ffeil benodedig yn bodoli:\n"
 " %1"
 
-#: kfileio.cpp:50
+#: tdefileio.cpp:50
 #, c-format
 msgid ""
 "This is a folder and not a file:\n"
@@ -162,7 +162,7 @@ msgstr ""
 "Cyfeiriadur ac nid ffeil yw hwn:\n"
 " %1"
 
-#: kfileio.cpp:55
+#: tdefileio.cpp:55
 #, c-format
 msgid ""
 "You do not have read permission for the file:\n"
@@ -171,7 +171,7 @@ msgstr ""
 "Nid oes gennych ganiatadau darllen i'r ffeil:\n"
 " %1"
 
-#: kfileio.cpp:65
+#: tdefileio.cpp:65
 #, c-format
 msgid ""
 "Could not read file:\n"
@@ -180,7 +180,7 @@ msgstr ""
 "Methwyd darllen y ffeil:\n"
 " %1"
 
-#: kfileio.cpp:68
+#: tdefileio.cpp:68
 #, c-format
 msgid ""
 "Could not open file:\n"
@@ -189,7 +189,7 @@ msgstr ""
 "Methwyd agor y ffeil:\n"
 " %1"
 
-#: kfileio.cpp:71
+#: tdefileio.cpp:71
 #, c-format
 msgid ""
 "Error while reading file:\n"
@@ -198,11 +198,11 @@ msgstr ""
 "Gwall tra'n darllen y ffeil:\n"
 " %1"
 
-#: kfileio.cpp:85
+#: tdefileio.cpp:85
 msgid "Could only read %1 bytes of %2."
 msgstr "Gellid darllen %1 beit allan o %2 yn unig."
 
-#: kfileio.cpp:110
+#: tdefileio.cpp:110
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -210,7 +210,7 @@ msgstr ""
 "Mae'r ffeil %1 yn bodoli.\n"
 " A ydych am ei amnewid?"
 
-#: kfileio.cpp:127
+#: tdefileio.cpp:127
 msgid ""
 "Failed to make a backup copy of %1.\n"
 "Continue anyway?"
@@ -218,7 +218,7 @@ msgstr ""
 "Methwyd creu copi wrth gefn o %1.\n"
 " Parhau serch hynny?"
 
-#: kfileio.cpp:138 kfileio.cpp:152
+#: tdefileio.cpp:138 tdefileio.cpp:152
 #, c-format
 msgid ""
 "Could not write to file:\n"
@@ -227,7 +227,7 @@ msgstr ""
 "Methwyd ysgrifennu i'r ffeil:\n"
 " %1"
 
-#: kfileio.cpp:141
+#: tdefileio.cpp:141
 #, c-format
 msgid ""
 "Could not open file for writing:\n"
@@ -236,7 +236,7 @@ msgstr ""
 "Methwyd agor y ffeil ar gyfer ysgrifennu:\n"
 " %1"
 
-#: kfileio.cpp:144
+#: tdefileio.cpp:144
 #, c-format
 msgid ""
 "Error while writing file:\n"
@@ -245,149 +245,149 @@ msgstr ""
 "Gwall tra'n ysgrifennu i'r ffeil:\n"
 " %1"
 
-#: kfileio.cpp:155
+#: tdefileio.cpp:155
 msgid "Could only write %1 bytes of %2."
 msgstr "Gellid ysgrifennu %1 beit allan o %2 yn unig."
 
-#: kmainwidget.cpp:168
+#: tdemainwidget.cpp:168
 msgid "Welcome to KGet"
 msgstr "Croeso i KGet"
 
-#: kmainwidget.cpp:183
+#: tdemainwidget.cpp:183
 #, fuzzy
 msgid "Could not create valid socket"
 msgstr "Methwyd creu soced ddilys."
 
-#: kmainwidget.cpp:253 kmainwidget.cpp:1765 kmainwidget.cpp:2247
+#: tdemainwidget.cpp:253 tdemainwidget.cpp:1765 tdemainwidget.cpp:2247
 msgid "Offline"
 msgstr "All-lein"
 
-#: kmainwidget.cpp:254
+#: tdemainwidget.cpp:254
 msgid "Starting offline"
 msgstr "Yn dechrau all-lein"
 
-#: kmainwidget.cpp:348
+#: tdemainwidget.cpp:348
 msgid "&Export Transfer List..."
 msgstr "&Allforio Rhestr Drosglwyddo..."
 
-#: kmainwidget.cpp:349
+#: tdemainwidget.cpp:349
 msgid "&Import Transfer List..."
 msgstr "&Mewnforio Rhestr Drosglwyddo..."
 
-#: kmainwidget.cpp:351
+#: tdemainwidget.cpp:351
 msgid "Import Text &File..."
 msgstr "Mewnforio &Ffeil Destun..."
 
-#: kmainwidget.cpp:357
+#: tdemainwidget.cpp:357
 msgid "&Copy URL to Clipboard"
 msgstr "&Copïo URL i'r Clipfwrdd"
 
-#: kmainwidget.cpp:358
+#: tdemainwidget.cpp:358
 msgid "&Open Individual Window"
 msgstr "&Agor Ffenestr Unigol"
 
-#: kmainwidget.cpp:360
+#: tdemainwidget.cpp:360
 msgid "Move to &Beginning"
 msgstr "Symud i'r &Dechrau"
 
-#: kmainwidget.cpp:362
+#: tdemainwidget.cpp:362
 msgid "Move to &End"
 msgstr "Symud i'r Di&wedd"
 
-#: kmainwidget.cpp:366 transfer.cpp:127
+#: tdemainwidget.cpp:366 transfer.cpp:127
 msgid "&Resume"
 msgstr "&Parhau"
 
-#: kmainwidget.cpp:367 transfer.cpp:129
+#: tdemainwidget.cpp:367 transfer.cpp:129
 msgid "&Pause"
 msgstr "&Seibio"
 
-#: kmainwidget.cpp:369 transfer.cpp:133
+#: tdemainwidget.cpp:369 transfer.cpp:133
 msgid "Re&start"
 msgstr "Ail-&ddechrau"
 
-#: kmainwidget.cpp:371 transfer.cpp:135
+#: tdemainwidget.cpp:371 transfer.cpp:135
 msgid "&Queue"
 msgstr "&Rhesu"
 
-#: kmainwidget.cpp:372 transfer.cpp:137
+#: tdemainwidget.cpp:372 transfer.cpp:137
 msgid "&Timer"
 msgstr "&Amserydd"
 
-#: kmainwidget.cpp:373 transfer.cpp:139
+#: tdemainwidget.cpp:373 transfer.cpp:139
 msgid "De&lay"
 msgstr "&Oediad"
 
-#: kmainwidget.cpp:380
+#: tdemainwidget.cpp:380
 msgid "Use &Animation"
 msgstr "Defnyddio &Bywlunio"
 
-#: kmainwidget.cpp:381
+#: tdemainwidget.cpp:381
 msgid "&Expert Mode"
 msgstr "Modd &Arbenigwr"
 
-#: kmainwidget.cpp:382
+#: tdemainwidget.cpp:382
 msgid "&Use-Last-Folder Mode"
 msgstr "Modd &Defnyddio-Plygell-Ddiwethaf"
 
-#: kmainwidget.cpp:383
+#: tdemainwidget.cpp:383
 msgid "Auto-&Disconnect Mode"
 msgstr "Modd Da&tgysylltu Ymysgogol"
 
-#: kmainwidget.cpp:384
+#: tdemainwidget.cpp:384
 msgid "Auto-S&hutdown Mode"
 msgstr "Modd &Cau-i-lawr Ymysgogol"
 
-#: kmainwidget.cpp:385
+#: tdemainwidget.cpp:385
 msgid "&Offline Mode"
 msgstr "Modd &All-lein"
 
-#: kmainwidget.cpp:386
+#: tdemainwidget.cpp:386
 msgid "Auto-Pas&te Mode"
 msgstr "Modd &Gludo Ymysgogol"
 
-#: kmainwidget.cpp:400
+#: tdemainwidget.cpp:400
 msgid "Show &Log Window"
 msgstr "Dangos Ffenestr &Gofnod"
 
-#: kmainwidget.cpp:401
+#: tdemainwidget.cpp:401
 #, fuzzy
 msgid "Hide &Log Window"
 msgstr "Ffenestr Gofnodion"
 
-#: kmainwidget.cpp:402 kmainwidget.cpp:1906
+#: tdemainwidget.cpp:402 tdemainwidget.cpp:1906
 msgid "Show Drop &Target"
 msgstr "Dangos Tar&ged Ollwng"
 
-#: kmainwidget.cpp:403 kmainwidget.cpp:1934
+#: tdemainwidget.cpp:403 tdemainwidget.cpp:1934
 msgid "Enable &KGet as Konqueror Download Manager"
 msgstr ""
 
-#: kmainwidget.cpp:405 kmainwidget.cpp:1930
+#: tdemainwidget.cpp:405 tdemainwidget.cpp:1930
 msgid "Disable &KGet as Konqueror Download Manager"
 msgstr ""
 
-#: kmainwidget.cpp:414 kmainwidget.cpp:2169
+#: tdemainwidget.cpp:414 tdemainwidget.cpp:2169
 msgid " Transfers: %1 "
 msgstr "Trosglwyddiadau: %1"
 
-#: kmainwidget.cpp:415 kmainwidget.cpp:2170
+#: tdemainwidget.cpp:415 tdemainwidget.cpp:2170
 msgid " Files: %1 "
 msgstr "Ffeiliau: %1"
 
-#: kmainwidget.cpp:416
+#: tdemainwidget.cpp:416
 msgid " Size: %1 KB "
 msgstr "Maint: %1 KB"
 
-#: kmainwidget.cpp:417 kmainwidget.cpp:2172
+#: tdemainwidget.cpp:417 tdemainwidget.cpp:2172
 msgid " Time: %1 "
 msgstr "Amser: %1"
 
-#: kmainwidget.cpp:418
+#: tdemainwidget.cpp:418
 msgid " %1 KB/s "
 msgstr "%1 KB/eil"
 
-#: kmainwidget.cpp:440
+#: tdemainwidget.cpp:440
 msgid ""
 "<b>Resume</b> button starts selected transfers\n"
 "and sets their mode to <i>queued</i>."
@@ -395,7 +395,7 @@ msgstr ""
 "Mae'r botwm <b>Parhau</b> yn dechrau'r trosglwyddiadau\n"
 " dewisiedig ac yn gosod eu moddau'n <i>giwiedig</i>."
 
-#: kmainwidget.cpp:443
+#: tdemainwidget.cpp:443
 msgid ""
 "<b>Pause</b> button stops selected transfers\n"
 "and sets their mode to <i>delayed</i>."
@@ -403,7 +403,7 @@ msgstr ""
 "Mae'r botwm <b>Seibio</b> yn atal y trosglwyddiadau\n"
 " dewisiedig ac yn gosod eu moddau'n <i>oediedig</i>."
 
-#: kmainwidget.cpp:446
+#: tdemainwidget.cpp:446
 msgid ""
 "<b>Delete</b> button removes selected transfers\n"
 "from the list."
@@ -411,7 +411,7 @@ msgstr ""
 "Mae'r botwm <b>Dileu</b> yn gwaredu'r trosglwyddiadau\n"
 " dewisiedig o'r restr."
 
-#: kmainwidget.cpp:449
+#: tdemainwidget.cpp:449
 msgid ""
 "<b>Restart</b> button is a convenience button\n"
 "that simply does Pause and Resume."
@@ -419,7 +419,7 @@ msgstr ""
 "Botwm hwylustod yw <b>Ail-ddechrau</b> sy'n\n"
 " achosi Seibio a Pharhau."
 
-#: kmainwidget.cpp:452
+#: tdemainwidget.cpp:452
 msgid ""
 "<b>Queued</b> button sets the mode of selected\n"
 "transfers to <i>queued</i>.\n"
@@ -433,7 +433,7 @@ msgstr ""
 " Mae'n fotwm radio, gallwch ddewis rhwng\n"
 " tri modd."
 
-#: kmainwidget.cpp:455
+#: tdemainwidget.cpp:455
 msgid ""
 "<b>Scheduled</b> button sets the mode of selected\n"
 "transfers to <i>scheduled</i>.\n"
@@ -447,7 +447,7 @@ msgstr ""
 " Mae'n fotwm radio, gallwch ddewis rhwng\n"
 " tri modd."
 
-#: kmainwidget.cpp:458
+#: tdemainwidget.cpp:458
 msgid ""
 "<b>Delayed</b> button sets the mode of selected\n"
 "transfers to <i>delayed</i>.This also causes the selected transfers to stop.\n"
@@ -462,7 +462,7 @@ msgstr ""
 " Mae'n fotwm radio, gallwch ddewis rhwng\n"
 " tri modd."
 
-#: kmainwidget.cpp:461
+#: tdemainwidget.cpp:461
 msgid ""
 "<b>Preferences</b> button opens a preferences dialog\n"
 "where you can set various options.\n"
@@ -474,7 +474,7 @@ msgstr ""
 "\n"
 " Gellir gosod rhai o'r gosodiadau hyn yn haws drwy ddefnyddio'r bar offer."
 
-#: kmainwidget.cpp:464
+#: tdemainwidget.cpp:464
 msgid ""
 "<b>Log window</b> button opens a log window.\n"
 "The log window records all program events that occur\n"
@@ -484,7 +484,7 @@ msgstr ""
 " Mae'r ffenestr gofnodion yn cofnodi pob digwyddiad rhaglenni sy'n digwydd\n"
 " tra bo KGet yn rhedeg."
 
-#: kmainwidget.cpp:467
+#: tdemainwidget.cpp:467
 msgid ""
 "<b>Paste transfer</b> button adds a URL from\n"
 "the clipboard as a new transfer.\n"
@@ -498,7 +498,7 @@ msgstr ""
 " Fel yma gallwch gopïo a gludo URLau rhwng\n"
 " cymhwysiadau'n hawdd."
 
-#: kmainwidget.cpp:470
+#: tdemainwidget.cpp:470
 msgid ""
 "<b>Expert mode</b> button toggles the expert mode\n"
 "on and off.\n"
@@ -522,7 +522,7 @@ msgstr ""
 " gau i lawr ymysgogol ac yr ydych am i KGet ddatgysylltu\n"
 " neu gau i lawr heb ofyn."
 
-#: kmainwidget.cpp:473
+#: tdemainwidget.cpp:473
 msgid ""
 "<b>Use last folder</b> button toggles the\n"
 "use-last-folder feature on and off.\n"
@@ -538,7 +538,7 @@ msgstr ""
 " a rhoi'r holl drosglwyddiadau newydd a ychwanegir yn yr un cyfeiriadur\n"
 " a roddwyd y trosglwyddiad diwethaf ynddo."
 
-#: kmainwidget.cpp:476
+#: tdemainwidget.cpp:476
 msgid ""
 "<b>Auto disconnect</b> button toggles the auto-disconnect\n"
 "mode on and off.\n"
@@ -559,7 +559,7 @@ msgstr ""
 " <b>Pwysig!</b> Cynnwch y modd arbenigwr pan ydych am i KGet\n"
 " ddatgysylltu heb ofyn."
 
-#: kmainwidget.cpp:479
+#: tdemainwidget.cpp:479
 msgid ""
 "<b>Auto shutdown</b> button toggles the auto-shutdown\n"
 "mode on and off.\n"
@@ -579,7 +579,7 @@ msgstr ""
 " <b>Pwysig!</b> Cynnwch y modd arbenigwr pan ydych am i KGet\n"
 " gau i lawr heb ofyn."
 
-#: kmainwidget.cpp:482
+#: tdemainwidget.cpp:482
 msgid ""
 "<b>Offline mode</b> button toggles the offline mode\n"
 "on and off.\n"
@@ -599,7 +599,7 @@ msgstr ""
 " Gallwch bori all-lein, tra'n gallu ychwanegu\n"
 " trosglwyddiadau newydd yn giwiedig."
 
-#: kmainwidget.cpp:485
+#: tdemainwidget.cpp:485
 msgid ""
 "<b>Auto paste</b> button toggles the auto-paste mode\n"
 "on and off.\n"
@@ -613,7 +613,7 @@ msgstr ""
 " Pan ynghyn bydd KGet yn syllu ar y clipfwrdd ar adegau\n"
 " am URLau a'u gludo'n ymysgogol."
 
-#: kmainwidget.cpp:488
+#: tdemainwidget.cpp:488
 msgid ""
 "<b>Drop target</b> button toggles the window style\n"
 "between a normal window and a drop target.\n"
@@ -633,7 +633,7 @@ msgstr ""
 " Gallwch ddangos/guddio ffenestr arferol drwy glicio\n"
 " ar ffenestr siâp."
 
-#: kmainwidget.cpp:593 kmainwidget.cpp:655
+#: tdemainwidget.cpp:593 tdemainwidget.cpp:655
 msgid ""
 "*.kgt|*.kgt\n"
 "*|All Files"
@@ -641,11 +641,11 @@ msgstr ""
 " *.kgt|*.kgt\n"
 " *|Pob Ffeil"
 
-#: kmainwidget.cpp:707
+#: tdemainwidget.cpp:707
 msgid "Quitting..."
 msgstr "Yn Diweddu..."
 
-#: kmainwidget.cpp:712
+#: tdemainwidget.cpp:712
 #, fuzzy
 msgid ""
 "Some transfers are still running.\n"
@@ -654,20 +654,20 @@ msgstr ""
 "Mae rhai trosglwyddiadau'n dal i redeg.\n"
 " A ydych yn sicr eich bod am gau KGet?"
 
-#: kmainwidget.cpp:823
+#: tdemainwidget.cpp:823
 msgid "Are you sure you want to delete these transfers?"
 msgstr "A ydych yn sicr eich bod am ddileu'r trosglwyddiadau yma?"
 
-#: kmainwidget.cpp:824 kmainwidget.cpp:833 kmainwidget.cpp:2216
-#: kmainwidget.cpp:2486
+#: tdemainwidget.cpp:824 tdemainwidget.cpp:833 tdemainwidget.cpp:2216
+#: tdemainwidget.cpp:2486
 msgid "Question"
 msgstr "Cwestiwn"
 
-#: kmainwidget.cpp:832 transfer.cpp:457
+#: tdemainwidget.cpp:832 transfer.cpp:457
 msgid "Are you sure you want to delete this transfer?"
 msgstr "A ydych yn sicr eich bod am ddileu'r trosglwyddiad yma?"
 
-#: kmainwidget.cpp:860
+#: tdemainwidget.cpp:860
 #, c-format
 msgid ""
 "_n: The transfer you wanted to delete completed before it could be deleted.\n"
@@ -678,20 +678,20 @@ msgstr ""
 "Gorffenodd y %n o drosglwyddiadau yr oeddech eisiau eu dileu cyn iddynt gael eu "
 "dileu."
 
-#: kmainwidget.cpp:876
+#: tdemainwidget.cpp:876
 #, fuzzy
 msgid "Stopping all jobs"
 msgstr "Yn seibio pob swydd"
 
-#: kmainwidget.cpp:970 kmainwidget.cpp:1034
+#: tdemainwidget.cpp:970 tdemainwidget.cpp:1034
 msgid "Open Transfer"
 msgstr "Agor Trosglwyddiad"
 
-#: kmainwidget.cpp:970 kmainwidget.cpp:1034
+#: tdemainwidget.cpp:970 tdemainwidget.cpp:1034
 msgid "Open transfer:"
 msgstr "Agor trosglwyddiad:"
 
-#: kmainwidget.cpp:980 kmainwidget.cpp:2464
+#: tdemainwidget.cpp:980 tdemainwidget.cpp:2464
 #, c-format
 msgid ""
 "Malformed URL:\n"
@@ -700,7 +700,7 @@ msgstr ""
 "URL wedi'i gamffurfio:\n"
 " %1"
 
-#: kmainwidget.cpp:1117 kmainwidget.cpp:1195
+#: tdemainwidget.cpp:1117 tdemainwidget.cpp:1195
 msgid ""
 "Destination file \n"
 "%1\n"
@@ -712,154 +712,154 @@ msgstr ""
 " eisioes yn bodoli.\n"
 " A ydych am ei throsysgrifo?"
 
-#: kmainwidget.cpp:1117 kmainwidget.cpp:1195
+#: tdemainwidget.cpp:1117 tdemainwidget.cpp:1195
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
-#: kmainwidget.cpp:1117 kmainwidget.cpp:1195
+#: tdemainwidget.cpp:1117 tdemainwidget.cpp:1195
 msgid "Do Not Overwrite"
 msgstr "Peidio â Throsysgrifo"
 
-#: kmainwidget.cpp:1144
+#: tdemainwidget.cpp:1144
 msgid "<i>%1</i> has been added."
 msgstr ""
 
-#: kmainwidget.cpp:1279
+#: tdemainwidget.cpp:1279
 msgid "File Already exists"
 msgstr "Ffeil yn Bodoli'n Barod"
 
-#: kmainwidget.cpp:1323
+#: tdemainwidget.cpp:1323
 #, c-format
 msgid ""
 "_n: 1 download has been added.\n"
 "%n downloads have been added."
 msgstr ""
 
-#: kmainwidget.cpp:1379
+#: tdemainwidget.cpp:1379
 msgid "Starting another queued job."
 msgstr "Yn dechrau swydd arall wedi'i resu."
 
-#: kmainwidget.cpp:1510
+#: tdemainwidget.cpp:1510
 #, fuzzy
 msgid "All the downloads are finished."
 msgstr "Lawrlwythiad wedi gorffen"
 
-#: kmainwidget.cpp:1514
+#: tdemainwidget.cpp:1514
 msgid "<i>%1</i> successfully downloaded."
 msgstr ""
 
-#: kmainwidget.cpp:1763
+#: tdemainwidget.cpp:1763
 msgid "Offline mode on."
 msgstr "Modd all-lein ynghyn."
 
-#: kmainwidget.cpp:1768
+#: tdemainwidget.cpp:1768
 msgid "Offline mode off."
 msgstr "Modd all-lein wedi'i ddiffodd"
 
-#: kmainwidget.cpp:1793
+#: tdemainwidget.cpp:1793
 msgid "Expert mode on."
 msgstr "Modd arbenigwr ynghyn."
 
-#: kmainwidget.cpp:1795
+#: tdemainwidget.cpp:1795
 msgid "Expert mode off."
 msgstr "Modd arbenigwr wedi'i ddiffodd"
 
-#: kmainwidget.cpp:1814
+#: tdemainwidget.cpp:1814
 msgid "Use last folder on."
 msgstr "Defnyddio'r blygell ddiwethaf ynghyn."
 
-#: kmainwidget.cpp:1816
+#: tdemainwidget.cpp:1816
 msgid "Use last folder off."
 msgstr "Defnyddio'r blygell ddiwethaf wedi'i diffodd."
 
-#: kmainwidget.cpp:1834
+#: tdemainwidget.cpp:1834
 msgid "Auto disconnect on."
 msgstr "Datgysylltu ymysgogol ynghyn"
 
-#: kmainwidget.cpp:1836
+#: tdemainwidget.cpp:1836
 msgid "Auto disconnect off."
 msgstr "Datgysylltu ymysgogol wedi'i ddiffodd"
 
-#: kmainwidget.cpp:1855
+#: tdemainwidget.cpp:1855
 msgid "Auto shutdown on."
 msgstr "Cau i lawr ymysgogol ynghyn"
 
-#: kmainwidget.cpp:1857
+#: tdemainwidget.cpp:1857
 msgid "Auto shutdown off."
 msgstr "Cau i lawr ymysgogol wedi'i ddiffodd."
 
-#: kmainwidget.cpp:1878
+#: tdemainwidget.cpp:1878
 msgid "Auto paste on."
 msgstr "Gludo ymysgogol ynghyn."
 
-#: kmainwidget.cpp:1881
+#: tdemainwidget.cpp:1881
 msgid "Auto paste off."
 msgstr "Gludo ymysgogol wedi'i ddiffodd."
 
-#: kmainwidget.cpp:1902
+#: tdemainwidget.cpp:1902
 #, fuzzy
 msgid "Hide Drop &Target"
 msgstr "&Targed Ollwng"
 
-#: kmainwidget.cpp:2171
+#: tdemainwidget.cpp:2171
 msgid " Size: %1 "
 msgstr "Maint: %1"
 
-#: kmainwidget.cpp:2173
+#: tdemainwidget.cpp:2173
 msgid " %1/s "
 msgstr "%1/eil"
 
-#: kmainwidget.cpp:2182
+#: tdemainwidget.cpp:2182
 #, fuzzy
 msgid "<b>Transfers:</b> %1 "
 msgstr "Trosglwyddiadau: %1"
 
-#: kmainwidget.cpp:2183
+#: tdemainwidget.cpp:2183
 #, fuzzy
 msgid "<br /><b>Files:</b> %1 "
 msgstr "Ffeiliau: %1"
 
-#: kmainwidget.cpp:2184
+#: tdemainwidget.cpp:2184
 #, fuzzy
 msgid "<br /><b>Size:</b> %1 "
 msgstr "Maint: %1"
 
-#: kmainwidget.cpp:2185
+#: tdemainwidget.cpp:2185
 #, fuzzy
 msgid "<br /><b>Time:</b> %1 "
 msgstr "Amser: %1"
 
-#: kmainwidget.cpp:2186
+#: tdemainwidget.cpp:2186
 msgid "<br /><b>Speed:</b> %1/s"
 msgstr ""
 
-#: kmainwidget.cpp:2215
+#: tdemainwidget.cpp:2215
 msgid "Do you really want to disconnect?"
 msgstr "A ydych wir am ddatgysylltu?"
 
-#: kmainwidget.cpp:2217
+#: tdemainwidget.cpp:2217
 msgid "Disconnect"
 msgstr "Datgysylltu"
 
-#: kmainwidget.cpp:2217
+#: tdemainwidget.cpp:2217
 msgid "Stay Connected"
 msgstr "Aros ar Gyswllt"
 
-#: kmainwidget.cpp:2223
+#: tdemainwidget.cpp:2223
 msgid "Disconnecting..."
 msgstr "Yn Datgysylltu..."
 
-#: kmainwidget.cpp:2241
+#: tdemainwidget.cpp:2241
 #, fuzzy
 msgid "We are online."
 msgstr "Rydym ar-lein!"
 
-#: kmainwidget.cpp:2246
+#: tdemainwidget.cpp:2246
 #, fuzzy
 msgid "We are offline."
 msgstr "Rydym all-lein!"
 
-#: kmainwidget.cpp:2476
+#: tdemainwidget.cpp:2476
 #, c-format
 msgid ""
 "Already saving URL\n"
@@ -868,7 +868,7 @@ msgstr ""
 "Yn cadw'r URL\n"
 " %1 yn barod"
 
-#: kmainwidget.cpp:2486
+#: tdemainwidget.cpp:2486
 msgid ""
 "Already saved URL\n"
 "%1\n"
@@ -878,7 +878,7 @@ msgstr ""
 " %1 yn barod.\n"
 " Lawrlwytho eto?"
 
-#: kmainwidget.cpp:2486
+#: tdemainwidget.cpp:2486
 #, fuzzy
 msgid "Download Again"
 msgstr "Trefnydd Lawrlwytho"
diff --git a/tde-i18n-cy/messages/tdenetwork/kopete.po b/tde-i18n-cy/messages/tdenetwork/kopete.po
index 14fc48b6d5a..eb794c502d2 100644
--- a/tde-i18n-cy/messages/tdenetwork/kopete.po
+++ b/tde-i18n-cy/messages/tdenetwork/kopete.po
@@ -475,15 +475,15 @@ msgid ""
 "<br>please check that address %1 is correct.</qt>"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:294
+#: libkopete/tdeabcpersistence.cpp:294
 msgid "<qt>\"%1\" is not supported by Kopete.</qt>"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:295
+#: libkopete/tdeabcpersistence.cpp:295
 msgid "Could Not Sync with TDE Address Book"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:342
+#: libkopete/tdeabcpersistence.cpp:342
 msgid ""
 "<qt>An address was added to this contact by another application."
 "<br>Would you like to use it in Kopete?"
@@ -491,53 +491,53 @@ msgid ""
 "<br><b>Address:</b> %2</qt>"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:342
+#: libkopete/tdeabcpersistence.cpp:342
 msgid "Import Address From Address Book"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:342
+#: libkopete/tdeabcpersistence.cpp:342
 msgid "Use"
 msgstr "Defnydd"
 
 #. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 304
-#: libkopete/kabcpersistence.cpp:342 rc.cpp:3130
+#: libkopete/tdeabcpersistence.cpp:342 rc.cpp:3130
 #, no-c-format
 msgid "Do Not Use"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:356
+#: libkopete/tdeabcpersistence.cpp:356
 msgid ""
 "<qt>One or more of your accounts using %1 are offline.  Most systems have to be "
 "connected to add contacts.  Please connect these accounts and try again.</qt>"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:357 protocols/gadu/gadusession.cpp:217
+#: libkopete/tdeabcpersistence.cpp:357 protocols/gadu/gadusession.cpp:217
 #: protocols/gadu/gadusession.cpp:230 protocols/gadu/gadusession.cpp:242
 #: protocols/gadu/gadusession.cpp:275 protocols/gadu/gadusession.cpp:289
 #: protocols/gadu/gadusession.cpp:307 protocols/irc/ui/channellist.cpp:304
 msgid "Not Connected"
 msgstr "Heb gysylltu"
 
-#: libkopete/kabcpersistence.cpp:367 protocols/oscar/aim/aimprotocol.cpp:164
+#: libkopete/tdeabcpersistence.cpp:367 protocols/oscar/aim/aimprotocol.cpp:164
 #: protocols/oscar/icq/icqprotocol.cpp:119
 msgid "Choose Account"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:381
+#: libkopete/tdeabcpersistence.cpp:381
 msgid ""
 "<qt>You do not have an account configured for <b>%1</b> "
 "yet.  Please create an account, connect it, and try again.</qt>"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:382
+#: libkopete/tdeabcpersistence.cpp:382
 msgid "No Account Found"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:398
+#: libkopete/tdeabcpersistence.cpp:398
 msgid "<qt>It was not possible to add the contact.</qt>"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:399
+#: libkopete/tdeabcpersistence.cpp:399
 msgid "Could Not Add Contact"
 msgstr ""
 
@@ -1898,15 +1898,15 @@ msgid ""
 "list?"
 msgstr ""
 
-#: kopete/contactlist/kabcexport.cpp:90
+#: kopete/contactlist/tdeabcexport.cpp:90
 msgid "No writeable addressbook resource found."
 msgstr ""
 
-#: kopete/contactlist/kabcexport.cpp:91
+#: kopete/contactlist/tdeabcexport.cpp:91
 msgid "Add or enable one using the TDE Control Center."
 msgstr ""
 
-#: kopete/contactlist/kabcexport.cpp:102
+#: kopete/contactlist/tdeabcexport.cpp:102
 msgid " (already in address book)"
 msgstr ""
 
@@ -3976,19 +3976,19 @@ msgstr "Gweithredoedd &eraill"
 msgid "&Groups"
 msgstr "&Grwpiau"
 
-#. i18n: file ./kopete/contactlist/kabcexport_base.ui line 16
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 16
 #: rc.cpp:920
 #, fuzzy, no-c-format
 msgid "Export Contacts"
 msgstr "Cysylltau"
 
-#. i18n: file ./kopete/contactlist/kabcexport_base.ui line 23
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 23
 #: rc.cpp:923
 #, fuzzy, no-c-format
 msgid "Export Contacts to Address Book"
 msgstr "Cysylltau"
 
-#. i18n: file ./kopete/contactlist/kabcexport_base.ui line 42
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 42
 #: rc.cpp:926
 #, no-c-format
 msgid ""
@@ -3996,37 +3996,37 @@ msgid ""
 "book."
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/kabcexport_base.ui line 61
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 61
 #: rc.cpp:929
 #, fuzzy, no-c-format
 msgid "&Select Address Book"
 msgstr "&Cyfeiriad ebost:"
 
-#. i18n: file ./kopete/contactlist/kabcexport_base.ui line 92
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 92
 #: rc.cpp:932
 #, fuzzy, no-c-format
 msgid "Select Contacts to Export"
 msgstr "&Dileu y Cyswllt"
 
-#. i18n: file ./kopete/contactlist/kabcexport_base.ui line 111
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 111
 #: rc.cpp:935
 #, no-c-format
 msgid "Selected contacts will be added to the TDE address book."
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/kabcexport_base.ui line 117
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 117
 #: rc.cpp:938 rc.cpp:1777
 #, no-c-format
 msgid "Contact"
 msgstr "Cyswllt"
 
-#. i18n: file ./kopete/contactlist/kabcexport_base.ui line 149
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 149
 #: rc.cpp:941
 #, no-c-format
 msgid "Select &All"
 msgstr "Dewis Pope&th"
 
-#. i18n: file ./kopete/contactlist/kabcexport_base.ui line 157
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 157
 #: rc.cpp:944
 #, no-c-format
 msgid "&Deselect All"
diff --git a/tde-i18n-cy/messages/tdenetwork/kwifimanager.po b/tde-i18n-cy/messages/tdenetwork/kwifimanager.po
index 6d0940b8cf2..df33ed205b8 100644
--- a/tde-i18n-cy/messages/tdenetwork/kwifimanager.po
+++ b/tde-i18n-cy/messages/tdenetwork/kwifimanager.po
@@ -426,5 +426,5 @@ msgstr "Nerth signal:"
 #~ msgid "No Wireless Tools"
 #~ msgstr "Dim Erfynnau Di-wifr"
 
-#~ msgid "Helpful information about the kwifimanager_kcmodule module."
-#~ msgstr "Gwybodaeth ddefnyddiol am y modwl kwifimanager_kcmodule."
+#~ msgid "Helpful information about the kwifimanager_tdecmodule module."
+#~ msgstr "Gwybodaeth ddefnyddiol am y modwl kwifimanager_tdecmodule."
diff --git a/tde-i18n-cy/messages/tdenetwork/tdefile_torrent.po b/tde-i18n-cy/messages/tdenetwork/tdefile_torrent.po
index 64d7496c2a5..d34d95bd88e 100644
--- a/tde-i18n-cy/messages/tdenetwork/tdefile_torrent.po
+++ b/tde-i18n-cy/messages/tdenetwork/tdefile_torrent.po
@@ -14,34 +14,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_torrent.cpp:52
+#: tdefile_torrent.cpp:52
 msgid "Torrent Information"
 msgstr ""
 
-#: kfile_torrent.cpp:62
+#: tdefile_torrent.cpp:62
 msgid "Name"
 msgstr "Enw"
 
-#: kfile_torrent.cpp:71
+#: tdefile_torrent.cpp:71
 msgid "Torrent Length"
 msgstr ""
 
-#: kfile_torrent.cpp:80
+#: tdefile_torrent.cpp:80
 msgid "Tracker URL"
 msgstr ""
 
-#: kfile_torrent.cpp:87
+#: tdefile_torrent.cpp:87
 msgid "Date Created"
 msgstr ""
 
-#: kfile_torrent.cpp:94
+#: tdefile_torrent.cpp:94
 msgid "Number of Files"
 msgstr ""
 
-#: kfile_torrent.cpp:101
+#: tdefile_torrent.cpp:101
 msgid "File Piece Length"
 msgstr ""
 
-#: kfile_torrent.cpp:109
+#: tdefile_torrent.cpp:109
 msgid "Comment"
 msgstr "Sylwad"
diff --git a/tde-i18n-cy/messages/tdenetwork/tdefileshare.po b/tde-i18n-cy/messages/tdenetwork/tdefileshare.po
index 40e140e23b8..ee106594d92 100644
--- a/tde-i18n-cy/messages/tdenetwork/tdefileshare.po
+++ b/tde-i18n-cy/messages/tdenetwork/tdefileshare.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdenetwork/kfileshare.po\n"
+"Project-Id-Version: ../cy/messages//tdenetwork/tdefileshare.po\n"
 "POT-Creation-Date: 2008-07-08 01:20+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/tdeio_lan.po b/tde-i18n-cy/messages/tdenetwork/tdeio_lan.po
index 34b3d4cab1f..f062a0035ab 100644
--- a/tde-i18n-cy/messages/tdenetwork/tdeio_lan.po
+++ b/tde-i18n-cy/messages/tdenetwork/tdeio_lan.po
@@ -1,10 +1,10 @@
-# translation of kio_lan.po to Cymraeg
+# translation of tdeio_lan.po to Cymraeg
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_lan\n"
+"Project-Id-Version: tdeio_lan\n"
 "POT-Creation-Date: 2005-03-25 01:18+0100\n"
 "PO-Revision-Date: 2004-01-06 13:32+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kio_lan.cpp:150
+#: tdeio_lan.cpp:150
 #, fuzzy
 msgid ""
 "<qt>The Lisa daemon does not appear to be running."
@@ -25,11 +25,11 @@ msgstr ""
 "<p>Er mwyn defnyddio'r Porydd RhAL (LAN), rhaid i'r gweinyddwr osod yr ellyll "
 "lisa a'i weithredoli."
 
-#: kio_lan.cpp:190 kio_lan.cpp:209 kio_lan.cpp:384
+#: tdeio_lan.cpp:190 tdeio_lan.cpp:209 tdeio_lan.cpp:384
 #, c-format
 msgid "Received unexpected data from %1"
 msgstr "Derbynnwyd data annisgwyl oddiwrth %1"
 
-#: kio_lan.cpp:641
+#: tdeio_lan.cpp:641
 msgid "No hosts allowed in rlan:/ URL"
 msgstr "Ni chaniateir gwesteiwyr mewn URL rlan:/"
diff --git a/tde-i18n-cy/messages/tdepim/kaddressbook.po b/tde-i18n-cy/messages/tdepim/kaddressbook.po
index 999a8b49796..de421341659 100644
--- a/tde-i18n-cy/messages/tdepim/kaddressbook.po
+++ b/tde-i18n-cy/messages/tdepim/kaddressbook.po
@@ -1079,7 +1079,7 @@ msgstr " %1:"
 msgid "Blog feed:"
 msgstr ""
 
-#: addresseeeditorwidget.cpp:292 kabcore.cpp:1356
+#: addresseeeditorwidget.cpp:292 tdeabcore.cpp:1356
 msgid "Select Categories..."
 msgstr "Gosod Categorïau..."
 
@@ -1497,142 +1497,142 @@ msgstr "Pob Maes"
 msgid "All Fields"
 msgstr "Pob Maes"
 
-#: kabcore.cpp:115
+#: tdeabcore.cpp:115
 #, fuzzy
 msgid "Unable to load '%1'."
 msgstr "Methu Cadw"
 
-#: kabcore.cpp:121 ldapsearchdialog.cpp:95 ldapsearchdialog.cpp:307
+#: tdeabcore.cpp:121 ldapsearchdialog.cpp:95 ldapsearchdialog.cpp:307
 msgid "Department"
 msgstr "Adran"
 
-#: kabcore.cpp:124
+#: tdeabcore.cpp:124
 msgid "Profession"
 msgstr "Galwedigaeth"
 
-#: kabcore.cpp:126
+#: tdeabcore.cpp:126
 msgid "Assistant's Name"
 msgstr "Enw'r Cynorthwy-ydd"
 
-#: kabcore.cpp:128
+#: tdeabcore.cpp:128
 msgid "Manager's Name"
 msgstr "Enw'r Rheolwr"
 
-#: kabcore.cpp:130
+#: tdeabcore.cpp:130
 #, fuzzy
 msgid "Partner's Name"
 msgstr "Enw'r Rheolwr"
 
-#: kabcore.cpp:132
+#: tdeabcore.cpp:132
 msgid "Office"
 msgstr "Swyddfa"
 
-#: kabcore.cpp:134
+#: tdeabcore.cpp:134
 msgid "IM Address"
 msgstr "Cyfeiriad NU (IM)"
 
-#: kabcore.cpp:136
+#: tdeabcore.cpp:136
 msgid "Anniversary"
 msgstr "Dathliad"
 
-#: kabcore.cpp:138
+#: tdeabcore.cpp:138
 msgid "Blog"
 msgstr ""
 
-#: kabcore.cpp:297
+#: tdeabcore.cpp:297
 msgid "KAddressBook"
 msgstr "KAddressBook/LlyfrKyfeiriadau"
 
-#: kabcore.cpp:298
+#: tdeabcore.cpp:298
 msgid "The TDE Address Book"
 msgstr "Llyfr Cyfeiriadau TDE"
 
-#: kabcore.cpp:300
+#: tdeabcore.cpp:300
 #, fuzzy
 msgid "(c) 1997-2005, The TDE PIM Team"
 msgstr "(h)(c) 1997-2003, Tîm PIM TDE"
 
-#: kabcore.cpp:301
+#: tdeabcore.cpp:301
 msgid "Current maintainer"
 msgstr "Cynhaliwr Cyfredol"
 
-#: kabcore.cpp:302
+#: tdeabcore.cpp:302
 msgid "Original author"
 msgstr "Awdur gwreiddiol"
 
-#: kabcore.cpp:304
-msgid "Co-maintainer, libkabc port, CSV import/export"
-msgstr "Cyd-gynhaliwr, porthiad libkabc, mewnforio/allforio CSV"
+#: tdeabcore.cpp:304
+msgid "Co-maintainer, libtdeabc port, CSV import/export"
+msgstr "Cyd-gynhaliwr, porthiad libtdeabc, mewnforio/allforio CSV"
 
-#: kabcore.cpp:306
+#: tdeabcore.cpp:306
 msgid "GUI and framework redesign"
 msgstr "Ailgynllunio GUI a fframwaith"
 
-#: kabcore.cpp:308
+#: tdeabcore.cpp:308
 msgid "DCOP interface"
 msgstr "Rhyngwyneb DCOP"
 
-#: kabcore.cpp:309
+#: tdeabcore.cpp:309
 msgid "Contact pinning"
 msgstr "Pinio cyswllt"
 
-#: kabcore.cpp:310 kabcore.cpp:312
+#: tdeabcore.cpp:310 tdeabcore.cpp:312
 msgid "LDAP Lookup"
 msgstr "Chwiliad LDAP"
 
-#: kabcore.cpp:467
+#: tdeabcore.cpp:467
 #, fuzzy, c-format
 msgid ""
 "_n: Do you really want to delete this distribution list?\n"
 "Do you really want to delete these %n distribution lists?"
 msgstr "<qt>Ydych chi wir am waredu'r allwedd <b>%1</b>?</qt>"
 
-#: kabcore.cpp:493
+#: tdeabcore.cpp:493
 #, fuzzy, c-format
 msgid ""
 "_n: Do you really want to delete this contact?\n"
 "Do you really want to delete these %n contacts?"
 msgstr "<qt>Ydych chi wir am waredu'r allwedd <b>%1</b>?</qt>"
 
-#: kabcore.cpp:589
+#: tdeabcore.cpp:589
 msgid "Please select only one contact."
 msgstr "Dewiswch un cyswllt yn unig os gwelwch yn dda."
 
-#: kabcore.cpp:593
+#: tdeabcore.cpp:593
 msgid ""
 "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>"
 msgstr ""
 "<qt>A ydych wir eisiau defnyddio <b>%1</b> fel eich cyswllt personol "
 "newydd?</qt>"
 
-#: kabcore.cpp:594
+#: tdeabcore.cpp:594
 msgid "Use"
 msgstr "Defnydd"
 
-#: kabcore.cpp:594
+#: tdeabcore.cpp:594
 msgid "Do Not Use"
 msgstr ""
 
-#: features/distributionlistwidget.cpp:266 kabcore.cpp:664
+#: features/distributionlistwidget.cpp:266 tdeabcore.cpp:664
 msgid "New Distribution List"
 msgstr "Rhestr Ddosbarthu Newydd"
 
-#: kabcore.cpp:670
+#: tdeabcore.cpp:670
 #, fuzzy
 msgid "New Distribution List (%1)"
 msgstr "Rhestr Ddosbarthu Newydd"
 
-#: kabcore.cpp:859
+#: tdeabcore.cpp:859
 #, fuzzy
 msgid "<qt>Unable to save address book <b>%1</b>.</qt>"
 msgstr "<qt>Methu cyrchu <b>%1</b>.</qt>"
 
-#: kabcore.cpp:866
+#: tdeabcore.cpp:866
 #, fuzzy
 msgid "<qt>Unable to get access for saving the address book <b>%1</b>.</qt>"
 msgstr "<qt>Methu cyrchu <b>%1</b>.</qt>"
 
-#: kabcore.cpp:970
+#: tdeabcore.cpp:970
 #, fuzzy
 msgid ""
 "Your TDE installation is missing LDAP support, please ask your administrator or "
@@ -1641,45 +1641,45 @@ msgstr ""
 "Mae eich gosodiad TDE yn colli cynhaliaeth LDAP - gofynnwch i'ch gweinyddwr neu "
 "ddosbarthwr am fwy o wybodaeth!"
 
-#: kabcore.cpp:972
+#: tdeabcore.cpp:972
 msgid "No LDAP IO Slave Available"
 msgstr "Dim gwas IO LDAP ar gael"
 
-#: kabcore.cpp:1008
+#: tdeabcore.cpp:1008
 msgid "Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
-#: kabcore.cpp:1011
+#: tdeabcore.cpp:1011
 msgid "Print Addresses"
 msgstr "Argraffu Cyfeiriadau"
 
-#: kabcore.cpp:1177 kabcore.cpp:1630
+#: tdeabcore.cpp:1177 tdeabcore.cpp:1630
 #, fuzzy
 msgid "Contacts"
 msgstr "Cyswllt"
 
-#: kabcore.cpp:1258
+#: tdeabcore.cpp:1258
 #, fuzzy
 msgid "&Send Email to Contact..."
 msgstr "&Dileu y Cyswllt"
 
-#: kabcore.cpp:1261
+#: tdeabcore.cpp:1261
 msgid "Send a mail to all selected contacts."
 msgstr "Gyrru ebost at yr holl gysylltiadau a ddewiswyd."
 
-#: kabcore.cpp:1262
+#: tdeabcore.cpp:1262
 msgid "Print a special number of contacts."
 msgstr "Argraffu nifer arbennig o gysylltiadau."
 
-#: kabcore.cpp:1266
+#: tdeabcore.cpp:1266
 msgid "Save all changes of the address book to the storage backend."
 msgstr "Cadw'r holl newidiadau i'r llyfr cyfeiriadau yn yr ôl-storfa"
 
-#: kabcore.cpp:1268
+#: tdeabcore.cpp:1268
 msgid "&New Contact..."
 msgstr "&Cyswllt Newydd..."
 
-#: kabcore.cpp:1270
+#: tdeabcore.cpp:1270
 #, fuzzy
 msgid ""
 "Create a new contact"
@@ -1690,12 +1690,12 @@ msgstr ""
 "<p>Cyflwynir ymgom i chi lle y gallwch ychwanegu holl ddata ar gyfer person, yn "
 "cynnwys cyfeiriadau a rhifau ffôn."
 
-#: kabcore.cpp:1272
+#: tdeabcore.cpp:1272
 #, fuzzy
 msgid "&New Distribution List..."
 msgstr "Rhestr Ddosbarthu Newydd"
 
-#: kabcore.cpp:1274
+#: tdeabcore.cpp:1274
 #, fuzzy
 msgid ""
 "Create a new distribution list"
@@ -1705,28 +1705,28 @@ msgstr ""
 "Golygu'r hidlennu cysylltau"
 "<p>Ymddengys ymgom, lle gallwch ychwanegu, waredu, a golygu hidlenni."
 
-#: kabcore.cpp:1276
+#: tdeabcore.cpp:1276
 msgid "Send &Contact..."
 msgstr "&Anfon Cyswllt..."
 
-#: kabcore.cpp:1279
+#: tdeabcore.cpp:1279
 msgid "Send a mail with the selected contact as attachment."
 msgstr "Gyrru ebost efo'r cyswllt a ddewiswyd fel atodiad."
 
-#: kabcore.cpp:1281
+#: tdeabcore.cpp:1281
 msgid "Chat &With..."
 msgstr ""
 
-#: kabcore.cpp:1284
+#: tdeabcore.cpp:1284
 #, fuzzy
 msgid "Start a chat with the selected contact."
 msgstr "Gyrru ebost efo'r cyswllt a ddewiswyd fel atodiad."
 
-#: kabcore.cpp:1286
+#: tdeabcore.cpp:1286
 msgid "&Edit Contact..."
 msgstr "&Golygu Cyswllt..."
 
-#: kabcore.cpp:1289
+#: tdeabcore.cpp:1289
 #, fuzzy
 msgid ""
 "Edit a contact"
@@ -1737,45 +1737,45 @@ msgstr ""
 "<p>Cyflwynir ymgom i chi lle y gallwch newid data ar gyfer person, yn cynnwys "
 "cyfeiriadau a rhifau ffôn."
 
-#: kabcore.cpp:1291
+#: tdeabcore.cpp:1291
 #, fuzzy
 msgid "&Merge Contacts"
 msgstr "Golygydd Cyfuno Cysylltau"
 
-#: kabcore.cpp:1300
+#: tdeabcore.cpp:1300
 msgid ""
 "Copy the currently selected contact(s) to system clipboard in vCard format."
 msgstr ""
 "Copïo y cyswllt/cysylltau a ddewiswyd i'r clipfwrdd mewn fformat vCard."
 
-#: kabcore.cpp:1301
+#: tdeabcore.cpp:1301
 msgid ""
 "Cuts the currently selected contact(s) to system clipboard in vCard format."
 msgstr ""
 "Torri y cyswllt/cysylltau a ddewiswyd i'r clipfwrdd mewn fformat vCard."
 
-#: kabcore.cpp:1302
+#: tdeabcore.cpp:1302
 msgid "Paste the previously cut or copied contacts from clipboard."
 msgstr "Gludo y cysylltiadau a gopïwyd neu dorrwyd o'r clipfwrdd."
 
-#: kabcore.cpp:1303
+#: tdeabcore.cpp:1303
 msgid "Selects all visible contacts from current view."
 msgstr "Dewis pob cyswllt gweladwy o'r golwg cyfredol "
 
-#: kabcore.cpp:1307
+#: tdeabcore.cpp:1307
 msgid "&Delete Contact"
 msgstr "&Dileu y Cyswllt"
 
-#: kabcore.cpp:1310
+#: tdeabcore.cpp:1310
 msgid "Delete all selected contacts."
 msgstr "Dileu'r holl gysylltiadau a ddewiswyd."
 
-#: kabcore.cpp:1313
+#: tdeabcore.cpp:1313
 #, fuzzy
 msgid "&Copy Contact To..."
 msgstr "&Cyswllt Newydd..."
 
-#: kabcore.cpp:1316
+#: tdeabcore.cpp:1316
 #, fuzzy
 msgid ""
 "Store a contact in a different Addressbook"
@@ -1785,43 +1785,43 @@ msgstr ""
 "Golygu'r hidlennu cysylltau"
 "<p>Ymddengys ymgom, lle gallwch ychwanegu, waredu, a golygu hidlenni."
 
-#: kabcore.cpp:1319
+#: tdeabcore.cpp:1319
 #, fuzzy
 msgid "M&ove Contact To..."
 msgstr "&Cyswllt Newydd..."
 
-#: kabcore.cpp:1325
+#: tdeabcore.cpp:1325
 msgid "Show Jump Bar"
 msgstr "Dangos y Bar Neidio"
 
-#: kabcore.cpp:1327
+#: tdeabcore.cpp:1327
 msgid "Toggle whether the jump button bar shall be visible."
 msgstr "Newid a ddylid dangos y bar neidio ai peidio."
 
-#: kabcore.cpp:1328
+#: tdeabcore.cpp:1328
 #, fuzzy
 msgid "Hide Jump Bar"
 msgstr "Dangos y Bar Neidio"
 
-#: kabcore.cpp:1331
+#: tdeabcore.cpp:1331
 msgid "Show Details"
 msgstr "Dangos Manylion"
 
-#: kabcore.cpp:1333
+#: tdeabcore.cpp:1333
 msgid "Toggle whether the details page shall be visible."
 msgstr "Newid a ddylid dangos y dudalen fanylion ai peidio."
 
-#: kabcore.cpp:1334
+#: tdeabcore.cpp:1334
 #, fuzzy
 msgid "Hide Details"
 msgstr "&Manylion"
 
-#: kabcore.cpp:1338
+#: tdeabcore.cpp:1338
 #, fuzzy
 msgid "&Configure Address Book..."
 msgstr "&Ffurfweddu KLlyfrCyfeiriadau..."
 
-#: kabcore.cpp:1344
+#: tdeabcore.cpp:1344
 msgid ""
 "You will be presented with a dialog, that offers you all possibilities to "
 "configure KAddressBook."
@@ -1829,11 +1829,11 @@ msgstr ""
 "Cyflwynir ymgom i chi a fydd yn eich galluogi i ffurfweddu KLlyfrCyfeiriadau yn "
 "yr holl ffyrdd posib."
 
-#: kabcore.cpp:1347
+#: tdeabcore.cpp:1347
 msgid "&Lookup Addresses in LDAP Directory..."
 msgstr "&Chwilio am Gyfeiriad yn y Cyfeiriadur LDAP..."
 
-#: kabcore.cpp:1349
+#: tdeabcore.cpp:1349
 msgid ""
 "Search for contacts on a LDAP server"
 "<p>You will be presented with a dialog, where you can search for contacts and "
@@ -1843,11 +1843,11 @@ msgstr ""
 "<p>Cyflwynir ymgom i ch lle gallwch chwilio am gysylltau a dewis y rhai yr "
 "ydych eisiau eu hychwanegu i'ch llyfr cyfeiriadau lleol."
 
-#: kabcore.cpp:1351
+#: tdeabcore.cpp:1351
 msgid "Set as Personal Contact Data"
 msgstr ""
 
-#: kabcore.cpp:1354
+#: tdeabcore.cpp:1354
 #, fuzzy
 msgid ""
 "Set the personal contact"
@@ -1858,31 +1858,31 @@ msgstr ""
 "<p>Bydd data y cyswllt yn cael ei ddefnyddio mewn amryw o raglenni TDE, fel nad "
 "oes rhaid mewnosod eich manylion personol fwy nag unwaith."
 
-#: kabcore.cpp:1359
+#: tdeabcore.cpp:1359
 msgid "Set the categories for all selected contacts."
 msgstr "Gosod categorïau ar gyfer pob cyswllt a ddewiswyd."
 
-#: kabcore.cpp:1361
+#: tdeabcore.cpp:1361
 msgid "Clear Search Bar"
 msgstr ""
 
-#: kabcore.cpp:1364
+#: tdeabcore.cpp:1364
 msgid "Clear Search Bar<p>Clears the content of the quick search bar."
 msgstr ""
 
-#: kabcore.cpp:1438
+#: tdeabcore.cpp:1438
 msgid "Merge with existing categories?"
 msgstr "Cyfuno â chategorïau cyfredol?"
 
-#: kabcore.cpp:1439
+#: tdeabcore.cpp:1439
 msgid "Merge"
 msgstr "Cyfuno"
 
-#: kabcore.cpp:1439
+#: tdeabcore.cpp:1439
 msgid "Do Not Merge"
 msgstr ""
 
-#: kabcore.cpp:1490
+#: tdeabcore.cpp:1490
 #, fuzzy, c-format
 msgid ""
 "_n: %n contact matches\n"
@@ -1891,7 +1891,7 @@ msgstr ""
 "Canfuwyd un cyswllt:\n"
 "Canfuwyd %n o gysylltau:"
 
-#: kabcore.cpp:1630
+#: tdeabcore.cpp:1630
 #, fuzzy, c-format
 msgid "Distribution List: %1"
 msgstr "Rhestr Ddosbarthu"
diff --git a/tde-i18n-cy/messages/tdepim/karm.po b/tde-i18n-cy/messages/tdepim/karm.po
index 3eaec381f97..0e3e94bbfd9 100644
--- a/tde-i18n-cy/messages/tdepim/karm.po
+++ b/tde-i18n-cy/messages/tdepim/karm.po
@@ -768,7 +768,7 @@ msgid ""
 "Saving problems may result from a full harddisk, a directory name instead of a "
 "file name, or stale locks. Check that your harddisk has enough space, that your "
 "calendar file exists and is a file and remove stale locks, typically from "
-"~/.trinity/share/apps/kabc/lock."
+"~/.trinity/share/apps/tdeabc/lock."
 msgstr ""
 
 #: taskview.cpp:495
@@ -783,7 +783,7 @@ msgstr "Tasg Di-enw"
 msgid ""
 "Error storing new task. Your changes were not saved. Make sure you can edit "
 "your iCalendar file. Also quit all applications using this file and remove any "
-"lock file related to its name from ~/.trinity/share/apps/kabc/lock/ "
+"lock file related to its name from ~/.trinity/share/apps/tdeabc/lock/ "
 msgstr ""
 
 #: taskview.cpp:560
diff --git a/tde-i18n-cy/messages/tdepim/kcmkabconfig.po b/tde-i18n-cy/messages/tdepim/kcmkabconfig.po
index 0ed8a93c61e..9a06b2eb70c 100644
--- a/tde-i18n-cy/messages/tdepim/kcmkabconfig.po
+++ b/tde-i18n-cy/messages/tdepim/kcmkabconfig.po
@@ -99,75 +99,75 @@ msgstr "Enw Gwrthdroedig"
 msgid "Extension Settings"
 msgstr "Gosodiadau Estyniad"
 
-#: kabconfigwidget.cpp:62 kabconfigwidget.cpp:154
+#: tdeabconfigwidget.cpp:62 tdeabconfigwidget.cpp:154
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kabconfigwidget.cpp:66
+#: tdeabconfigwidget.cpp:66
 msgid "Honor TDE single click"
 msgstr "Parchu clic unigol TDE"
 
-#: kabconfigwidget.cpp:69
+#: tdeabconfigwidget.cpp:69
 msgid "Automatic name parsing for new addressees"
 msgstr "Dyrannu enwau ymysgogol ar gyfer cyferiadwyr newydd"
 
-#: kabconfigwidget.cpp:72
+#: tdeabconfigwidget.cpp:72
 msgid "Trade single name component as family name"
 msgstr ""
 
-#: kabconfigwidget.cpp:80
+#: tdeabconfigwidget.cpp:80
 msgid "Limit unfiltered display to 100 contacts"
 msgstr ""
 
-#: kabconfigwidget.cpp:85
+#: tdeabconfigwidget.cpp:85
 msgid "Addressee editor type:"
 msgstr ""
 
-#: kabconfigwidget.cpp:89
+#: tdeabconfigwidget.cpp:89
 msgid "Full Editor"
 msgstr ""
 
-#: kabconfigwidget.cpp:90
+#: tdeabconfigwidget.cpp:90
 msgid "Simple Editor"
 msgstr ""
 
-#: kabconfigwidget.cpp:99
+#: tdeabconfigwidget.cpp:99
 msgid "Script-Hooks"
 msgstr "Bachau-Sgript"
 
-#: kabconfigwidget.cpp:102
+#: tdeabconfigwidget.cpp:102
 msgid "Phone:"
 msgstr "Ffôn:"
 
-#: kabconfigwidget.cpp:106
+#: tdeabconfigwidget.cpp:106
 msgid "<ul><li>%N: Phone Number</li></ul>"
 msgstr "<ul><li>%N: Rhif Ffôn</li></ul>"
 
-#: kabconfigwidget.cpp:109
+#: tdeabconfigwidget.cpp:109
 msgid "Fax:"
 msgstr "Ffacs:"
 
-#: kabconfigwidget.cpp:113
+#: tdeabconfigwidget.cpp:113
 msgid "<ul><li>%N: Fax Number</li></ul>"
 msgstr "<ul><li>%N: Rhif Ffacs</li></ul>"
 
-#: kabconfigwidget.cpp:117
+#: tdeabconfigwidget.cpp:117
 #, fuzzy
 msgid "SMS Text:"
 msgstr "Testun"
 
-#: kabconfigwidget.cpp:121
+#: tdeabconfigwidget.cpp:121
 msgid ""
 "<ul>"
 "<li>%N: Phone Number</li>"
 "<li>%F: File containing the text message(s)</li></ul>"
 msgstr ""
 
-#: kabconfigwidget.cpp:129
+#: tdeabconfigwidget.cpp:129
 msgid "Location Map"
 msgstr ""
 
-#: kabconfigwidget.cpp:135
+#: tdeabconfigwidget.cpp:135
 msgid ""
 "<ul> "
 "<li>%s: Street</li>"
@@ -177,7 +177,7 @@ msgid ""
 "<li>%c: Country ISO Code</li> </ul>"
 msgstr ""
 
-#: kabconfigwidget.cpp:158
+#: tdeabconfigwidget.cpp:158
 msgid "Contact"
 msgstr "Cyswllt"
 
diff --git a/tde-i18n-cy/messages/tdepim/kleopatra.po b/tde-i18n-cy/messages/tdepim/kleopatra.po
index 480f63945c5..423378131ae 100644
--- a/tde-i18n-cy/messages/tdepim/kleopatra.po
+++ b/tde-i18n-cy/messages/tdepim/kleopatra.po
@@ -62,7 +62,7 @@ msgid "Original Author"
 msgstr "Awdur Gwreiddiol"
 
 #: aboutdata.cpp:61
-msgid "Backend configuration framework, KIO integration"
+msgid "Backend configuration framework, TDEIO integration"
 msgstr ""
 
 #: aboutdata.cpp:64
diff --git a/tde-i18n-cy/messages/tdepim/konnector_kabc.po b/tde-i18n-cy/messages/tdepim/konnector_kabc.po
index ca35c6d5f07..a1f63845abe 100644
--- a/tde-i18n-cy/messages/tdepim/konnector_kabc.po
+++ b/tde-i18n-cy/messages/tdepim/konnector_kabc.po
@@ -9,14 +9,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kabckonnector.cpp:74
+#: tdeabckonnector.cpp:74
 msgid "Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
-#: kabckonnector.cpp:119
+#: tdeabckonnector.cpp:119
 msgid "Address Book Konnector"
 msgstr ""
 
-#: kabckonnectorconfig.cpp:76
+#: tdeabckonnectorconfig.cpp:76
 msgid "Select the address book you want to sync with."
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdepim/korn.po b/tde-i18n-cy/messages/tdepim/korn.po
index d97302e034f..1ce16ec272c 100644
--- a/tde-i18n-cy/messages/tdepim/korn.po
+++ b/tde-i18n-cy/messages/tdepim/korn.po
@@ -17,31 +17,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kio_proto.h:97
+#: tdeio_proto.h:97
 msgid "Server:"
 msgstr "Gweinydd:"
 
-#: kio_proto.h:98
+#: tdeio_proto.h:98
 msgid "Port:"
 msgstr "Porth:"
 
-#: kio_proto.h:99
+#: tdeio_proto.h:99
 msgid "Username:"
 msgstr "Enw defnyddiwr:"
 
-#: kio_proto.h:100
+#: tdeio_proto.h:100
 msgid "Mailbox:"
 msgstr "Blwch ebost:"
 
-#: kio_proto.h:101
+#: tdeio_proto.h:101
 msgid "Password:"
 msgstr "Cyfinair:"
 
-#: imap_proto.cpp:59 kio_proto.h:102 nntp_proto.cpp:43 pop3_proto.cpp:58
+#: imap_proto.cpp:59 tdeio_proto.h:102 nntp_proto.cpp:43 pop3_proto.cpp:58
 msgid "Save password"
 msgstr "Cadw cyfrinair"
 
-#: kio_proto.h:103
+#: tdeio_proto.h:103
 msgid "Authentication:"
 msgstr "Dilysiant :"
 
@@ -166,57 +166,57 @@ msgstr "Cyfrinair"
 msgid "Authentication"
 msgstr "Dilysiant"
 
-#: kio.cpp:211
+#: tdeio.cpp:211
 msgid "url is not valid"
 msgstr ""
 
-#: kio_count.cpp:89 kio_count.cpp:90
+#: tdeio_count.cpp:89 tdeio_count.cpp:90
 #, c-format
-msgid "Not able to open a kio slave for %1."
+msgid "Not able to open a tdeio slave for %1."
 msgstr ""
 
-#: kio_count.cpp:204 kio_count.cpp:254
+#: tdeio_count.cpp:204 tdeio_count.cpp:254
 msgid "Got unknown job; something must be wrong..."
 msgstr ""
 
-#: kio_count.cpp:210 kio_count.cpp:211
+#: tdeio_count.cpp:210 tdeio_count.cpp:211
 #, c-format
-msgid "The next KIO-error occurred by counting: %1"
+msgid "The next TDEIO-error occurred by counting: %1"
 msgstr ""
 
-#: kio_delete.cpp:110
+#: tdeio_delete.cpp:110
 msgid "Could not get a connected slave; I cannot delete this way..."
 msgstr ""
 
-#: kio_delete.cpp:185
+#: tdeio_delete.cpp:185
 #, c-format
 msgid "An error occurred when deleting email: %1."
 msgstr ""
 
-#: kio_read.cpp:77 kio_read.cpp:91
+#: tdeio_read.cpp:77 tdeio_read.cpp:91
 msgid "Unknown job returned; I will try if this one will do... "
 msgstr ""
 
-#: kio_read.cpp:80
+#: tdeio_read.cpp:80
 #, c-format
 msgid "An error occurred when fetching the requested email: %1."
 msgstr ""
 
-#: kio_single_subject.cpp:128 kio_single_subject.cpp:137
+#: tdeio_single_subject.cpp:128 tdeio_single_subject.cpp:137
 msgid "Got invalid job; something strange happened?"
 msgstr ""
 
-#: kio_single_subject.cpp:141
+#: tdeio_single_subject.cpp:141
 msgid "Error when fetching %1: %2"
 msgstr ""
 
-#: kio_subjects.cpp:66
+#: tdeio_subjects.cpp:66
 msgid "Already a slave pending."
 msgstr ""
 
-#: kio_subjects.cpp:104 kio_subjects.cpp:105
+#: tdeio_subjects.cpp:104 tdeio_subjects.cpp:105
 #, c-format
-msgid "Not able to open a kio-slave for %1."
+msgid "Not able to open a tdeio-slave for %1."
 msgstr ""
 
 #: kmail_proto.cpp:199
diff --git a/tde-i18n-cy/messages/tdepim/kres_featureplan.po b/tde-i18n-cy/messages/tdepim/kres_featureplan.po
index ff948fe2d9d..128170c706d 100644
--- a/tde-i18n-cy/messages/tdepim/kres_featureplan.po
+++ b/tde-i18n-cy/messages/tdepim/kres_featureplan.po
@@ -33,19 +33,19 @@ msgstr "Enw Ffeil :"
 msgid "Filter email:"
 msgstr ""
 
-#. i18n: file kresources_kcal_featureplan.kcfg line 16
+#. i18n: file tderesources_kcal_featureplan.kcfg line 16
 #: kcal_resourcefeatureplanconfig.cpp:57 rc.cpp:9
 #, no-c-format
 msgid "Use CVS"
 msgstr ""
 
-#. i18n: file kresources_kcal_featureplan.kcfg line 10
+#. i18n: file tderesources_kcal_featureplan.kcfg line 10
 #: rc.cpp:3
 #, no-c-format
 msgid "Filename"
 msgstr "Enw Ffeil"
 
-#. i18n: file kresources_kcal_featureplan.kcfg line 13
+#. i18n: file tderesources_kcal_featureplan.kcfg line 13
 #: rc.cpp:6
 #, no-c-format
 msgid "Filter for Email"
diff --git a/tde-i18n-cy/messages/tdepim/kres_groupware.po b/tde-i18n-cy/messages/tdepim/kres_groupware.po
index 1d9139ab774..50b736175ac 100644
--- a/tde-i18n-cy/messages/tdepim/kres_groupware.po
+++ b/tde-i18n-cy/messages/tdepim/kres_groupware.po
@@ -9,39 +9,39 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kabc_resourcegroupware.cpp:253
+#: tdeabc_resourcegroupware.cpp:253
 msgid "Downloading addressbook"
 msgstr ""
 
-#: kabc_resourcegroupwareconfig.cpp:66 kcal_resourcegroupwareconfig.cpp:47
+#: tdeabc_resourcegroupwareconfig.cpp:66 kcal_resourcegroupwareconfig.cpp:47
 msgid "URL:"
 msgstr "URL:"
 
-#: kabc_resourcegroupwareconfig.cpp:72 kcal_resourcegroupwareconfig.cpp:52
+#: tdeabc_resourcegroupwareconfig.cpp:72 kcal_resourcegroupwareconfig.cpp:52
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: kabc_resourcegroupwareconfig.cpp:78 kcal_resourcegroupwareconfig.cpp:57
+#: tdeabc_resourcegroupwareconfig.cpp:78 kcal_resourcegroupwareconfig.cpp:57
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: kabc_resourcegroupwareconfig.cpp:90
+#: tdeabc_resourcegroupwareconfig.cpp:90
 msgid "Retrieve Address Book List From Server"
 msgstr ""
 
-#: kabc_resourcegroupwareconfig.cpp:94
+#: tdeabc_resourcegroupwareconfig.cpp:94
 msgid "Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
-#: kabc_resourcegroupwareconfig.cpp:96
+#: tdeabc_resourcegroupwareconfig.cpp:96
 msgid "Personal"
 msgstr "Personol"
 
-#: kabc_resourcegroupwareconfig.cpp:97
+#: tdeabc_resourcegroupwareconfig.cpp:97
 msgid "Frequent Contacts"
 msgstr ""
 
-#: kabc_resourcegroupwareconfig.cpp:103
+#: tdeabc_resourcegroupwareconfig.cpp:103
 msgid "Address book for new contacts:"
 msgstr ""
 
@@ -65,25 +65,25 @@ msgstr ""
 msgid "Deleted"
 msgstr "Wedi'u dileu"
 
-#. i18n: file kresources_kabc_groupware.kcfg line 9
+#. i18n: file tderesources_tdeabc_groupware.kcfg line 9
 #: rc.cpp:3 rc.cpp:12
 #, no-c-format
 msgid "Server URL"
 msgstr "URL y gweinydd: %1"
 
-#. i18n: file kresources_kabc_groupware.kcfg line 12
+#. i18n: file tderesources_tdeabc_groupware.kcfg line 12
 #: rc.cpp:6 rc.cpp:15
 #, no-c-format
 msgid "User Name"
 msgstr "Enw'r defnyddiwr"
 
-#. i18n: file kresources_kabc_groupware.kcfg line 15
+#. i18n: file tderesources_tdeabc_groupware.kcfg line 15
 #: rc.cpp:9 rc.cpp:18
 #, no-c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
-#. i18n: file kresources_kcal_groupware.kcfg line 18
+#. i18n: file tderesources_kcal_groupware.kcfg line 18
 #: rc.cpp:21
 #, no-c-format
 msgid "TCP Port"
diff --git a/tde-i18n-cy/messages/tdepim/kres_groupwise.po b/tde-i18n-cy/messages/tdepim/kres_groupwise.po
index 138e89eb4b6..196270e0826 100644
--- a/tde-i18n-cy/messages/tdepim/kres_groupwise.po
+++ b/tde-i18n-cy/messages/tdepim/kres_groupwise.po
@@ -21,55 +21,55 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: kabc_resourcegroupwise.cpp:290
+#: tdeabc_resourcegroupwise.cpp:290
 #, c-format
 msgid "Loading GroupWise resource %1"
 msgstr ""
 
-#: kabc_resourcegroupwise.cpp:363
+#: tdeabc_resourcegroupwise.cpp:363
 #, fuzzy
 msgid "Fetching System Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
-#: kabc_resourcegroupwise.cpp:373
+#: tdeabc_resourcegroupwise.cpp:373
 #, fuzzy
 msgid "Fetching User Address Books"
 msgstr "Llyfr Cyfeiriadau"
 
-#: kabc_resourcegroupwise.cpp:443
+#: tdeabc_resourcegroupwise.cpp:443
 #, fuzzy
 msgid "Updating System Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
-#: kabc_resourcegroupwiseconfig.cpp:64 kcal_resourcegroupwiseconfig.cpp:50
+#: tdeabc_resourcegroupwiseconfig.cpp:64 kcal_resourcegroupwiseconfig.cpp:50
 msgid "URL:"
 msgstr "URL:"
 
-#: kabc_resourcegroupwiseconfig.cpp:70 kcal_resourcegroupwiseconfig.cpp:55
+#: tdeabc_resourcegroupwiseconfig.cpp:70 kcal_resourcegroupwiseconfig.cpp:55
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: kabc_resourcegroupwiseconfig.cpp:76 kcal_resourcegroupwiseconfig.cpp:60
+#: tdeabc_resourcegroupwiseconfig.cpp:76 kcal_resourcegroupwiseconfig.cpp:60
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: kabc_resourcegroupwiseconfig.cpp:88
+#: tdeabc_resourcegroupwiseconfig.cpp:88
 msgid "Retrieve Address Book List From Server"
 msgstr ""
 
-#: kabc_resourcegroupwiseconfig.cpp:92
+#: tdeabc_resourcegroupwiseconfig.cpp:92
 msgid "Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
-#: kabc_resourcegroupwiseconfig.cpp:93
+#: tdeabc_resourcegroupwiseconfig.cpp:93
 msgid "Personal"
 msgstr "Personol"
 
-#: kabc_resourcegroupwiseconfig.cpp:94
+#: tdeabc_resourcegroupwiseconfig.cpp:94
 msgid "Frequent Contacts"
 msgstr ""
 
-#: kabc_resourcegroupwiseconfig.cpp:99
+#: tdeabc_resourcegroupwiseconfig.cpp:99
 msgid "Address book for new contacts:"
 msgstr ""
 
@@ -129,97 +129,97 @@ msgstr "Gwerth"
 msgid "Locked"
 msgstr ""
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 9
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 9
 #: rc.cpp:15 rc.cpp:60
 #, no-c-format
 msgid "Server URL"
 msgstr "URL y gweinydd: %1"
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 10
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 10
 #: rc.cpp:18 rc.cpp:63
 #, no-c-format
 msgid "URL of SOAP interface of GroupWise server"
 msgstr ""
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 13
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 13
 #: rc.cpp:21 rc.cpp:66
 #, no-c-format
 msgid "User Name"
 msgstr "Enw'r defnyddiwr"
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 16
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 16
 #: rc.cpp:24 rc.cpp:69 soap/soapdebug.cpp:40
 #, no-c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 21
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 21
 #: rc.cpp:27
 #, no-c-format
 msgid "Ids of Address Books"
 msgstr ""
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 24
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 24
 #: rc.cpp:30
 #, no-c-format
 msgid "Names of Address Books"
 msgstr ""
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 27
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 27
 #: rc.cpp:33
 #, no-c-format
 msgid "Personal State of Address Books"
 msgstr ""
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 30
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 30
 #: rc.cpp:36
 #, no-c-format
 msgid "Frequent Contacts state of Address Books"
 msgstr ""
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 33
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 33
 #: rc.cpp:39
 #, no-c-format
 msgid "Readable Address Books"
 msgstr ""
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 36
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 36
 #: rc.cpp:42
 #, no-c-format
 msgid "Address Book for new Contacts"
 msgstr ""
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 39
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 39
 #: rc.cpp:45
 #, fuzzy, no-c-format
 msgid "ID of System Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 42
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 42
 #: rc.cpp:48
 #, no-c-format
 msgid "Last time the Post Office was rebuilt"
 msgstr ""
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 45
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 45
 #: rc.cpp:51
 #, no-c-format
 msgid "The first sequence number of the GW System Address Book held locally"
 msgstr ""
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 48
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 48
 #: rc.cpp:54
 #, no-c-format
 msgid "The last sequence number of the GW System Address Book held locally"
 msgstr ""
 
-#. i18n: file kresources_kabc_groupwise.kcfg line 51
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 51
 #: rc.cpp:57
 #, fuzzy, no-c-format
 msgid "Applications which should load the System Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
-#. i18n: file kresources_kcal_groupwise.kcfg line 19
+#. i18n: file tderesources_kcal_groupwise.kcfg line 19
 #: rc.cpp:72
 #, no-c-format
 msgid "TCP Port"
diff --git a/tde-i18n-cy/messages/tdepim/kres_kolab.po b/tde-i18n-cy/messages/tdepim/kres_kolab.po
index fbc75d81fc9..7b347d499b4 100644
--- a/tde-i18n-cy/messages/tdepim/kres_kolab.po
+++ b/tde-i18n-cy/messages/tdepim/kres_kolab.po
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kabc/resourcekolab.cpp:205
+#: tdeabc/resourcekolab.cpp:205
 msgid "Loading contacts..."
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdepim/kres_tvanytime.po b/tde-i18n-cy/messages/tdepim/kres_tvanytime.po
index cc856baf832..1290c3150f3 100644
--- a/tde-i18n-cy/messages/tdepim/kres_tvanytime.po
+++ b/tde-i18n-cy/messages/tdepim/kres_tvanytime.po
@@ -21,25 +21,25 @@ msgstr ""
 msgid "Retrieve how many days?"
 msgstr ""
 
-#. i18n: file kresources_kcal_tvanytime.kcfg line 9
+#. i18n: file tderesources_kcal_tvanytime.kcfg line 9
 #: rc.cpp:3 rc.cpp:15
 #, no-c-format
 msgid "Schedule URL"
 msgstr ""
 
-#. i18n: file kresources_kcal_tvanytime.kcfg line 10
+#. i18n: file tderesources_kcal_tvanytime.kcfg line 10
 #: rc.cpp:6 rc.cpp:18
 #, no-c-format
 msgid "URL of TV AnyWhere schedule"
 msgstr ""
 
-#. i18n: file kresources_kcal_tvanytime.kcfg line 13
+#. i18n: file tderesources_kcal_tvanytime.kcfg line 13
 #: rc.cpp:9 rc.cpp:21
 #, no-c-format
 msgid "How many days?"
 msgstr ""
 
-#. i18n: file kresources_kcal_tvanytime.kcfg line 14
+#. i18n: file tderesources_kcal_tvanytime.kcfg line 14
 #: rc.cpp:12 rc.cpp:24
 #, no-c-format
 msgid "Show the next n days"
diff --git a/tde-i18n-cy/messages/tdepim/kres_xmlrpc.po b/tde-i18n-cy/messages/tdepim/kres_xmlrpc.po
index b40d6431c38..0fe090071a8 100644
--- a/tde-i18n-cy/messages/tdepim/kres_xmlrpc.po
+++ b/tde-i18n-cy/messages/tdepim/kres_xmlrpc.po
@@ -13,69 +13,69 @@ msgstr ""
 msgid "Debug Dialog"
 msgstr ""
 
-#: kabc_resourcexmlrpc.cpp:297
+#: tdeabc_resourcexmlrpc.cpp:297
 msgid "Login failed, please check your username and password."
 msgstr ""
 
-#: kabc_resourcexmlrpc.cpp:316
+#: tdeabc_resourcexmlrpc.cpp:316
 msgid "Logout failed, please check your username and password."
 msgstr ""
 
-#: kabc_resourcexmlrpc.cpp:393
+#: tdeabc_resourcexmlrpc.cpp:393
 msgid "<qt>Server sent error %1: <b>%2</b></qt>"
 msgstr ""
 
-#: kabc_resourcexmlrpc.cpp:407
+#: tdeabc_resourcexmlrpc.cpp:407
 msgid "Unable to add contact %1 to server. (%2)"
 msgstr ""
 
-#: kabc_resourcexmlrpc.cpp:416
+#: tdeabc_resourcexmlrpc.cpp:416
 msgid "Unable to update contact %1 on server. (%2)"
 msgstr ""
 
-#: kabc_resourcexmlrpc.cpp:436
+#: tdeabc_resourcexmlrpc.cpp:436
 msgid "Unable to delete contact %1 from server. (%2)"
 msgstr ""
 
-#: kabc_resourcexmlrpcconfig.cpp:41 kcal_resourcexmlrpcconfig.cpp:42
+#: tdeabc_resourcexmlrpcconfig.cpp:41 kcal_resourcexmlrpcconfig.cpp:42
 #: knotes_resourcexmlrpcconfig.cpp:42
 msgid "URL:"
 msgstr "URL:"
 
-#: kabc_resourcexmlrpcconfig.cpp:47 kcal_resourcexmlrpcconfig.cpp:48
+#: tdeabc_resourcexmlrpcconfig.cpp:47 kcal_resourcexmlrpcconfig.cpp:48
 #: knotes_resourcexmlrpcconfig.cpp:48
 msgid "Domain:"
 msgstr "Parth:"
 
-#: kabc_resourcexmlrpcconfig.cpp:53 kcal_resourcexmlrpcconfig.cpp:54
+#: tdeabc_resourcexmlrpcconfig.cpp:53 kcal_resourcexmlrpcconfig.cpp:54
 #: knotes_resourcexmlrpcconfig.cpp:54
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: kabc_resourcexmlrpcconfig.cpp:59 kcal_resourcexmlrpcconfig.cpp:60
+#: tdeabc_resourcexmlrpcconfig.cpp:59 kcal_resourcexmlrpcconfig.cpp:60
 #: knotes_resourcexmlrpcconfig.cpp:60
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#. i18n: file kresources_kabc_egroupware.kcfg line 10
+#. i18n: file tderesources_tdeabc_egroupware.kcfg line 10
 #: rc.cpp:3 rc.cpp:15 rc.cpp:27
 #, no-c-format
 msgid "URL"
 msgstr "URL"
 
-#. i18n: file kresources_kabc_egroupware.kcfg line 13
+#. i18n: file tderesources_tdeabc_egroupware.kcfg line 13
 #: rc.cpp:6 rc.cpp:18 rc.cpp:30
 #, no-c-format
 msgid "Domain"
 msgstr "Parth"
 
-#. i18n: file kresources_kabc_egroupware.kcfg line 17
+#. i18n: file tderesources_tdeabc_egroupware.kcfg line 17
 #: rc.cpp:9 rc.cpp:21 rc.cpp:33
 #, no-c-format
 msgid "User Name"
 msgstr "Enw'r defnyddiwr"
 
-#. i18n: file kresources_kabc_egroupware.kcfg line 20
+#. i18n: file tderesources_tdeabc_egroupware.kcfg line 20
 #: rc.cpp:12 rc.cpp:24 rc.cpp:36
 #, no-c-format
 msgid "Password"
diff --git a/tde-i18n-cy/messages/tdepim/libkleopatra.po b/tde-i18n-cy/messages/tdepim/libkleopatra.po
index d9b00110c8f..5939ae6193c 100644
--- a/tde-i18n-cy/messages/tdepim/libkleopatra.po
+++ b/tde-i18n-cy/messages/tdepim/libkleopatra.po
@@ -326,7 +326,7 @@ msgid ""
 "%1/%2"
 msgstr ""
 
-#: kleo/kconfigbasedkeyfilter.cpp:95
+#: kleo/tdeconfigbasedkeyfilter.cpp:95
 msgid "<unnamed>"
 msgstr "<di-enw>"
 
diff --git a/tde-i18n-cy/messages/tdepim/libtdepim.po b/tde-i18n-cy/messages/tdepim/libtdepim.po
index de49deffe1f..aed583fac65 100644
--- a/tde-i18n-cy/messages/tdepim/libtdepim.po
+++ b/tde-i18n-cy/messages/tdepim/libtdepim.po
@@ -762,54 +762,54 @@ msgstr ""
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: kconfigpropagator.cpp:39
+#: tdeconfigpropagator.cpp:39
 msgid "Change Config Value"
 msgstr ""
 
-#: kconfigwizard.cpp:36 kconfigwizard.cpp:45
+#: tdeconfigwizard.cpp:36 tdeconfigwizard.cpp:45
 msgid "Configuration Wizard"
 msgstr "Dewin Ffurfweddu"
 
-#: kconfigwizard.cpp:84
+#: tdeconfigwizard.cpp:84
 msgid "Rules"
 msgstr "Rheolau"
 
-#: kconfigwizard.cpp:90
+#: tdeconfigwizard.cpp:90
 msgid "Source"
 msgstr "Tarddiad"
 
-#: kconfigwizard.cpp:91
+#: tdeconfigwizard.cpp:91
 msgid "Target"
 msgstr "Targed"
 
-#: kconfigwizard.cpp:92
+#: tdeconfigwizard.cpp:92
 msgid "Condition"
 msgstr "Cyflwr"
 
-#: kconfigwizard.cpp:125
+#: tdeconfigwizard.cpp:125
 msgid "Changes"
 msgstr ""
 
-#: kconfigwizard.cpp:131
+#: tdeconfigwizard.cpp:131
 msgid "Action"
 msgstr "Gweithred"
 
-#: kconfigwizard.cpp:132
+#: tdeconfigwizard.cpp:132
 msgid "Option"
 msgstr "Dewisiad"
 
-#: kconfigwizard.cpp:133
+#: tdeconfigwizard.cpp:133
 msgid "Value"
 msgstr "Gwerth"
 
-#: kconfigwizard.cpp:166
+#: tdeconfigwizard.cpp:166
 msgid ""
 "Please make sure that the programs which are configured by the wizard do not "
 "run in parallel to the wizard; otherwise, changes done by the wizard could be "
 "lost."
 msgstr ""
 
-#: kconfigwizard.cpp:169
+#: tdeconfigwizard.cpp:169
 msgid "Run Wizard Now"
 msgstr ""
 
@@ -846,11 +846,11 @@ msgstr "M&is Nesaf"
 msgid "No Date"
 msgstr "Nodiadau"
 
-#: kfileio.cpp:31
+#: tdefileio.cpp:31
 msgid "File I/O Error"
 msgstr ""
 
-#: kfileio.cpp:51 kfileio.cpp:122
+#: tdefileio.cpp:51 tdefileio.cpp:122
 #, c-format
 msgid ""
 "The specified file does not exist:\n"
@@ -859,7 +859,7 @@ msgstr ""
 "Nid yw'r ffeil benodedig yn bodoli:\n"
 " %1"
 
-#: kfileio.cpp:57 kfileio.cpp:129
+#: tdefileio.cpp:57 tdefileio.cpp:129
 #, c-format
 msgid ""
 "This is a folder and not a file:\n"
@@ -868,14 +868,14 @@ msgstr ""
 "Cyfeiriadur ac nid ffeil yw hwn:\n"
 " %1"
 
-#: kfileio.cpp:63 kfileio.cpp:136
+#: tdefileio.cpp:63 tdefileio.cpp:136
 #, c-format
 msgid ""
 "You do not have read permissions to the file:\n"
 "%1"
 msgstr ""
 
-#: kfileio.cpp:74 kfileio.cpp:147
+#: tdefileio.cpp:74 tdefileio.cpp:147
 #, c-format
 msgid ""
 "Could not read file:\n"
@@ -884,7 +884,7 @@ msgstr ""
 "Methwyd darllen y ffeil:\n"
 " %1"
 
-#: kfileio.cpp:77 kfileio.cpp:150
+#: tdefileio.cpp:77 tdefileio.cpp:150
 #, c-format
 msgid ""
 "Could not open file:\n"
@@ -893,7 +893,7 @@ msgstr ""
 "Methwyd agor y ffeil:\n"
 " %1"
 
-#: kfileio.cpp:80 kfileio.cpp:153
+#: tdefileio.cpp:80 tdefileio.cpp:153
 #, c-format
 msgid ""
 "Error while reading file:\n"
@@ -902,11 +902,11 @@ msgstr ""
 "Gwall tra'n darllen y ffeil:\n"
 " %1"
 
-#: kfileio.cpp:96 kfileio.cpp:165
+#: tdefileio.cpp:96 tdefileio.cpp:165
 msgid "Could only read %1 bytes of %2."
 msgstr "Gellid darllen %1 beit allan o %2 yn unig."
 
-#: kfileio.cpp:193
+#: tdefileio.cpp:193
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -914,15 +914,15 @@ msgstr ""
 "Mae'r ffeil %1 yn bodoli.\n"
 " A ydych am ei amnewid?"
 
-#: kfileio.cpp:196 kfileio.cpp:213
+#: tdefileio.cpp:196 tdefileio.cpp:213
 msgid "Save to File"
 msgstr "Cadw i Ffeil"
 
-#: kfileio.cpp:196
+#: tdefileio.cpp:196
 msgid "&Replace"
 msgstr "A&mnewid"
 
-#: kfileio.cpp:211
+#: tdefileio.cpp:211
 msgid ""
 "Failed to make a backup copy of %1.\n"
 "Continue anyway?"
@@ -930,7 +930,7 @@ msgstr ""
 "Methwyd creu copi wrth gefn o %1.\n"
 " Parhau serch hynny?"
 
-#: kfileio.cpp:224 kfileio.cpp:241
+#: tdefileio.cpp:224 tdefileio.cpp:241
 #, c-format
 msgid ""
 "Could not write to file:\n"
@@ -939,7 +939,7 @@ msgstr ""
 "Methwyd ysgrifennu i'r ffeil:\n"
 " %1"
 
-#: kfileio.cpp:227
+#: tdefileio.cpp:227
 #, c-format
 msgid ""
 "Could not open file for writing:\n"
@@ -948,7 +948,7 @@ msgstr ""
 "Methwyd agor y ffeil ar gyfer ysgrifennu:\n"
 " %1"
 
-#: kfileio.cpp:231
+#: tdefileio.cpp:231
 #, c-format
 msgid ""
 "Error while writing file:\n"
@@ -957,37 +957,37 @@ msgstr ""
 "Gwall tra'n ysgrifennu i'r ffeil:\n"
 " %1"
 
-#: kfileio.cpp:246
+#: tdefileio.cpp:246
 msgid "Could only write %1 bytes of %2."
 msgstr "Gellid ysgrifennu %1 beit allan o %2 yn unig."
 
-#: kfileio.cpp:285
+#: tdefileio.cpp:285
 msgid "%1 does not exist"
 msgstr "Nid yw %1 yn bodoli"
 
-#: kfileio.cpp:297
+#: tdefileio.cpp:297
 msgid "%1 is not accessible and that is unchangeable."
 msgstr ""
 
-#: kfileio.cpp:318
+#: tdefileio.cpp:318
 msgid "%1 is not readable and that is unchangeable."
 msgstr ""
 
-#: kfileio.cpp:334
+#: tdefileio.cpp:334
 msgid "%1 is not writable and that is unchangeable."
 msgstr ""
 
-#: kfileio.cpp:349
+#: tdefileio.cpp:349
 msgid "Folder %1 is inaccessible."
 msgstr ""
 
-#: kfileio.cpp:380
+#: tdefileio.cpp:380
 msgid ""
 "Some files or folders do not have the right permissions, please correct them "
 "manually."
 msgstr ""
 
-#: kfileio.cpp:383
+#: tdefileio.cpp:383
 msgid "Permissions Check"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdepim/kabc2mutt.po b/tde-i18n-cy/messages/tdepim/tdeabc2mutt.po
index 11cb56655af..dfd5840d09f 100644
--- a/tde-i18n-cy/messages/tdepim/kabc2mutt.po
+++ b/tde-i18n-cy/messages/tdepim/tdeabc2mutt.po
@@ -1,10 +1,10 @@
-# translation of kabc2mutt.po to Cymraeg
+# translation of tdeabc2mutt.po to Cymraeg
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kabc2mutt\n"
+"Project-Id-Version: tdeabc2mutt\n"
 "POT-Creation-Date: 2005-04-12 18:18+0200\n"
 "PO-Revision-Date: 2004-01-07 14:13+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -14,17 +14,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kabc2mutt.cpp:115
+#: tdeabc2mutt.cpp:115
 msgid "preferred"
 msgstr ""
 
 #: main.cpp:30
-msgid "kabc2mutt"
-msgstr "kabc2mutt"
+msgid "tdeabc2mutt"
+msgstr "tdeabc2mutt"
 
 #: main.cpp:31
-msgid "kabc - mutt converter"
-msgstr "trosiadydd kabc - mutt"
+msgid "tdeabc - mutt converter"
+msgstr "trosiadydd tdeabc - mutt"
 
 #: main.cpp:35
 msgid "Only show contacts where name or address matches <substring>"
diff --git a/tde-i18n-cy/messages/tdepim/kabc_slox.po b/tde-i18n-cy/messages/tdepim/tdeabc_slox.po
index 81ac937eadf..f88e08f7aa5 100644
--- a/tde-i18n-cy/messages/tdepim/kabc_slox.po
+++ b/tde-i18n-cy/messages/tdepim/tdeabc_slox.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdepim/kabc_slox.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/tdeabc_slox.po\n"
 "POT-Creation-Date: 2006-05-17 04:02+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -21,34 +21,34 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: kabcresourceslox.cpp:214
+#: tdeabcresourceslox.cpp:214
 msgid "Downloading contacts"
 msgstr ""
 
-#: kabcresourceslox.cpp:523
+#: tdeabcresourceslox.cpp:523
 msgid "Uploading contacts"
 msgstr ""
 
-#: kabcresourcesloxconfig.cpp:47
+#: tdeabcresourcesloxconfig.cpp:47
 msgid "URL:"
 msgstr "URL:"
 
-#: kabcresourcesloxconfig.cpp:53 kcalresourcesloxconfig.cpp:56
+#: tdeabcresourcesloxconfig.cpp:53 kcalresourcesloxconfig.cpp:56
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: kabcresourcesloxconfig.cpp:59 kcalresourcesloxconfig.cpp:62
+#: tdeabcresourcesloxconfig.cpp:59 kcalresourcesloxconfig.cpp:62
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#. i18n: file kresources_kabc_slox.kcfg line 19
-#: kabcresourcesloxconfig.cpp:66 kcalresourcesloxconfig.cpp:69 rc.cpp:12
+#. i18n: file tderesources_tdeabc_slox.kcfg line 19
+#: tdeabcresourcesloxconfig.cpp:66 kcalresourcesloxconfig.cpp:69 rc.cpp:12
 #: rc.cpp:36
 #, no-c-format
 msgid "Only load data since last sync"
 msgstr ""
 
-#: kabcresourcesloxconfig.cpp:70
+#: tdeabcresourcesloxconfig.cpp:70
 msgid "Select Folder..."
 msgstr "Dewis Plygell ..."
 
@@ -92,55 +92,55 @@ msgstr ""
 msgid "Task Folder..."
 msgstr ""
 
-#. i18n: file kresources_kabc_slox.kcfg line 10
+#. i18n: file tderesources_tdeabc_slox.kcfg line 10
 #: rc.cpp:3 rc.cpp:21
 #, no-c-format
 msgid "Base Url"
 msgstr "URL Sylfaenol"
 
-#. i18n: file kresources_kabc_slox.kcfg line 13
+#. i18n: file tderesources_tdeabc_slox.kcfg line 13
 #: rc.cpp:6 rc.cpp:24
 #, no-c-format
 msgid "User Name"
 msgstr "Enw'r defnyddiwr"
 
-#. i18n: file kresources_kabc_slox.kcfg line 16
+#. i18n: file tderesources_tdeabc_slox.kcfg line 16
 #: rc.cpp:9 rc.cpp:27
 #, no-c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
-#. i18n: file kresources_kabc_slox.kcfg line 23
+#. i18n: file tderesources_tdeabc_slox.kcfg line 23
 #: rc.cpp:15 sloxfolderdialog.cpp:37
 #, no-c-format
 msgid "Folder ID"
 msgstr ""
 
-#. i18n: file kresources_kabc_slox.kcfg line 27
+#. i18n: file tderesources_tdeabc_slox.kcfg line 27
 #: rc.cpp:18
 #, no-c-format
 msgid "Last Sync"
 msgstr ""
 
-#. i18n: file kresources_kcal_slox.kcfg line 19
+#. i18n: file tderesources_kcal_slox.kcfg line 19
 #: rc.cpp:30
 #, no-c-format
 msgid "Last Event Sync"
 msgstr ""
 
-#. i18n: file kresources_kcal_slox.kcfg line 22
+#. i18n: file tderesources_kcal_slox.kcfg line 22
 #: rc.cpp:33
 #, no-c-format
 msgid "Last To-do Sync"
 msgstr ""
 
-#. i18n: file kresources_kcal_slox.kcfg line 29
+#. i18n: file tderesources_kcal_slox.kcfg line 29
 #: rc.cpp:39
 #, no-c-format
 msgid "Calendar Folder"
 msgstr ""
 
-#. i18n: file kresources_kcal_slox.kcfg line 33
+#. i18n: file tderesources_kcal_slox.kcfg line 33
 #: rc.cpp:42
 #, no-c-format
 msgid "Task Folder"
diff --git a/tde-i18n-cy/messages/tdepim/tdefile_ics.po b/tde-i18n-cy/messages/tdepim/tdefile_ics.po
index c4b62d1b158..ad832632c3e 100644
--- a/tde-i18n-cy/messages/tdepim/tdefile_ics.po
+++ b/tde-i18n-cy/messages/tdepim/tdefile_ics.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdepim/kfile_ics.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/tdefile_ics.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,30 +9,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_ics.cpp:42
+#: tdefile_ics.cpp:42
 msgid "Calendar Statistics"
 msgstr ""
 
-#: kfile_ics.cpp:44
+#: tdefile_ics.cpp:44
 msgid "Product ID"
 msgstr ""
 
-#: kfile_ics.cpp:45
+#: tdefile_ics.cpp:45
 msgid "Events"
 msgstr "Digwyddiadau"
 
-#: kfile_ics.cpp:46
+#: tdefile_ics.cpp:46
 msgid "To-dos"
 msgstr ""
 
-#: kfile_ics.cpp:47
+#: tdefile_ics.cpp:47
 msgid "Completed To-dos"
 msgstr ""
 
-#: kfile_ics.cpp:48
+#: tdefile_ics.cpp:48
 msgid "Overdue To-dos"
 msgstr ""
 
-#: kfile_ics.cpp:49
+#: tdefile_ics.cpp:49
 msgid "Journals"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdepim/tdefile_palm.po b/tde-i18n-cy/messages/tdepim/tdefile_palm.po
index 2baef198d73..09f084ba940 100644
--- a/tde-i18n-cy/messages/tdepim/tdefile_palm.po
+++ b/tde-i18n-cy/messages/tdepim/tdefile_palm.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdepim/kfile_palm.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/tdefile_palm.po\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,74 +9,74 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_palm.cpp:46
+#: tdefile_palm.cpp:46
 msgid "General Information"
 msgstr "Gwybodaeth Cyffredinol"
 
-#: kfile_palm.cpp:47
+#: tdefile_palm.cpp:47
 msgid "Name"
 msgstr "Enw"
 
-#: kfile_palm.cpp:48
+#: tdefile_palm.cpp:48
 msgid "DB Type"
 msgstr ""
 
-#: kfile_palm.cpp:49
+#: tdefile_palm.cpp:49
 msgid "Type ID"
 msgstr ""
 
-#: kfile_palm.cpp:50
+#: tdefile_palm.cpp:50
 msgid "Creator ID"
 msgstr ""
 
-#: kfile_palm.cpp:51
+#: tdefile_palm.cpp:51
 msgid "# of Records"
 msgstr ""
 
-#: kfile_palm.cpp:53
+#: tdefile_palm.cpp:53
 msgid "Time Stamps"
 msgstr ""
 
-#: kfile_palm.cpp:54
+#: tdefile_palm.cpp:54
 msgid "Creation Date"
 msgstr "Dyddiad Creu"
 
-#: kfile_palm.cpp:55
+#: tdefile_palm.cpp:55
 msgid "Modification Date"
 msgstr ""
 
-#: kfile_palm.cpp:56
+#: tdefile_palm.cpp:56
 msgid "Backup Date"
 msgstr ""
 
-#: kfile_palm.cpp:58
+#: tdefile_palm.cpp:58
 msgid "Flags"
 msgstr "Baneri"
 
-#: kfile_palm.cpp:59
+#: tdefile_palm.cpp:59
 msgid "Read-Only"
 msgstr "Darllenadwy yn Unig"
 
-#: kfile_palm.cpp:60
+#: tdefile_palm.cpp:60
 msgid "Make Backup"
 msgstr ""
 
-#: kfile_palm.cpp:61
+#: tdefile_palm.cpp:61
 msgid "Copy Protected"
 msgstr ""
 
-#: kfile_palm.cpp:62
+#: tdefile_palm.cpp:62
 msgid "Reset Handheld After Installing"
 msgstr ""
 
-#: kfile_palm.cpp:63
+#: tdefile_palm.cpp:63
 msgid "Exclude From Sync"
 msgstr ""
 
-#: kfile_palm.cpp:82
+#: tdefile_palm.cpp:82
 msgid "PalmOS Application"
 msgstr ""
 
-#: kfile_palm.cpp:82
+#: tdefile_palm.cpp:82
 msgid "PalmOS Record Database"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdepim/tdefile_rfc822.po b/tde-i18n-cy/messages/tdepim/tdefile_rfc822.po
index c9caad77501..8558a4b63df 100644
--- a/tde-i18n-cy/messages/tdepim/tdefile_rfc822.po
+++ b/tde-i18n-cy/messages/tdepim/tdefile_rfc822.po
@@ -1,10 +1,10 @@
-# translation of kfile_rfc822.po to Cymraeg
+# translation of tdefile_rfc822.po to Cymraeg
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_rfc822\n"
+"Project-Id-Version: tdefile_rfc822\n"
 "POT-Creation-Date: 2004-10-12 01:17+0200\n"
 "PO-Revision-Date: 2004-01-08 21:10+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -14,26 +14,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kfile_rfc822.cpp:54
+#: tdefile_rfc822.cpp:54
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_rfc822.cpp:58
+#: tdefile_rfc822.cpp:58
 msgid "From"
 msgstr "O"
 
-#: kfile_rfc822.cpp:59
+#: tdefile_rfc822.cpp:59
 msgid "To"
 msgstr "I"
 
-#: kfile_rfc822.cpp:60
+#: tdefile_rfc822.cpp:60
 msgid "Subject"
 msgstr "Pwnc"
 
-#: kfile_rfc822.cpp:61
+#: tdefile_rfc822.cpp:61
 msgid "Date"
 msgstr "Dyddiad"
 
-#: kfile_rfc822.cpp:62
+#: tdefile_rfc822.cpp:62
 msgid "Content-Type"
 msgstr "Math Cynnyws"
diff --git a/tde-i18n-cy/messages/tdepim/tdefile_vcf.po b/tde-i18n-cy/messages/tdepim/tdefile_vcf.po
index 97bae4c9f4e..f95024cb6d2 100644
--- a/tde-i18n-cy/messages/tdepim/tdefile_vcf.po
+++ b/tde-i18n-cy/messages/tdepim/tdefile_vcf.po
@@ -1,10 +1,10 @@
-# translation of kfile_vcf.po to Cymraeg
+# translation of tdefile_vcf.po to Cymraeg
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_vcf\n"
+"Project-Id-Version: tdefile_vcf\n"
 "POT-Creation-Date: 2008-01-07 01:17+0100\n"
 "PO-Revision-Date: 2004-01-08 21:11+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -14,18 +14,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kfile_vcf.cpp:45
+#: tdefile_vcf.cpp:45
 msgid "Technical Details"
 msgstr "Manylion Technegol"
 
-#: kfile_vcf.cpp:49
+#: tdefile_vcf.cpp:49
 msgid "Name"
 msgstr "Enw"
 
-#: kfile_vcf.cpp:50
+#: tdefile_vcf.cpp:50
 msgid "Email"
 msgstr "Ebost"
 
-#: kfile_vcf.cpp:51
+#: tdefile_vcf.cpp:51
 msgid "Telephone"
 msgstr "Teleffôn"
diff --git a/tde-i18n-cy/messages/tdepim/tdeio_imap4.po b/tde-i18n-cy/messages/tdepim/tdeio_imap4.po
index c0ac3fcc9b1..db8ce453d14 100644
--- a/tde-i18n-cy/messages/tdepim/tdeio_imap4.po
+++ b/tde-i18n-cy/messages/tdepim/tdeio_imap4.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdepim/kio_imap4.po\n"
+"Project-Id-Version: ../cy/messages//tdepim/tdeio_imap4.po\n"
 "POT-Creation-Date: 2008-01-26 01:19+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -148,7 +148,7 @@ msgstr ""
 "%2"
 
 #: imap4.cc:2147
-msgid "SASL authentication is not compiled into kio_imap4."
+msgid "SASL authentication is not compiled into tdeio_imap4."
 msgstr ""
 
 #: imap4.cc:2691
diff --git a/tde-i18n-cy/messages/tdepim/tdeio_mobile.po b/tde-i18n-cy/messages/tdepim/tdeio_mobile.po
index 6df6d48df46..bbaf4c8d50e 100644
--- a/tde-i18n-cy/messages/tdepim/tdeio_mobile.po
+++ b/tde-i18n-cy/messages/tdepim/tdeio_mobile.po
@@ -1,10 +1,10 @@
-# translation of kio_mobile.po to Cymraeg
+# translation of tdeio_mobile.po to Cymraeg
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_mobile\n"
+"Project-Id-Version: tdeio_mobile\n"
 "POT-Creation-Date: 2004-12-11 01:22+0100\n"
 "PO-Revision-Date: 2004-01-08 21:19+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -14,14 +14,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kio_mobile.cpp:436
+#: tdeio_mobile.cpp:436
 msgid "calendar"
 msgstr "calendr"
 
-#: kio_mobile.cpp:477
+#: tdeio_mobile.cpp:477
 msgid "note"
 msgstr "nodyn"
 
-#: kio_mobile.cpp:605
+#: tdeio_mobile.cpp:605
 msgid "TDE Mobile Device Manager"
 msgstr "Rheolydd Dyfais Symudol TDE"
diff --git a/tde-i18n-cy/messages/tdepim/tdeio_sieve.po b/tde-i18n-cy/messages/tdepim/tdeio_sieve.po
index 78c7d431012..37067ccd3a4 100644
--- a/tde-i18n-cy/messages/tdepim/tdeio_sieve.po
+++ b/tde-i18n-cy/messages/tdepim/tdeio_sieve.po
@@ -1,4 +1,4 @@
-# translation of kio_sieve.po to Cymraeg
+# translation of tdeio_sieve.po to Cymraeg
 # Penbwrdd yn Gymraeg.
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kio_sieve\n"
+"Project-Id-Version: tdeio_sieve\n"
 "POT-Creation-Date: 2008-03-07 02:10+0100\n"
 "PO-Revision-Date: 2004-01-08 21:20+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -59,8 +59,8 @@ msgid "Sending data..."
 msgstr "Yn anfon data..."
 
 #: sieve.cpp:532
-msgid "KIO data supply error."
-msgstr "Gwall darparu data KIO."
+msgid "TDEIO data supply error."
+msgstr "Gwall darparu data TDEIO."
 
 #: sieve.cpp:559
 msgid "Quota exceeded"
diff --git a/tde-i18n-cy/messages/tdepim/tdepimresources.po b/tde-i18n-cy/messages/tdepim/tdepimresources.po
index fbece3f6a36..85cc501baf6 100644
--- a/tde-i18n-cy/messages/tdepim/tdepimresources.po
+++ b/tde-i18n-cy/messages/tdepim/tdepimresources.po
@@ -96,25 +96,25 @@ msgid ""
 "%n items could not be uploaded."
 msgstr ""
 
-#: kabc_resourcegroupwarebase.cpp:92
+#: tdeabc_resourcegroupwarebase.cpp:92
 msgid "Downloading addressbook"
 msgstr ""
 
-#: kabc_resourcegroupwarebase.cpp:93
+#: tdeabc_resourcegroupwarebase.cpp:93
 msgid "Uploading addressbook"
 msgstr ""
 
-#: kabc_resourcegroupwarebaseconfig.cpp:45
+#: tdeabc_resourcegroupwarebaseconfig.cpp:45
 #: kcal_resourcegroupwarebaseconfig.cpp:54
 msgid "URL:"
 msgstr "URL:"
 
-#: kabc_resourcegroupwarebaseconfig.cpp:51
+#: tdeabc_resourcegroupwarebaseconfig.cpp:51
 #: kcal_resourcegroupwarebaseconfig.cpp:59
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: kabc_resourcegroupwarebaseconfig.cpp:57
+#: tdeabc_resourcegroupwarebaseconfig.cpp:57
 #: kcal_resourcegroupwarebaseconfig.cpp:64
 msgid "Password:"
 msgstr "Cyfrinair:"
@@ -139,55 +139,55 @@ msgstr "Wedi'u dileu"
 msgid "Configure Cache Settings..."
 msgstr ""
 
-#. i18n: file kresources_groupwareprefs.kcfg line 9
+#. i18n: file tderesources_groupwareprefs.kcfg line 9
 #: rc.cpp:3
 #, no-c-format
 msgid "Server URL"
 msgstr "URL y gweinydd: %1"
 
-#. i18n: file kresources_groupwareprefs.kcfg line 12
+#. i18n: file tderesources_groupwareprefs.kcfg line 12
 #: rc.cpp:6
 #, no-c-format
 msgid "User Name"
 msgstr "Enw'r defnyddiwr"
 
-#. i18n: file kresources_groupwareprefs.kcfg line 15
+#. i18n: file tderesources_groupwareprefs.kcfg line 15
 #: rc.cpp:9
 #, no-c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
-#. i18n: file kresources_groupwareprefs.kcfg line 20
+#. i18n: file tderesources_groupwareprefs.kcfg line 20
 #: rc.cpp:12
 #, no-c-format
 msgid "All folder IDs on the server"
 msgstr ""
 
-#. i18n: file kresources_groupwareprefs.kcfg line 23
+#. i18n: file tderesources_groupwareprefs.kcfg line 23
 #: rc.cpp:15
 #, no-c-format
 msgid "All folder names on the server"
 msgstr ""
 
-#. i18n: file kresources_groupwareprefs.kcfg line 26
+#. i18n: file tderesources_groupwareprefs.kcfg line 26
 #: rc.cpp:18
 #, no-c-format
 msgid "All active folders from the server"
 msgstr ""
 
-#. i18n: file kresources_groupwareprefs.kcfg line 29
+#. i18n: file tderesources_groupwareprefs.kcfg line 29
 #: rc.cpp:21
 #, no-c-format
 msgid "Number of folders on the server and in the config file"
 msgstr ""
 
-#. i18n: file kresources_groupwareprefs.kcfg line 35
+#. i18n: file tderesources_groupwareprefs.kcfg line 35
 #: rc.cpp:24
 #, no-c-format
 msgid "Default destinations for the various types"
 msgstr ""
 
-#. i18n: file kresources_groupwareprefs.kcfg line 38
+#. i18n: file tderesources_groupwareprefs.kcfg line 38
 #: rc.cpp:27
 #, no-c-format
 msgid ""
diff --git a/tde-i18n-cy/messages/tdesdk/kbabel.po b/tde-i18n-cy/messages/tdesdk/kbabel.po
index ba3944e7748..840034066d4 100644
--- a/tde-i18n-cy/messages/tdesdk/kbabel.po
+++ b/tde-i18n-cy/messages/tdesdk/kbabel.po
@@ -38,7 +38,7 @@ msgstr "Cyflwr"
 msgid "Last Revision"
 msgstr ""
 
-#: addons/kfile-plugins/kfile_po.cpp:56
+#: addons/tdefile-plugins/tdefile_po.cpp:56
 #: catalogmanager/catalogmanagerview.cpp:96
 msgid "Last Translator"
 msgstr ""
@@ -1025,7 +1025,7 @@ msgstr ""
 
 #: catalogmanager/catalogmanager.cpp:858
 msgid ""
-"Unable to use KLauncher to start KBabel.\n"
+"Unable to use TDELauncher to start KBabel.\n"
 "You should check the installation of TDE.\n"
 "Please start KBabel manually."
 msgstr ""
@@ -1182,27 +1182,27 @@ msgstr ""
 msgid "loading file"
 msgstr "llwytho ffeil..."
 
-#: addons/kfile-plugins/kfile_po.cpp:50
+#: addons/tdefile-plugins/tdefile_po.cpp:50
 msgid "Catalog Information"
 msgstr "Gwybodaeth Catalog"
 
-#: addons/kfile-plugins/kfile_po.cpp:53
+#: addons/tdefile-plugins/tdefile_po.cpp:53
 msgid "Total Messages"
 msgstr ""
 
-#: addons/kfile-plugins/kfile_po.cpp:54
+#: addons/tdefile-plugins/tdefile_po.cpp:54
 msgid "Fuzzy Messages"
 msgstr ""
 
-#: addons/kfile-plugins/kfile_po.cpp:55
+#: addons/tdefile-plugins/tdefile_po.cpp:55
 msgid "Untranslated Messages"
 msgstr ""
 
-#: addons/kfile-plugins/kfile_po.cpp:57
+#: addons/tdefile-plugins/tdefile_po.cpp:57
 msgid "Language Team"
 msgstr ""
 
-#: addons/kfile-plugins/kfile_po.cpp:58
+#: addons/tdefile-plugins/tdefile_po.cpp:58
 msgid "Revision"
 msgstr ""
 
@@ -1484,11 +1484,11 @@ msgstr "Gorchy&myn:"
 msgid "&Add"
 msgstr "&Ychwanegu"
 
-#: commonui/kactionselector.cpp:81
+#: commonui/tdeactionselector.cpp:81
 msgid "&Available:"
 msgstr "&Ar gael:"
 
-#: commonui/kactionselector.cpp:96
+#: commonui/tdeactionselector.cpp:96
 msgid "&Selected:"
 msgstr "&Wedi'u dewis:"
 
@@ -3258,7 +3258,7 @@ msgstr ""
 
 #: kbabel/kbabel.cpp:1266
 msgid ""
-"Unable to use KLauncher to start Catalog Manager. You should check the "
+"Unable to use TDELauncher to start Catalog Manager. You should check the "
 "installation of TDE.\n"
 "Please start Catalog Manager manually."
 msgstr ""
@@ -3566,13 +3566,13 @@ msgid ""
 "the database are used for diffing.</p></qt>"
 msgstr ""
 
-#. i18n: file ./commonui/klisteditor.ui line 151
+#. i18n: file ./commonui/tdelisteditor.ui line 151
 #: rc.cpp:152
 #, no-c-format
 msgid "Up"
 msgstr "I fyny"
 
-#. i18n: file ./commonui/klisteditor.ui line 162
+#. i18n: file ./commonui/tdelisteditor.ui line 162
 #: rc.cpp:155
 #, no-c-format
 msgid "Down"
diff --git a/tde-i18n-cy/messages/tdesdk/kbugbuster.po b/tde-i18n-cy/messages/tdesdk/kbugbuster.po
index d4f947eb21d..3d8fa21f517 100644
--- a/tde-i18n-cy/messages/tdesdk/kbugbuster.po
+++ b/tde-i18n-cy/messages/tdesdk/kbugbuster.po
@@ -41,19 +41,19 @@ msgstr ""
 msgid "(c) 2001,2002,2003 the KBugBuster authors"
 msgstr ""
 
-#. i18n: file kresources/kresources_kcal_bugzilla.kcfg line 10
+#. i18n: file tderesources/tderesources_kcal_bugzilla.kcfg line 10
 #: rc.cpp:3
 #, no-c-format
 msgid "Server"
 msgstr "Gweinydd"
 
-#. i18n: file kresources/kresources_kcal_bugzilla.kcfg line 13
+#. i18n: file tderesources/tderesources_kcal_bugzilla.kcfg line 13
 #: rc.cpp:6
 #, no-c-format
 msgid "Product"
 msgstr "Cynnyrch"
 
-#. i18n: file kresources/kresources_kcal_bugzilla.kcfg line 16
+#. i18n: file tderesources/tderesources_kcal_bugzilla.kcfg line 16
 #: rc.cpp:9
 #, no-c-format
 msgid "Component"
@@ -915,14 +915,14 @@ msgstr ""
 msgid "Select Severity"
 msgstr ""
 
-#: kresources/kcalresourceconfig.cpp:45
+#: tderesources/kcalresourceconfig.cpp:45
 msgid "Server:"
 msgstr " Gweinydd:"
 
-#: kresources/kcalresourceconfig.cpp:52
+#: tderesources/kcalresourceconfig.cpp:52
 msgid "Product:"
 msgstr "Cynnyrch :"
 
-#: kresources/kcalresourceconfig.cpp:59
+#: tderesources/kcalresourceconfig.cpp:59
 msgid "Component:"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdesdk/kres_bugzilla.po b/tde-i18n-cy/messages/tdesdk/kres_bugzilla.po
index d75828fb3e5..0c8c3450a5a 100644
--- a/tde-i18n-cy/messages/tdesdk/kres_bugzilla.po
+++ b/tde-i18n-cy/messages/tdesdk/kres_bugzilla.po
@@ -21,19 +21,19 @@ msgstr "Cynnyrch :"
 msgid "Component:"
 msgstr ""
 
-#. i18n: file kresources_kcal_bugzilla.kcfg line 10
+#. i18n: file tderesources_kcal_bugzilla.kcfg line 10
 #: rc.cpp:3
 #, no-c-format
 msgid "Server"
 msgstr "Gweinydd"
 
-#. i18n: file kresources_kcal_bugzilla.kcfg line 13
+#. i18n: file tderesources_kcal_bugzilla.kcfg line 13
 #: rc.cpp:6
 #, no-c-format
 msgid "Product"
 msgstr "Cynnyrch"
 
-#. i18n: file kresources_kcal_bugzilla.kcfg line 16
+#. i18n: file tderesources_kcal_bugzilla.kcfg line 16
 #: rc.cpp:9
 #, no-c-format
 msgid "Component"
diff --git a/tde-i18n-cy/messages/tdesdk/tdefile_cpp.po b/tde-i18n-cy/messages/tdesdk/tdefile_cpp.po
index c8a0a455697..04b88fb0f5f 100644
--- a/tde-i18n-cy/messages/tdesdk/tdefile_cpp.po
+++ b/tde-i18n-cy/messages/tdesdk/tdefile_cpp.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdesdk/kfile_cpp.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/tdefile_cpp.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,34 +9,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_cpp.cpp:48
+#: tdefile_cpp.cpp:48
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_cpp.cpp:51
+#: tdefile_cpp.cpp:51
 msgid "Lines"
 msgstr "Llinellau"
 
-#: kfile_cpp.cpp:53
+#: tdefile_cpp.cpp:53
 msgid "Code"
 msgstr ""
 
-#: kfile_cpp.cpp:55
+#: tdefile_cpp.cpp:55
 msgid "Comment"
 msgstr "Sylwad"
 
-#: kfile_cpp.cpp:57
+#: tdefile_cpp.cpp:57
 msgid "Blank"
 msgstr "Gwag"
 
-#: kfile_cpp.cpp:59
+#: tdefile_cpp.cpp:59
 msgid "Strings"
 msgstr ""
 
-#: kfile_cpp.cpp:61
+#: tdefile_cpp.cpp:61
 msgid "i18n Strings"
 msgstr ""
 
-#: kfile_cpp.cpp:63
+#: tdefile_cpp.cpp:63
 msgid "Included Files"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdesdk/tdefile_diff.po b/tde-i18n-cy/messages/tdesdk/tdefile_diff.po
index 039d43d246c..3ce28323c05 100644
--- a/tde-i18n-cy/messages/tdesdk/tdefile_diff.po
+++ b/tde-i18n-cy/messages/tdesdk/tdefile_diff.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdesdk/kfile_diff.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/tdefile_diff.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,90 +9,90 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_diff.cpp:56
+#: tdefile_diff.cpp:56
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_diff.cpp:58
+#: tdefile_diff.cpp:58
 msgid "First File"
 msgstr ""
 
-#: kfile_diff.cpp:59
+#: tdefile_diff.cpp:59
 msgid "Format"
 msgstr "Fformat"
 
-#: kfile_diff.cpp:60
+#: tdefile_diff.cpp:60
 msgid "Diff Program"
 msgstr ""
 
-#: kfile_diff.cpp:61
+#: tdefile_diff.cpp:61
 msgid "Hunks"
 msgstr ""
 
-#: kfile_diff.cpp:62
+#: tdefile_diff.cpp:62
 msgid "Statistics"
 msgstr "Ystadegau"
 
-#: kfile_diff.cpp:63
+#: tdefile_diff.cpp:63
 msgid "Insertions"
 msgstr ""
 
-#: kfile_diff.cpp:64
+#: tdefile_diff.cpp:64
 msgid "Changes"
 msgstr ""
 
-#: kfile_diff.cpp:65
+#: tdefile_diff.cpp:65
 msgid "Deletions"
 msgstr ""
 
-#: kfile_diff.cpp:280
+#: tdefile_diff.cpp:280
 msgid "Context"
 msgstr ""
 
-#: kfile_diff.cpp:283
+#: tdefile_diff.cpp:283
 msgid "Ed"
 msgstr ""
 
-#: kfile_diff.cpp:286
+#: tdefile_diff.cpp:286
 msgid "Normal"
 msgstr "Arferol"
 
-#: kfile_diff.cpp:289
+#: tdefile_diff.cpp:289
 msgid "RCS"
 msgstr ""
 
-#: kfile_diff.cpp:292
+#: tdefile_diff.cpp:292
 msgid "Unified"
 msgstr ""
 
-#: kfile_diff.cpp:295
+#: tdefile_diff.cpp:295
 msgid "Not Available (file empty)"
 msgstr ""
 
-#: kfile_diff.cpp:298 kfile_diff.cpp:328
+#: tdefile_diff.cpp:298 tdefile_diff.cpp:328
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: kfile_diff.cpp:301
+#: tdefile_diff.cpp:301
 msgid "Side by Side"
 msgstr ""
 
-#: kfile_diff.cpp:313
+#: tdefile_diff.cpp:313
 msgid "CVSDiff"
 msgstr ""
 
-#: kfile_diff.cpp:316
+#: tdefile_diff.cpp:316
 msgid "Diff"
 msgstr "Diff"
 
-#: kfile_diff.cpp:319
+#: tdefile_diff.cpp:319
 msgid "Diff3"
 msgstr ""
 
-#: kfile_diff.cpp:322
+#: tdefile_diff.cpp:322
 msgid "Perforce"
 msgstr ""
 
-#: kfile_diff.cpp:325
+#: tdefile_diff.cpp:325
 msgid "SubVersion"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdesdk/tdefile_po.po b/tde-i18n-cy/messages/tdesdk/tdefile_po.po
index 75e9e0f8668..7e6ef4cc9cb 100644
--- a/tde-i18n-cy/messages/tdesdk/tdefile_po.po
+++ b/tde-i18n-cy/messages/tdesdk/tdefile_po.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdesdk/kfile_po.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/tdefile_po.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,30 +9,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_po.cpp:50
+#: tdefile_po.cpp:50
 msgid "Catalog Information"
 msgstr "Gwybodaeth Catalog"
 
-#: kfile_po.cpp:53
+#: tdefile_po.cpp:53
 msgid "Total Messages"
 msgstr ""
 
-#: kfile_po.cpp:54
+#: tdefile_po.cpp:54
 msgid "Fuzzy Messages"
 msgstr ""
 
-#: kfile_po.cpp:55
+#: tdefile_po.cpp:55
 msgid "Untranslated Messages"
 msgstr ""
 
-#: kfile_po.cpp:56
+#: tdefile_po.cpp:56
 msgid "Last Translator"
 msgstr ""
 
-#: kfile_po.cpp:57
+#: tdefile_po.cpp:57
 msgid "Language Team"
 msgstr ""
 
-#: kfile_po.cpp:58
+#: tdefile_po.cpp:58
 msgid "Revision"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdesdk/tdefile_ts.po b/tde-i18n-cy/messages/tdesdk/tdefile_ts.po
index 03c550bdfc8..a965d1c3fb4 100644
--- a/tde-i18n-cy/messages/tdesdk/tdefile_ts.po
+++ b/tde-i18n-cy/messages/tdesdk/tdefile_ts.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdesdk/kfile_ts.po\n"
+"Project-Id-Version: ../cy/messages//tdesdk/tdefile_ts.po\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -9,22 +9,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_ts.cpp:43
+#: tdefile_ts.cpp:43
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kfile_ts.cpp:46
+#: tdefile_ts.cpp:46
 msgid "Messages"
 msgstr "Negeseuon"
 
-#: kfile_ts.cpp:48
+#: tdefile_ts.cpp:48
 msgid "Translated"
 msgstr ""
 
-#: kfile_ts.cpp:50
+#: tdefile_ts.cpp:50
 msgid "Untranslated"
 msgstr ""
 
-#: kfile_ts.cpp:52
+#: tdefile_ts.cpp:52
 msgid "Obsolete"
 msgstr "Anarferedig"
diff --git a/tde-i18n-cy/messages/tdeutils/kdf.po b/tde-i18n-cy/messages/tdeutils/kdf.po
index 0e2c9d75e4a..03b37126a3d 100644
--- a/tde-i18n-cy/messages/tdeutils/kdf.po
+++ b/tde-i18n-cy/messages/tdeutils/kdf.po
@@ -45,7 +45,7 @@ msgid ""
 "on all hardware architectures and/or operating systems."
 msgstr ""
 
-#: kconftest.cpp:44
+#: tdeconftest.cpp:44
 msgid "A test application"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdeutils/kregexpeditor.po b/tde-i18n-cy/messages/tdeutils/kregexpeditor.po
index 41bbbd49b7f..092548a1c08 100644
--- a/tde-i18n-cy/messages/tdeutils/kregexpeditor.po
+++ b/tde-i18n-cy/messages/tdeutils/kregexpeditor.po
@@ -742,31 +742,31 @@ msgstr ""
 msgid "Insert Blank"
 msgstr ""
 
-#: KMultiFormListBox/kmultiformlistbox-multivisible.cpp:264
+#: KMultiFormListBox/tdemultiformlistbox-multivisible.cpp:264
 msgid "Due to a bug, it is not possible to remove the last element."
 msgstr ""
 
-#: KMultiFormListBox/kmultiformlistbox-multivisible.cpp:264
+#: KMultiFormListBox/tdemultiformlistbox-multivisible.cpp:264
 msgid "Internal Error"
 msgstr "Gwall Mewnol"
 
-#: KMultiFormListBox/kmultiformlistbox-multivisible.cpp:282
+#: KMultiFormListBox/tdemultiformlistbox-multivisible.cpp:282
 msgid "There is no element on the clipboard to paste in."
 msgstr ""
 
-#: KMultiFormListBox/kmultiformlistbox-windowed.cpp:68
+#: KMultiFormListBox/tdemultiformlistbox-windowed.cpp:68
 msgid "Up"
 msgstr "I fyny"
 
-#: KMultiFormListBox/kmultiformlistbox-windowed.cpp:73
+#: KMultiFormListBox/tdemultiformlistbox-windowed.cpp:73
 msgid "Down"
 msgstr "I Lawr"
 
-#: KMultiFormListBox/kmultiformlistbox-windowed.cpp:153
+#: KMultiFormListBox/tdemultiformlistbox-windowed.cpp:153
 msgid "Delete item \"%1\"?"
 msgstr ""
 
-#: KMultiFormListBox/kmultiformlistbox-windowed.cpp:153
+#: KMultiFormListBox/tdemultiformlistbox-windowed.cpp:153
 msgid "Delete Item"
 msgstr "Dileu Eitem"
 
diff --git a/tde-i18n-cy/messages/tdevelop/tdevelop.po b/tde-i18n-cy/messages/tdevelop/tdevelop.po
index a676e975d18..63e620db801 100644
--- a/tde-i18n-cy/messages/tdevelop/tdevelop.po
+++ b/tde-i18n-cy/messages/tdevelop/tdevelop.po
@@ -1950,7 +1950,7 @@ msgstr ""
 #. i18n: file ./languages/cpp/app_templates/kdevpart2/globalconfigbase.ui line 16
 #: languages/cpp/app_templates/kapp/main.cpp:23
 #: languages/cpp/app_templates/kateplugin2/plugin_app.h:49
-#: languages/cpp/app_templates/kconfig35/main.cpp:22
+#: languages/cpp/app_templates/tdeconfig35/main.cpp:22
 #: languages/cpp/app_templates/kdedcop/main.cpp:22
 #: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:61
 #: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:62
@@ -1961,9 +1961,9 @@ msgstr ""
 #: languages/cpp/app_templates/kmake/app.cpp:21
 #: languages/cpp/app_templates/kofficepart/kopart_aboutdata.h:17
 #: languages/cpp/app_templates/kpartapp/main.cpp:21
-#: languages/cpp/app_templates/kscons_kmdi/main.cpp:24
+#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:24
 #: languages/cpp/app_templates/kscons_kxt/main.cpp:22
-#: languages/cpp/app_templates/kscreensaver/kscreensaver.cpp:18
+#: languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp:18
 #: languages/cpp/app_templates/kxt/main.cpp:22 rc.cpp:1361 rc.cpp:1364
 #: rc.cpp:1385 rc.cpp:1388 rc.cpp:1409 rc.cpp:1418
 #, no-c-format
@@ -1983,13 +1983,13 @@ msgstr "Allbwn"
 msgid "Hello"
 msgstr "Helo"
 
-#. i18n: file ./languages/cpp/app_templates/kscreensaver/kscreensaverui.ui line 18
+#. i18n: file ./languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui line 18
 #: rc.cpp:1373
 #, no-c-format
 msgid "Screen Saver Config"
 msgstr ""
 
-#. i18n: file ./languages/cpp/app_templates/kscreensaver/kscreensaverui.ui line 41
+#. i18n: file ./languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui line 41
 #: rc.cpp:1376
 #, no-c-format
 msgid "Set some setting"
@@ -2001,7 +2001,7 @@ msgstr ""
 msgid "%{APPNAME}_base"
 msgstr ""
 
-#. i18n: file ./languages/cpp/app_templates/kscons_kmdi/prefs.ui line 24
+#. i18n: file ./languages/cpp/app_templates/kscons_tdemdi/prefs.ui line 24
 #: rc.cpp:1406
 #, no-c-format
 msgid "Show close buttons on the right of tabs"
@@ -4620,8 +4620,8 @@ msgstr ""
 #: rc.cpp:3132
 #, no-c-format
 msgid ""
-"This is a front-end to TDE's KTrader: search your TDE documentation for more "
-"information about TDE services and KTrader"
+"This is a front-end to TDE's TDETrader: search your TDE documentation for more "
+"information about TDE services and TDETrader"
 msgstr ""
 
 #. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 46
@@ -5368,9 +5368,9 @@ msgid "Create New Project"
 msgstr ""
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 23
-#: languages/cpp/app_templates/kconfig35/app.cpp:77
+#: languages/cpp/app_templates/tdeconfig35/app.cpp:77
 #: languages/cpp/app_templates/kde4app/kapp4.cpp:84
-#: languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp:322
+#: languages/cpp/app_templates/kscons_tdemdi/appkmdi.cpp:322
 #: languages/cpp/app_templates/kscons_kxt/app.cpp:142
 #: languages/cpp/app_templates/kxt/app.cpp:137
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:580
@@ -12164,7 +12164,7 @@ msgid "Point"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 999
-#: languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp:32 rc.cpp:7986
+#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:32 rc.cpp:7986
 #, no-c-format
 msgid "Size"
 msgstr "Maint"
@@ -13950,7 +13950,7 @@ msgid "Column"
 msgstr "Colofn"
 
 #: languages/cpp/app_templates/kapp/main.cpp:11
-#: languages/cpp/app_templates/kconfig35/main.cpp:10
+#: languages/cpp/app_templates/tdeconfig35/main.cpp:10
 #: languages/cpp/app_templates/kmake/app.cpp:8
 #: languages/cpp/app_templates/kscons_kxt/main.cpp:10
 #: languages/cpp/app_templates/kxt/main.cpp:10
@@ -13958,29 +13958,29 @@ msgid "A TDE Application"
 msgstr "Cymhwysiad TDE"
 
 #: languages/cpp/app_templates/kapp/main.cpp:17
-#: languages/cpp/app_templates/kconfig35/main.cpp:16
+#: languages/cpp/app_templates/tdeconfig35/main.cpp:16
 #: languages/cpp/app_templates/kmake/app.cpp:14
 #: languages/cpp/app_templates/kpartapp/main.cpp:15
-#: languages/cpp/app_templates/kscons_kmdi/main.cpp:18
+#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:18
 #: languages/cpp/app_templates/kscons_kxt/main.cpp:16
 #: languages/cpp/app_templates/kxt/main.cpp:16
 msgid "Document to open"
 msgstr "Dogfen i'w hagor"
 
-#: languages/cpp/app_templates/kconfig35/appview.cpp:36
+#: languages/cpp/app_templates/tdeconfig35/appview.cpp:36
 #: languages/cpp/app_templates/kscons_kxt/appview.cpp:36
 #: languages/cpp/app_templates/kxt/appview.cpp:36
 msgid "This project is %1 days old"
 msgstr ""
 
-#: languages/cpp/app_templates/kconfig35/appview.cpp:37
+#: languages/cpp/app_templates/tdeconfig35/appview.cpp:37
 #: languages/cpp/app_templates/kde4app/kapp4view.cpp:39
 #: languages/cpp/app_templates/kscons_kxt/appview.cpp:37
 #: languages/cpp/app_templates/kxt/appview.cpp:37
 msgid "Settings changed"
 msgstr ""
 
-#: languages/cpp/app_templates/kconfig35/app.cpp:56
+#: languages/cpp/app_templates/tdeconfig35/app.cpp:56
 #: languages/cpp/app_templates/kde4app/kapp4.cpp:56
 #: languages/cpp/app_templates/kscons_kxt/app.cpp:79
 #: languages/cpp/app_templates/kxt/app.cpp:74
@@ -14082,13 +14082,13 @@ msgid "%{APPNAME}Part"
 msgstr ""
 
 #: languages/cpp/app_templates/kpartapp/app.cpp:55
-#: languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp:46
-#: languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp:53
+#: languages/cpp/app_templates/kscons_tdemdi/appkmdiView.cpp:46
+#: languages/cpp/app_templates/kscons_tdemdi/appkmdiView.cpp:53
 msgid "Could not find our part."
 msgstr "Methu canfod ein rhan."
 
 #: languages/cpp/app_templates/tdeioslave/slave.cpp:51
-#: vcs/subversion/svn_kio.cpp:249
+#: vcs/subversion/svn_tdeio.cpp:249
 msgid "Looking for %1..."
 msgstr ""
 
@@ -14116,7 +14116,7 @@ msgstr ""
 msgid "The URL you entered is not valid, please correct it and try again"
 msgstr "Nid yw'r URL a fewnosodwyd yn ddilys; cywirwch fo a ceisiwch eto"
 
-#: languages/cpp/app_templates/kcmodule/module.cpp:62
+#: languages/cpp/app_templates/tdecmodule/module.cpp:62
 msgid "Helpful information about the %{APPNAMELC} module."
 msgstr ""
 
@@ -14140,28 +14140,28 @@ msgstr ""
 msgid "This is a preferences box"
 msgstr ""
 
-#: languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp:26
+#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:26
 msgid "%{APPNAME} Information"
 msgstr ""
 
-#: languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp:31
+#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:31
 msgid "Items"
 msgstr "Eitemau"
 
-#: languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp:130
+#: languages/cpp/app_templates/kscons_tdemdi/appkmdi.cpp:130
 #: languages/cpp/app_templates/kscons_kxt/app.cpp:72
 msgid "This shows useful tips on the use of this application."
 msgstr "Dengys hwn gynghorion defnyddiol ar ddefnydd y cymhwysiad yma."
 
-#: languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp:84
+#: languages/cpp/app_templates/kscons_tdemdi/appkmdi.cpp:84
 msgid "Terminal"
 msgstr "Terfynell"
 
-#: languages/cpp/app_templates/kscons_kmdi/main.cpp:12
-msgid "A simple kmdi app"
+#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:12
+msgid "A simple tdemdi app"
 msgstr ""
 
-#: languages/cpp/app_templates/kscons_kmdi/app_part.cpp:56
+#: languages/cpp/app_templates/kscons_tdemdi/app_part.cpp:56
 msgid "%{APPNAMELC}Part"
 msgstr ""
 
@@ -17448,11 +17448,11 @@ msgstr ""
 msgid "KJS Embed Console"
 msgstr ""
 
-#: lib/util/kscriptactionmanager.cpp:98
+#: lib/util/tdescriptactionmanager.cpp:98
 msgid "Unable to get KScript Runner for type \"%1\"."
 msgstr "Methu cael Rhedydd KScript am fath \"%1\"."
 
-#: lib/util/kscriptactionmanager.cpp:98
+#: lib/util/tdescriptactionmanager.cpp:98
 msgid "KScript Error"
 msgstr "Gwall KScript"
 
@@ -18343,9 +18343,9 @@ msgid ""
 "Unable to find plugins, KDevelop will not work properly.\n"
 "Please make sure that KDevelop is installed in your TDE directory; otherwise, "
 "you have to add KDevelop's installation path to the environment variable "
-"TDEDIRS and run kbuildsycoca. Restart KDevelop afterwards.\n"
+"TDEDIRS and run tdebuildsycoca. Restart KDevelop afterwards.\n"
 "Example for BASH users:\n"
-"export TDEDIRS=/path/to/tdevelop:$TDEDIRS && kbuildsycoca"
+"export TDEDIRS=/path/to/tdevelop:$TDEDIRS && tdebuildsycoca"
 msgstr ""
 
 #: src/simplemainwindow.cpp:105
@@ -19086,196 +19086,196 @@ msgstr "Defnyddiwr"
 msgid "Cert"
 msgstr "Dychwelyd"
 
-#: vcs/subversion/svn_kio.cpp:226
+#: vcs/subversion/svn_tdeio.cpp:226
 #, c-format
 msgid "Username and Password for %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1385
+#: vcs/subversion/svn_tdeio.cpp:1385
 msgid "Nothing to commit."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1387
+#: vcs/subversion/svn_tdeio.cpp:1387
 #, fuzzy, c-format
 msgid "Committed revision %1."
 msgstr "S&ylwad:"
 
-#: vcs/subversion/svn_kio.cpp:1587
+#: vcs/subversion/svn_tdeio.cpp:1587
 #, fuzzy, c-format
 msgid "Copied Revision %1"
 msgstr "S&ylwad:"
 
-#: vcs/subversion/svn_kio.cpp:1590
+#: vcs/subversion/svn_tdeio.cpp:1590
 #, fuzzy
 msgid "Copied"
 msgstr "Gorffenwyd"
 
-#: vcs/subversion/svn_kio.cpp:1698
+#: vcs/subversion/svn_tdeio.cpp:1698
 msgid ""
 "This certificate from server could not be trusted automatically. Will you trust "
 "this certificate? "
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1903
+#: vcs/subversion/svn_tdeio.cpp:1903
 #, c-format
 msgid "A (bin) %1"
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1905 vcs/subversion/svn_kio.cpp:1938
+#: vcs/subversion/svn_tdeio.cpp:1905 vcs/subversion/svn_tdeio.cpp:1938
 #, fuzzy, c-format
 msgid "A %1"
 msgstr "Ychwanegu %1"
 
-#: vcs/subversion/svn_kio.cpp:1908
+#: vcs/subversion/svn_tdeio.cpp:1908
 msgid "Copied %1 "
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1912 vcs/subversion/svn_kio.cpp:1934
+#: vcs/subversion/svn_tdeio.cpp:1912 vcs/subversion/svn_tdeio.cpp:1934
 #, fuzzy, c-format
 msgid "D %1"
 msgstr "Ychwanegu %1"
 
-#: vcs/subversion/svn_kio.cpp:1915
+#: vcs/subversion/svn_tdeio.cpp:1915
 #, fuzzy, c-format
 msgid "Restored %1."
 msgstr "G&waredu"
 
-#: vcs/subversion/svn_kio.cpp:1918
+#: vcs/subversion/svn_tdeio.cpp:1918
 #, fuzzy, c-format
 msgid "Reverted %1."
 msgstr "G&waredu"
 
-#: vcs/subversion/svn_kio.cpp:1921
+#: vcs/subversion/svn_tdeio.cpp:1921
 msgid ""
 "Failed to revert %1.\n"
 "Try updating instead."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1924
+#: vcs/subversion/svn_tdeio.cpp:1924
 #, fuzzy, c-format
 msgid "Resolved conflicted state of %1."
 msgstr "Gwaredu Cysylltiad"
 
-#: vcs/subversion/svn_kio.cpp:1928
+#: vcs/subversion/svn_tdeio.cpp:1928
 #, c-format
 msgid "Skipped missing target %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1930
+#: vcs/subversion/svn_tdeio.cpp:1930
 #, c-format
 msgid "Skipped  %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1983
+#: vcs/subversion/svn_tdeio.cpp:1983
 #, c-format
 msgid "Exported external at revision %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1985
+#: vcs/subversion/svn_tdeio.cpp:1985
 #, c-format
 msgid "Exported revision %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1988
+#: vcs/subversion/svn_tdeio.cpp:1988
 #, c-format
 msgid "Checked out external at revision %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1990
+#: vcs/subversion/svn_tdeio.cpp:1990
 #, c-format
 msgid "Checked out revision %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1994
+#: vcs/subversion/svn_tdeio.cpp:1994
 #, c-format
 msgid "Updated external to revision %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1996
+#: vcs/subversion/svn_tdeio.cpp:1996
 #, c-format
 msgid "Updated to revision %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:1999
+#: vcs/subversion/svn_tdeio.cpp:1999
 #, fuzzy, c-format
 msgid "External at revision %1."
 msgstr "Offer Allanol"
 
-#: vcs/subversion/svn_kio.cpp:2001
+#: vcs/subversion/svn_tdeio.cpp:2001
 #, fuzzy, c-format
 msgid "At revision %1."
 msgstr "Fersiwn %1"
 
-#: vcs/subversion/svn_kio.cpp:2007
+#: vcs/subversion/svn_tdeio.cpp:2007
 #, fuzzy
 msgid "External export complete."
 msgstr "Offer Allanol"
 
-#: vcs/subversion/svn_kio.cpp:2009
+#: vcs/subversion/svn_tdeio.cpp:2009
 msgid "Export complete."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:2012
+#: vcs/subversion/svn_tdeio.cpp:2012
 msgid "External checkout complete."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:2014
+#: vcs/subversion/svn_tdeio.cpp:2014
 msgid "Checkout complete."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:2017
+#: vcs/subversion/svn_tdeio.cpp:2017
 msgid "External update complete."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:2019
+#: vcs/subversion/svn_tdeio.cpp:2019
 msgid "Update complete."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:2029
+#: vcs/subversion/svn_tdeio.cpp:2029
 #, c-format
 msgid "Fetching external item into %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:2033
+#: vcs/subversion/svn_tdeio.cpp:2033
 #, c-format
 msgid "Status against revision: %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:2036
+#: vcs/subversion/svn_tdeio.cpp:2036
 #, c-format
 msgid "Performing status on external item at %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:2039
+#: vcs/subversion/svn_tdeio.cpp:2039
 #, fuzzy, c-format
 msgid "Sending %1"
 msgstr "llwytho : %1"
 
-#: vcs/subversion/svn_kio.cpp:2043
+#: vcs/subversion/svn_tdeio.cpp:2043
 #, fuzzy, c-format
 msgid "Adding (bin) %1."
 msgstr "&Ychwanegu Ffeil..."
 
-#: vcs/subversion/svn_kio.cpp:2045
+#: vcs/subversion/svn_tdeio.cpp:2045
 #, fuzzy, c-format
 msgid "Adding %1."
 msgstr "Ychwanegu %1"
 
-#: vcs/subversion/svn_kio.cpp:2049
+#: vcs/subversion/svn_tdeio.cpp:2049
 #, c-format
 msgid "Deleting %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:2052
+#: vcs/subversion/svn_tdeio.cpp:2052
 #, c-format
 msgid "Replacing %1."
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:2057
+#: vcs/subversion/svn_tdeio.cpp:2057
 msgid "Transmitting file data "
 msgstr ""
 
-#: vcs/subversion/svn_kio.cpp:2065
+#: vcs/subversion/svn_tdeio.cpp:2065
 #, c-format
 msgid "Blame %1."
 msgstr ""
@@ -20173,14 +20173,14 @@ msgid "&Part Explorer"
 msgstr ""
 
 #: parts/partexplorer/partexplorer_plugin.cpp:45
-msgid "KTrader query execution"
+msgid "TDETrader query execution"
 msgstr ""
 
 #: parts/partexplorer/partexplorer_plugin.cpp:46
 msgid ""
 "<b>Part explorer</b>"
-"<p>Shows a dialog for KTrader query execution. Search your TDE documentation "
-"for more information about TDE services and KTrader."
+"<p>Shows a dialog for TDETrader query execution. Search your TDE documentation "
+"for more information about TDE services and TDETrader."
 msgstr ""
 
 #: parts/replace/replace_part.cpp:43
@@ -23387,11 +23387,11 @@ msgid ""
 "It can be downloaded from www.graphviz.org."
 msgstr ""
 
-#: parts/fileselector/kactionselector.cpp:70
+#: parts/fileselector/tdeactionselector.cpp:70
 msgid "&Available:"
 msgstr "&Ar gael:"
 
-#: parts/fileselector/kactionselector.cpp:85
+#: parts/fileselector/tdeactionselector.cpp:85
 msgid "&Selected:"
 msgstr "&Wedi'u dewis:"
 
diff --git a/tde-i18n-cy/messages/tdewebdev/quanta.po b/tde-i18n-cy/messages/tdewebdev/quanta.po
index f6065e5dd06..b4fbddd4ff9 100644
--- a/tde-i18n-cy/messages/tdewebdev/quanta.po
+++ b/tde-i18n-cy/messages/tdewebdev/quanta.po
@@ -432,7 +432,7 @@ msgid ""
 "<h3>Will you help make a difference?</h3></div>\n"
 "&nbsp;&nbsp;&nbsp;&nbsp;If you wish to donate through PayPal\n"
 "(online money transfer or credit card), visit our <a "
-"href=\"http://tdewebdev.org/donate.php\">donation page</a>.\n"
+"href=\"http://kdewebdev.org/donate.php\">donation page</a>.\n"
 "<br>&nbsp;&nbsp;&nbsp;&nbsp;If you are outside the PayPal area or wish to "
 "discuss corporate sponsorship contact the project manager:"
 "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Eric Laffoon, <a "
@@ -444,7 +444,7 @@ msgstr ""
 #: rc.cpp:229
 #, no-c-format
 msgid ""
-"<a href=\"http://tdewebdev.org/donate.php\">Donate</a> through  PayPal now."
+"<a href=\"http://kdewebdev.org/donate.php\">Donate</a> through  PayPal now."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 25
@@ -4915,8 +4915,8 @@ msgid ""
 "Lead Developer - Andras Mantia <a "
 "href=\"mailto:amantia@kde.org?subject=ScriptInfo\">amantia@kde.org</a><br />"
 "Kommander - Michal Rudolf <a "
-"href=\"mailto:mrudolf@tdewebdev.org?subject=ScriptInfo\">"
-"mrudolf@tdewebdev.org</a><br />Project Lead - Eric Laffoon <a "
+"href=\"mailto:mrudolf@kdewebdev.org?subject=ScriptInfo\">"
+"mrudolf@kdewebdev.org</a><br />Project Lead - Eric Laffoon <a "
 "href=\"mailto:sequitur@kde.org?subject=ScriptInfo\">sequitur@kde.org</a></p>\n"
 "</body></html>\n"
 msgstr ""
@@ -8819,7 +8819,7 @@ msgstr ""
 #: tips.cpp:45
 msgid ""
 "<p>...that you can create remote projects and manage them with the\n"
-"<b>kio slave of your choice</b>? Look in the project settings dialog.\n"
+"<b>tdeio slave of your choice</b>? Look in the project settings dialog.\n"
 "</p>\n"
 msgstr ""
 
@@ -8913,14 +8913,14 @@ msgstr ""
 msgid ""
 "<p>...that we have additional mailing lists to support our users? Lists include "
 "Kommander and web development help.<b><a "
-"href=\"http://mail.tdewebdev.org/mailman/listinfo\">Click here to see</a></b>.\n"
+"href=\"http://mail.kdewebdev.org/mailman/listinfo\">Click here to see</a></b>.\n"
 "</p>\n"
 msgstr ""
 
 #: tips.cpp:129
 msgid ""
 "<p>...that you can help to financially support our program of sponsoring "
-"developers? <b><a href=\"http://tdewebdev.org/donate.php\">"
+"developers? <b><a href=\"http://kdewebdev.org/donate.php\">"
 "Click here to help</a></b>.\n"
 "</p>\n"
 msgstr ""
@@ -9172,7 +9172,7 @@ msgstr ""
 msgid ""
 "<p>...that you can contribute to <b>Quanta's public repository</b> "
 "of resources? Just <a "
-"href=\"mailto:submissions@tdewebdev.org?subject=Quanta%20Resource\">"
+"href=\"mailto:submissions@kdewebdev.org?subject=Quanta%20Resource\">"
 "email it here</a>.\n"
 "</p>\n"
 msgstr ""
@@ -9260,7 +9260,7 @@ msgstr "&Ffenestr"
 #: src/quanta.cpp:1152
 msgid ""
 "Changes made in the preview configuration dialog are global and have effect on "
-"every application using the KHTML part to display web pages, including "
+"every application using the TDEHTML part to display web pages, including "
 "Konqueror."
 msgstr ""
 
@@ -9379,7 +9379,7 @@ msgstr ""
 #: src/quanta.cpp:2740
 msgid ""
 "Hi,\n"
-" This is a Quanta Plus [http://quanta.tdewebdev.org] toolbar.\n"
+" This is a Quanta Plus [http://quanta.kdewebdev.org] toolbar.\n"
 "\n"
 "Have fun.\n"
 msgstr ""
@@ -9462,7 +9462,7 @@ msgstr ""
 #: src/quanta.cpp:3614
 msgid ""
 "Hi,\n"
-" This is a Quanta Plus [http://quanta.tdewebdev.org] DTEP definition tarball.\n"
+" This is a Quanta Plus [http://quanta.kdewebdev.org] DTEP definition tarball.\n"
 "\n"
 "Have fun.\n"
 msgstr ""
@@ -9551,7 +9551,7 @@ msgstr "Strwythur Dogfen"
 msgid "Close &Other Tabs"
 msgstr "Cau Tabiau &Eraill"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2581
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2581
 #: src/viewmanager.cpp:72
 msgid "Close &All"
 msgstr "Cau'r &Cwbl"
@@ -11742,7 +11742,7 @@ msgstr ""
 #: treeviews/templatestreeview.cpp:987
 msgid ""
 "Hi,\n"
-" This is a Quanta Plus [http://quanta.tdewebdev.org] template tarball.\n"
+" This is a Quanta Plus [http://quanta.kdewebdev.org] template tarball.\n"
 "\n"
 "Have fun.\n"
 msgstr ""
@@ -11844,7 +11844,7 @@ msgstr ""
 #: treeviews/scripttreeview.cpp:275
 msgid ""
 "Hi,\n"
-" This is a Quanta Plus [http://quanta.tdewebdev.org] script tarball.\n"
+" This is a Quanta Plus [http://quanta.kdewebdev.org] script tarball.\n"
 "\n"
 "Have fun.\n"
 msgstr ""
@@ -13334,210 +13334,210 @@ msgstr ""
 msgid "Delete Event Configuration"
 msgstr ""
 
-#: ../lib/compatibility/kmdi/qextmdi/ktabbar.cpp:195
+#: ../lib/compatibility/tdemdi/qextmdi/ktabbar.cpp:195
 msgid "Close this tab"
 msgstr "Cau'r tab yma"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:139
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:139
 msgid "Tool &Views"
 msgstr "Golygfeydd &Offer"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:142
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:142
 msgid "MDI Mode"
 msgstr "Modd MDI"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:144
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2598
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2598
 msgid "&Toplevel Mode"
 msgstr "&Modd Gwastad Uchaf"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:144
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2599
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2599
 msgid "C&hildframe Mode"
 msgstr "Modd Ffrâm &Plentyn"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:144
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2600
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2600
 msgid "Ta&b Page Mode"
 msgstr "Modd Tudalen Ta&b"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:144
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2601
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2601
 msgid "I&DEAl Mode"
 msgstr "Modd I&DEAI"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:154
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:154
 msgid "Tool &Docks"
 msgstr "Dociau &Offer"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:155
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:155
 msgid "Switch Top Dock"
 msgstr "Newid y Doc wrth y Pen"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:157
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:157
 msgid "Switch Left Dock"
 msgstr "Newid y Doc ar y Chwith"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:159
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:159
 msgid "Switch Right Dock"
 msgstr "Newid y Doc ar y Dde"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:161
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:161
 msgid "Switch Bottom Dock"
 msgstr "Newid y Doc wrth y Gwaelod"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:164
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:164
 msgid "Previous Tool View"
 msgstr "Golwg Offer Cynt"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:166
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:166
 msgid "Next Tool View"
 msgstr "Golwg Offer Nesaf"
 
-#: ../lib/compatibility/kmdi/qextmdi/kdockwidget.cpp:2884
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:260
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:2884
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:260
 #, c-format
 msgid "Show %1"
 msgstr "Dangos %1"
 
-#: ../lib/compatibility/kmdi/qextmdi/kdockwidget.cpp:2878
-#: ../lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp:265
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:2878
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:265
 #, c-format
 msgid "Hide %1"
 msgstr "Cuddio %1"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:983
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:983
 msgid "Window"
 msgstr "Ffenestr"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:996
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:996
 msgid "Undock"
 msgstr "Dad-ddocio"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:1001
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1001
 msgid "Maximize"
 msgstr "Ehangu"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:1003
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1003
 msgid "Minimize"
 msgstr "Lleihau"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:1006
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1006
 msgid "Dock"
 msgstr "Doc"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:1011
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1011
 msgid "Operations"
 msgstr "Gweithrediadau"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2590
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2590
 msgid "&Minimize All"
 msgstr "Llei&hau'r Cwbl"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2596
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2596
 msgid "&MDI Mode"
 msgstr "&Modd MDI"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2623
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2623
 msgid "&Tile"
 msgstr "&Teilio"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2625
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2625
 msgid "Ca&scade Windows"
 msgstr "Rhae&adru Ffenestri"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2626
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2626
 msgid "Cascade &Maximized"
 msgstr "Rhaeadru wedi'u &Ehangu"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2627
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2627
 msgid "Expand &Vertically"
 msgstr "Ehangu'n &Fertigol"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2628
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2628
 msgid "Expand &Horizontally"
 msgstr "Ehangu'n &Llorweddol"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2629
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2629
 msgid "Tile &Non-Overlapped"
 msgstr "Teilio wedi'u &Di-orgyffwrdd"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2630
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2630
 msgid "Tile Overla&pped"
 msgstr "Teilio wedi'u &Gorgyffwrdd"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2631
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2631
 msgid "Tile V&ertically"
 msgstr "Teilio'n Fe&rtigol"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp:2637
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2637
 msgid "&Dock/Undock"
 msgstr "&Docio/Dad-ddocio"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp:71
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildview.cpp:63
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildview.cpp:88
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp:71
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp:63
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp:88
 msgid "Unnamed"
 msgstr "Di-enw"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp:1237
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp:1259
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1237
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1259
 msgid "&Restore"
 msgstr "&Adfer"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp:1238
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1238
 msgid "&Move"
 msgstr "Sy&mud"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp:1239
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1239
 msgid "R&esize"
 msgstr "Ne&wid Maint"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp:1240
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1240
 msgid "M&inimize"
 msgstr "Lle&ihau"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp:1241
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1241
 msgid "M&aximize"
 msgstr "Ch&wyddo"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp:1261
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1261
 msgid "&Maximize"
 msgstr "&Chwyddo"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp:1263
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1263
 msgid "&Minimize"
 msgstr "Llei&hau"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp:1265
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1265
 msgid "M&ove"
 msgstr "&Symud"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp:1267
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1267
 msgid "&Resize"
 msgstr "Newid &Maint"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp:1270
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1270
 msgid "&Undock"
 msgstr "&Dad-ddocio"
 
-#: ../lib/compatibility/kmdi/qextmdi/kdockwidget.cpp:237
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:237
 msgid ""
 "_: Freeze the window geometry\n"
 "Freeze"
 msgstr "Rhewi"
 
-#: ../lib/compatibility/kmdi/qextmdi/kdockwidget.cpp:244
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:244
 msgid ""
 "_: Dock this window\n"
 "Dock"
 msgstr "Clymu"
 
-#: ../lib/compatibility/kmdi/qextmdi/kdockwidget.cpp:251
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:251
 msgid "Detach"
 msgstr "Dat-glymu"
 
-#: ../lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp:215
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp:215
 msgid ""
 "_: Switch between overlap and side by side mode\n"
 "Overlap"
diff --git a/tde-i18n-cy/messages/tdewebdev/tdefilereplace.po b/tde-i18n-cy/messages/tdewebdev/tdefilereplace.po
index a2fd8d47818..e423b45ae75 100644
--- a/tde-i18n-cy/messages/tdewebdev/tdefilereplace.po
+++ b/tde-i18n-cy/messages/tdewebdev/tdefilereplace.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: ../cy/messages//tdewebdev/kfilereplace.po\n"
+"Project-Id-Version: ../cy/messages//tdewebdev/tdefilereplace.po\n"
 "POT-Creation-Date: 2008-07-08 01:25+0200\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
@@ -25,52 +25,52 @@ msgstr "kyfieithu@dotmon.com"
 msgid " Line:%3,Col:%4 - \"%1\" -> \"%2\""
 msgstr ""
 
-#: kfilereplace.cpp:49
+#: tdefilereplace.cpp:49
 msgid "Could not find the KFileReplace part."
 msgstr ""
 
-#: kfilereplacelib.cpp:99
+#: tdefilereplacelib.cpp:99
 #, c-format
 msgid ""
 "_n: 1 byte\n"
 "%n bytes"
 msgstr ""
 
-#: kfilereplacelib.cpp:105
+#: tdefilereplacelib.cpp:105
 msgid "%1 KB"
 msgstr "%1 KB"
 
-#: kfilereplacelib.cpp:111
+#: tdefilereplacelib.cpp:111
 msgid "%1 MB"
 msgstr "%1 MB"
 
-#: kfilereplacelib.cpp:117
+#: tdefilereplacelib.cpp:117
 msgid "%1 GB"
 msgstr "%1 GB"
 
-#: kfilereplacelib.cpp:140
+#: tdefilereplacelib.cpp:140
 msgid ""
 "<qt>Cannot open the file <b>%1</b> and load the string list. This file seems "
 "not to be a valid old kfr file or it is broken.</qt>"
 msgstr ""
 
-#: kfilereplacelib.cpp:158 kfilereplacelib.cpp:171 kfilereplacelib.cpp:177
+#: tdefilereplacelib.cpp:158 tdefilereplacelib.cpp:171 tdefilereplacelib.cpp:177
 msgid "Cannot read data."
 msgstr ""
 
-#: kfilereplacelib.cpp:167
+#: tdefilereplacelib.cpp:167
 msgid "Out of memory."
 msgstr "Allan o gof."
 
-#: kfilereplacepart.cpp:102
+#: tdefilereplacepart.cpp:102
 msgid "Ready."
 msgstr "Parod."
 
-#: kfilereplacepart.cpp:151
+#: tdefilereplacepart.cpp:151
 msgid "Search completed."
 msgstr ""
 
-#: kfilereplacepart.cpp:164
+#: tdefilereplacepart.cpp:164
 msgid ""
 "<qt>You have selected <b>%1</b> as the encoding of the files."
 "<br>Selecting the correct encoding is very important as if you have files that "
@@ -83,320 +83,320 @@ msgid ""
 "utf8</i>.</qt>"
 msgstr ""
 
-#: kfilereplacepart.cpp:164
+#: tdefilereplacepart.cpp:164
 msgid "File Encoding Warning"
 msgstr ""
 
-#: kfilereplacepart.cpp:173
+#: tdefilereplacepart.cpp:173
 msgid "Replacing files (simulation)..."
 msgstr ""
 
-#: kfilereplacepart.cpp:174
+#: tdefilereplacepart.cpp:174
 msgid "Replaced strings (simulation)"
 msgstr ""
 
-#: kfilereplacepart.cpp:178
+#: tdefilereplacepart.cpp:178
 msgid "Replacing files..."
 msgstr ""
 
-#: kfilereplacepart.cpp:179
+#: tdefilereplacepart.cpp:179
 msgid "Replaced strings"
 msgstr ""
 
-#: kfilereplacepart.cpp:233
+#: tdefilereplacepart.cpp:233
 #, fuzzy
 msgid "Stopping..."
 msgstr "Aros."
 
-#: kfilereplacepart.cpp:247
+#: tdefilereplacepart.cpp:247
 msgid "There are no results to save: the result list is empty."
 msgstr ""
 
-#: kfilereplacepart.cpp:251
+#: tdefilereplacepart.cpp:251
 msgid "Save Report"
 msgstr ""
 
-#: kfilereplacepart.cpp:261
+#: tdefilereplacepart.cpp:261
 msgid "<qt>A folder or a file named <b>%1</b> already exists.</qt>"
 msgstr ""
 
-#: kfilereplacepart.cpp:269
+#: tdefilereplacepart.cpp:269
 msgid "<qt>Cannot create the <b>%1</b> folder.</qt>"
 msgstr ""
 
-#: kfilereplacepart.cpp:347
+#: tdefilereplacepart.cpp:347
 msgid "KFileReplace strings"
 msgstr ""
 
-#: kfilereplacepart.cpp:347 kfilereplaceview.cpp:425
+#: tdefilereplacepart.cpp:347 tdefilereplaceview.cpp:425
 msgid "All Files"
 msgstr "Pob Ffeil"
 
-#: kfilereplacepart.cpp:348
+#: tdefilereplacepart.cpp:348
 msgid "Load Strings From File"
 msgstr ""
 
-#: kfilereplacepart.cpp:381
+#: tdefilereplacepart.cpp:381
 msgid "Cannot open folders."
 msgstr ""
 
-#: kfilereplacepart.cpp:513
+#: tdefilereplacepart.cpp:513
 msgid "KFileReplacePart"
 msgstr ""
 
-#: kfilereplacepart.cpp:515
+#: tdefilereplacepart.cpp:515
 msgid "Batch search and replace tool."
 msgstr ""
 
-#: kfilereplacepart.cpp:517 main.cpp:38
+#: tdefilereplacepart.cpp:517 main.cpp:38
 msgid "Part of the TDEWebDev module."
 msgstr ""
 
-#: kfilereplacepart.cpp:519 main.cpp:44
+#: tdefilereplacepart.cpp:519 main.cpp:44
 msgid "Original author of the KFileReplace tool"
 msgstr ""
 
-#: kfilereplacepart.cpp:522 main.cpp:42
+#: tdefilereplacepart.cpp:522 main.cpp:42
 msgid "Current maintainer, code cleaner and rewriter"
 msgstr ""
 
-#: kfilereplacepart.cpp:525
+#: tdefilereplacepart.cpp:525
 msgid "Co-maintainer, KPart creator"
 msgstr ""
 
-#: kfilereplacepart.cpp:528
+#: tdefilereplacepart.cpp:528
 msgid "Original german translator"
 msgstr ""
 
-#: kfilereplacepart.cpp:538
+#: tdefilereplacepart.cpp:538
 msgid "Sorry, currently the KFileReplace part works only for local files."
 msgstr ""
 
-#: kfilereplacepart.cpp:538
+#: tdefilereplacepart.cpp:538
 msgid "Non Local File"
 msgstr ""
 
-#: kfilereplacepart.cpp:570
+#: tdefilereplacepart.cpp:570
 msgid "Customize Search/Replace Session..."
 msgstr ""
 
-#: kfilereplacepart.cpp:571
+#: tdefilereplacepart.cpp:571
 msgid "&Search"
 msgstr " &Chwilio"
 
-#: kfilereplacepart.cpp:572
+#: tdefilereplacepart.cpp:572
 msgid "S&imulate"
 msgstr ""
 
-#: kfilereplacepart.cpp:573
+#: tdefilereplacepart.cpp:573
 msgid "&Replace"
 msgstr "A&mnewid"
 
-#: kfilereplacepart.cpp:574
+#: tdefilereplacepart.cpp:574
 msgid "Sto&p"
 msgstr "&Aros"
 
-#: kfilereplacepart.cpp:575
+#: tdefilereplacepart.cpp:575
 msgid "Cre&ate Report File..."
 msgstr ""
 
-#: kfilereplacepart.cpp:578
+#: tdefilereplacepart.cpp:578
 #, fuzzy
 msgid "&Add String..."
 msgstr "Aros."
 
-#: kfilereplacepart.cpp:580
+#: tdefilereplacepart.cpp:580
 msgid "&Delete String"
 msgstr ""
 
-#: kfilereplacepart.cpp:581
+#: tdefilereplacepart.cpp:581
 msgid "&Empty Strings List"
 msgstr ""
 
-#: kfilereplacepart.cpp:582
+#: tdefilereplacepart.cpp:582
 msgid "Edit Selected String..."
 msgstr ""
 
-#: kfilereplacepart.cpp:583
+#: tdefilereplacepart.cpp:583
 msgid "&Save Strings List to File..."
 msgstr ""
 
-#: kfilereplacepart.cpp:584
+#: tdefilereplacepart.cpp:584
 msgid "&Load Strings List From File..."
 msgstr ""
 
-#: kfilereplacepart.cpp:585
+#: tdefilereplacepart.cpp:585
 msgid "&Load Recent Strings Files"
 msgstr ""
 
-#: kfilereplacepart.cpp:586
+#: tdefilereplacepart.cpp:586
 msgid "&Invert Current String (search <--> replace)"
 msgstr ""
 
-#: kfilereplacepart.cpp:587
+#: tdefilereplacepart.cpp:587
 msgid "&Invert All Strings (search <--> replace)"
 msgstr ""
 
-#: kfilereplacepart.cpp:590
+#: tdefilereplacepart.cpp:590
 msgid "&Include Sub-Folders"
 msgstr ""
 
-#: kfilereplacepart.cpp:591
+#: tdefilereplacepart.cpp:591
 msgid "Create &Backup Files"
 msgstr ""
 
-#: kfilereplacepart.cpp:592
+#: tdefilereplacepart.cpp:592
 msgid "Case &Sensitive"
 msgstr "Mae l&lythrennau mawr/bach o bwys"
 
-#: kfilereplacepart.cpp:593
+#: tdefilereplacepart.cpp:593
 msgid "Enable Commands &in Replace String: [$command:option$]"
 msgstr ""
 
-#: kfilereplacepart.cpp:594
+#: tdefilereplacepart.cpp:594
 msgid "Enable &Regular Expressions"
 msgstr ""
 
-#: kfilereplacepart.cpp:595
+#: tdefilereplacepart.cpp:595
 #, fuzzy
 msgid "Configure &KFileReplace..."
 msgstr "A&mnewid"
 
-#: kfilereplacepart.cpp:598 kfilereplaceview.cpp:530
+#: tdefilereplacepart.cpp:598 tdefilereplaceview.cpp:530
 msgid "&Properties"
 msgstr "&Priodweddau"
 
-#: kfilereplacepart.cpp:599 kfilereplaceview.cpp:502
+#: tdefilereplacepart.cpp:599 tdefilereplaceview.cpp:502
 msgid "&Open"
 msgstr "A&gor"
 
-#: kfilereplacepart.cpp:603 kfilereplaceview.cpp:515
+#: tdefilereplacepart.cpp:603 tdefilereplaceview.cpp:515
 msgid "&Edit in Quanta"
 msgstr ""
 
-#: kfilereplacepart.cpp:605 kfilereplaceview.cpp:521
+#: tdefilereplacepart.cpp:605 tdefilereplaceview.cpp:521
 msgid "Open Parent &Folder"
 msgstr ""
 
-#: kfilereplacepart.cpp:607
+#: tdefilereplacepart.cpp:607
 msgid "E&xpand Tree"
 msgstr "E&hangu Coeden"
 
-#: kfilereplacepart.cpp:608
+#: tdefilereplacepart.cpp:608
 msgid "&Reduce Tree"
 msgstr ""
 
-#: kfilereplacepart.cpp:609
+#: tdefilereplacepart.cpp:609
 msgid "&About KFileReplace"
 msgstr ""
 
-#: kfilereplacepart.cpp:610
+#: tdefilereplacepart.cpp:610
 msgid "KFileReplace &Handbook"
 msgstr ""
 
-#: kfilereplacepart.cpp:611
+#: tdefilereplacepart.cpp:611
 msgid "&Report Bug"
 msgstr "&Anfon adroddiad nam"
 
-#: kfilereplacepart.cpp:1025 kfilereplacepart.cpp:1113
-#: kfilereplacepart.cpp:1335
+#: tdefilereplacepart.cpp:1025 tdefilereplacepart.cpp:1113
+#: tdefilereplacepart.cpp:1335
 #, fuzzy
 msgid "<qt>Cannot open file <b>%1</b> for reading.</qt>"
 msgstr "Methu agor ffeil %1 i'w ddarllen."
 
-#: kfilereplacepart.cpp:1064 kfilereplacepart.cpp:1142
+#: tdefilereplacepart.cpp:1064 tdefilereplacepart.cpp:1142
 #, fuzzy
 msgid "<qt>Cannot open file <b>%1</b> for writing.</qt>"
 msgstr "Methu agor ffeil %1 i'w ysgrifennu."
 
-#: kfilereplacepart.cpp:1199
+#: tdefilereplacepart.cpp:1199
 msgid ""
 "<qt>Do you want to replace the string <b>%1</b> with the string <b>%2</b>?</qt>"
 msgstr ""
 
-#: kfilereplacepart.cpp:1200
+#: tdefilereplacepart.cpp:1200
 #, fuzzy
 msgid "Confirm Replace"
 msgstr "A&mnewid"
 
-#: kfilereplacepart.cpp:1202
+#: tdefilereplacepart.cpp:1202
 #, fuzzy
 msgid "Do Not Replace"
 msgstr "Amnewid:"
 
-#: kfilereplacepart.cpp:1406 kfilereplacepart.cpp:1446
+#: tdefilereplacepart.cpp:1406 tdefilereplacepart.cpp:1446
 msgid " Line:%2, Col:%3 - \"%1\""
 msgstr ""
 
-#: kfilereplacepart.cpp:1512
+#: tdefilereplacepart.cpp:1512
 msgid "<qt>Cannot open the file <b>%1</b> and load the string list.</qt>"
 msgstr ""
 
-#: kfilereplacepart.cpp:1520
+#: tdefilereplacepart.cpp:1520
 msgid ""
 "<qt>File <b>%1</b> seems not to be written in new kfr format. Remember that the "
 "old kfr format will be soon abandoned. You can convert your old rules files by "
-"simply saving them with kfilereplace.</qt>"
+"simply saving them with tdefilereplace.</qt>"
 msgstr ""
 
-#: kfilereplacepart.cpp:1540
+#: tdefilereplacepart.cpp:1540
 msgid ""
 "<qt>The format of kfr files has been changed; attempting to load <b>%1</b>"
 ". Please see the KFilereplace manual for details. Do you want to load a "
 "search-and-replace list of strings?</qt>"
 msgstr ""
 
-#: kfilereplacepart.cpp:1540
+#: tdefilereplacepart.cpp:1540
 msgid "Load"
 msgstr "Llwytho"
 
-#: kfilereplacepart.cpp:1540
+#: tdefilereplacepart.cpp:1540
 msgid "Do Not Load"
 msgstr ""
 
-#: kfilereplacepart.cpp:1629
+#: tdefilereplacepart.cpp:1629
 msgid "There are no strings to search and replace."
 msgstr ""
 
-#: kfilereplacepart.cpp:1642
+#: tdefilereplacepart.cpp:1642
 msgid "<qt>The main folder of the project <b>%1</b> does not exist.</qt>"
 msgstr ""
 
-#: kfilereplacepart.cpp:1650
+#: tdefilereplacepart.cpp:1650
 msgid "<qt>Access denied in the main folder of the project:<br><b>%1</b></qt>"
 msgstr ""
 
-#: kfilereplaceview.cpp:120
+#: tdefilereplaceview.cpp:120
 msgid ""
 "<qt>Cannot invert string <b>%1</b>, because the search string would be "
 "empty.</qt>"
 msgstr ""
 
-#: kfilereplaceview.cpp:259
+#: tdefilereplaceview.cpp:259
 msgid "File %1 cannot be opened. Might be a DCOP problem."
 msgstr ""
 
-#: kfilereplaceview.cpp:281
+#: tdefilereplaceview.cpp:281
 msgid "Do you really want to delete %1?"
 msgstr ""
 
-#: kfilereplaceview.cpp:401
+#: tdefilereplaceview.cpp:401
 msgid "No strings to save as the list is empty."
 msgstr ""
 
-#: kfilereplaceview.cpp:425
+#: tdefilereplaceview.cpp:425
 msgid "KFileReplace Strings"
 msgstr ""
 
-#: kfilereplaceview.cpp:426
+#: tdefilereplaceview.cpp:426
 msgid "Save Strings to File"
 msgstr ""
 
-#: kfilereplaceview.cpp:437
+#: tdefilereplaceview.cpp:437
 msgid "File %1 cannot be saved."
 msgstr ""
 
-#: kfilereplaceview.cpp:507
+#: tdefilereplaceview.cpp:507
 msgid "Open &With..."
 msgstr "Agor &Gyda..."
 
@@ -432,25 +432,25 @@ msgstr "KFileReplace"
 msgid "Shell author, KPart creator, co-maintainer"
 msgstr ""
 
-#. i18n: file kfilereplacepartui.rc line 4
+#. i18n: file tdefilereplacepartui.rc line 4
 #: rc.cpp:3 rc.cpp:27
 #, no-c-format
 msgid "Search/&Replace"
 msgstr ""
 
-#. i18n: file kfilereplacepartui.rc line 11
+#. i18n: file tdefilereplacepartui.rc line 11
 #: rc.cpp:6
 #, no-c-format
 msgid "&Strings"
 msgstr ""
 
-#. i18n: file kfilereplacepartui.rc line 24
+#. i18n: file tdefilereplacepartui.rc line 24
 #: rc.cpp:9
 #, no-c-format
 msgid "&Results"
 msgstr "&Canlyniadau"
 
-#. i18n: file kfilereplacepartui.rc line 55
+#. i18n: file tdefilereplacepartui.rc line 55
 #: rc.cpp:21
 #, no-c-format
 msgid "KFileReplace Main Toolbar"
@@ -504,91 +504,91 @@ msgstr "Chwilio am:"
 msgid "Replace With"
 msgstr "Amnewid Efo"
 
-#. i18n: file kfilereplaceviewwdg.ui line 58
+#. i18n: file tdefilereplaceviewwdg.ui line 58
 #: rc.cpp:66 rc.cpp:87 rc.cpp:204 rc.cpp:222 report.cpp:114
 #, no-c-format
 msgid "Name"
 msgstr "Enw"
 
-#. i18n: file kfilereplaceviewwdg.ui line 69
+#. i18n: file tdefilereplaceviewwdg.ui line 69
 #: rc.cpp:69 rc.cpp:90 report.cpp:115
 #, no-c-format
 msgid "Folder"
 msgstr "Plygell"
 
-#. i18n: file kfilereplaceviewwdg.ui line 80
+#. i18n: file tdefilereplaceviewwdg.ui line 80
 #: rc.cpp:72 report.cpp:122
 #, no-c-format
 msgid "Old Size"
 msgstr ""
 
-#. i18n: file kfilereplaceviewwdg.ui line 91
+#. i18n: file tdefilereplaceviewwdg.ui line 91
 #: rc.cpp:75 report.cpp:123
 #, no-c-format
 msgid "New Size"
 msgstr ""
 
-#. i18n: file kfilereplaceviewwdg.ui line 102
+#. i18n: file tdefilereplaceviewwdg.ui line 102
 #: rc.cpp:78 report.cpp:54
 #, no-c-format
 msgid "Replaced Strings"
 msgstr ""
 
-#. i18n: file kfilereplaceviewwdg.ui line 113
+#. i18n: file tdefilereplaceviewwdg.ui line 113
 #: rc.cpp:81 rc.cpp:99 report.cpp:126
 #, no-c-format
 msgid "Owner User"
 msgstr ""
 
-#. i18n: file kfilereplaceviewwdg.ui line 124
+#. i18n: file tdefilereplaceviewwdg.ui line 124
 #: rc.cpp:84 rc.cpp:102 report.cpp:127
 #, no-c-format
 msgid "Owner Group"
 msgstr ""
 
-#. i18n: file kfilereplaceviewwdg.ui line 203
+#. i18n: file tdefilereplaceviewwdg.ui line 203
 #: rc.cpp:93 report.cpp:118
 #, no-c-format
 msgid "Size"
 msgstr "Maint"
 
-#. i18n: file kfilereplaceviewwdg.ui line 214
+#. i18n: file tdefilereplaceviewwdg.ui line 214
 #: rc.cpp:96
 #, no-c-format
 msgid "Found Strings"
 msgstr ""
 
-#. i18n: file kfilereplaceviewwdg.ui line 427
+#. i18n: file tdefilereplaceviewwdg.ui line 427
 #: rc.cpp:114
 #, no-c-format
 msgid "Green means ready"
 msgstr ""
 
-#. i18n: file kfilereplaceviewwdg.ui line 430
+#. i18n: file tdefilereplaceviewwdg.ui line 430
 #: rc.cpp:117
 #, no-c-format
 msgid "Ready"
 msgstr "Parod"
 
-#. i18n: file kfilereplaceviewwdg.ui line 454
+#. i18n: file tdefilereplaceviewwdg.ui line 454
 #: rc.cpp:120
 #, no-c-format
 msgid "Yellow means wait while sorting list"
 msgstr ""
 
-#. i18n: file kfilereplaceviewwdg.ui line 457
+#. i18n: file tdefilereplaceviewwdg.ui line 457
 #: rc.cpp:123
 #, no-c-format
 msgid "Please wait while sorting list"
 msgstr ""
 
-#. i18n: file kfilereplaceviewwdg.ui line 478
+#. i18n: file tdefilereplaceviewwdg.ui line 478
 #: rc.cpp:126
 #, no-c-format
 msgid "Red means scanning files"
 msgstr ""
 
-#. i18n: file kfilereplaceviewwdg.ui line 513
+#. i18n: file tdefilereplaceviewwdg.ui line 513
 #: rc.cpp:129
 #, no-c-format
 msgid "Scanned files:"
@@ -1029,7 +1029,7 @@ msgstr ""
 
 #: whatthis.h:65
 msgid ""
-"If kfilereplace encounters a symbolic link treats it like a normal folder or "
+"If tdefilereplace encounters a symbolic link treats it like a normal folder or "
 "file."
 msgstr ""