Update translation files

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

(cherry picked from commit e6b29a1ed8ec6b5f0e676980b465f20e34c397e5)

1 files changed, 805 insertions, 939 deletions

diff --git a/tde-i18n-cy/messages/tdenetwork/ksirc.po b/tde-i18n-cy/messages/tdenetwork/ksirc.po
index d6e936be07e..c48827ec107 100644
--- a/tde-i18n-cy/messages/tdenetwork/ksirc.po
+++ b/tde-i18n-cy/messages/tdenetwork/ksirc.po
@@ -5,10 +5,11 @@
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
 #
 #
+#: chanparser.cpp:287
 msgid ""
 msgstr ""
 "Project-Id-Version: ksirc\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-20 02:17+0100\n"
 "PO-Revision-Date: 2004-02-26 18:27+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -19,6 +20,18 @@ msgstr ""
 "X-Generator: KBabel 1.2\n"
 "\n"
 
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Peter Bradley, KD drwy KGyfieithu"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
 #: FilterRuleEditor.cpp:29
 msgid "Edit Filter Rules"
 msgstr "Golygu Rheolau Hidl"
@@ -31,6 +44,201 @@ msgstr ""
 "Methu creu'r rheol gan nad\n"
 " yw pob maes wedi'i lenwi."
 
+#: FilterRuleEditor.cpp:102 dccManager.cpp:100
+#, fuzzy
+msgid "Error"
+msgstr "G&wallau:"
+
+#: KSOpenkSirc/open_ksirc.cpp:44
+msgid "Connect to Server"
+msgstr "Cysylltu â'r Gweinydd"
+
+#: KSOpenkSirc/open_ksirc.cpp:60 KSOpenkSirc/open_ksirc.cpp:77
+#: KSOpenkSirc/open_ksirc.cpp:100 KSOpenkSirc/open_ksirc.cpp:110
+#: KSOpenkSirc/open_ksirc.cpp:144
+msgid "Recent"
+msgstr "Diweddar"
+
+#: KSOpenkSirc/open_ksirc.cpp:78 KSOpenkSirc/open_ksirc.cpp:101
+msgid "Recent Server"
+msgstr "Gweinydd Diweddar"
+
+#: KSOpenkSirc/open_ksirc.cpp:145
+msgid "Random"
+msgstr "Hap"
+
+#: KSOpenkSirc/open_ksirc.cpp:215
+msgid "Not available"
+msgstr "Dim ar gael"
+
+#: KSOpenkSirc/open_ksirc.cpp:271
+msgid "Please enter a server name."
+msgstr "Rhowch enw gweinydd."
+
+#: KSPrefs/ksprefs.cpp:30
+msgid "Configure KSirc"
+msgstr "Ffurfweddu KSirc"
+
+#: KSPrefs/ksprefs.cpp:35
+msgid "Look and Feel"
+msgstr "Golwg a Theimlad"
+
+#: KSPrefs/ksprefs.cpp:35
+msgid "Controls how kSirc looks"
+msgstr "Rheoli sut bydd kSirc yn edrych"
+
+#: KSPrefs/ksprefs.cpp:36 KSPrefs/page_generalbase.ui:22
+#, no-c-format
+msgid "General"
+msgstr "Cyffredinol"
+
+#: KSPrefs/ksprefs.cpp:36
+msgid "General KSirc Settings"
+msgstr "Gosodiadau Cyffredinol KSirc"
+
+#: KSPrefs/ksprefs.cpp:37
+msgid "Startup"
+msgstr "Ymgychwyniad"
+
+#: KSPrefs/ksprefs.cpp:37
+msgid "KSirc Startup Settings"
+msgstr "Gosodiadau Ymcychwyn KSirc"
+
+#: KSPrefs/ksprefs.cpp:38 KSPrefs/page_colorsbase.ui:16
+#, no-c-format
+msgid "Colors"
+msgstr "Lliwiau"
+
+#: KSPrefs/ksprefs.cpp:38
+msgid "KSirc Color Settings"
+msgstr "Gosodiadau Lliw KSirc"
+
+#: KSPrefs/ksprefs.cpp:39 KSPrefs/page_irccolorsbase.ui:16
+#, no-c-format
+msgid "IRC Colors"
+msgstr "Lliwiau IRC"
+
+#: KSPrefs/ksprefs.cpp:39
+msgid "KSirc IRC Color Settings"
+msgstr "Gosodiadau Lliw IRC KSirc"
+
+#: KSPrefs/ksprefs.cpp:41
+msgid "User Menu"
+msgstr "Dewislen y Defnyddiwr"
+
+#: KSPrefs/ksprefs.cpp:41
+msgid "User Menu Configuration"
+msgstr "Ffurfweddiad Dewislen y Defnyddiwr"
+
+#: KSPrefs/ksprefs.cpp:42
+msgid "Server/Channel"
+msgstr "Gweinydd/Sianel"
+
+#: KSPrefs/ksprefs.cpp:42
+msgid "Server/Channel Configuration"
+msgstr "Ffurfweddiad y Gweinydd/Sianel"
+
+#: KSPrefs/ksprefs.cpp:43 KSPrefs/page_autoconnectbase.ui:16
+#, no-c-format
+msgid "Auto Connect"
+msgstr "Hunan-gysylltu"
+
+#: KSPrefs/ksprefs.cpp:43
+msgid "Auto Connect Configuration"
+msgstr "Ffurfweddiad Hunan-gysylltu"
+
+#: KSPrefs/ksprefs.cpp:44
+#, fuzzy
+msgid "Fonts"
+msgstr "Wynebfath..."
+
+#: KSPrefs/ksprefs.cpp:44
+msgid "Font Settings"
+msgstr "Gosodiadau Wynebfath"
+
+#: KSPrefs/ksprefs.cpp:45 KSPrefs/page_shortcutsbase.ui:22
+#, no-c-format
+msgid "Shortcuts"
+msgstr "Byrlwybrau"
+
+#: KSPrefs/ksprefs.cpp:45
+msgid "Shortcut Configuration"
+msgstr "Ffurfweddiad Byrlwybrau"
+
+#: KSPrefs/page_autoconnect.cpp:110 KSPrefs/page_autoconnect.cpp:165
+#: KSPrefs/page_autoconnect.cpp:189 KSPrefs/page_autoconnectbase.ui:61
+#, no-c-format
+msgid "SSL"
+msgstr "SSL"
+
+#: KSPrefs/page_autoconnect.cpp:219 KSPrefs/page_autoconnectbase.ui:285
+#: KSPrefs/page_colorsbase.ui:318
+#, no-c-format
+msgid "&Add"
+msgstr "Ychw&anegu"
+
+#: KSPrefs/page_autoconnect.cpp:266
+#, fuzzy
+msgid "&Update"
+msgstr "&Diweddaru/Ychwanegu"
+
+#: KSPrefs/page_autoconnect.cpp:275
+msgid "&Update/Add"
+msgstr "&Diweddaru/Ychwanegu"
+
+#: KSPrefs/page_general.cpp:96 toplevel.cpp:198
+msgid "Default"
+msgstr ""
+
+#: KSProgress/ksprogressdata.cpp:48 dccNewbase.ui:118
+#, no-c-format
+msgid "File Name"
+msgstr "Enw Ffeil"
+
+#: KSProgress/ksprogressdata.cpp:56
+msgid "Transfer Status"
+msgstr "Cyflwr Trosglwyddo"
+
+#: KSTicker/ksticker.cpp:58
+msgid "Font..."
+msgstr "Wynebfath..."
+
+#: KSTicker/ksticker.cpp:59
+msgid "Scroll Rate..."
+msgstr "Cyfradd Sgrolio..."
+
+#: KSTicker/ksticker.cpp:60
+msgid "Scroll Constantly"
+msgstr "Sgrolio o Hyd"
+
+#: KSTicker/ksticker.cpp:63
+msgid "Return to Normal Mode"
+msgstr "Dychwelyd i'r Modd Arferol"
+
+#: KSTicker/ksttest.cpp:67 ksirc.cpp:71
+msgid "KSirc"
+msgstr "KSirc"
+
+#: KSTicker/ksttest.cpp:69
+msgid "(c) 1997-2002, Andrew Stanley-Jones"
+msgstr "(h) 1997-2002, Andrew Stanley-Jones"
+
+#: KSTicker/ksttest.cpp:70 ksirc.cpp:74
+msgid "Original Author"
+msgstr "Awdur Gwreiddiol"
+
+#: KSTicker/speeddialog.cpp:23
+msgid "Speed Setup"
+msgstr "Ffurfweddu Cyflymder"
+
+#: KSTicker/speeddialogData.cpp:68
+msgid "Tick interval:"
+msgstr "Cyfnod Tic:"
+
+#: KSTicker/speeddialogData.cpp:76
+msgid "Step size:"
+msgstr "Maint y cam:"
+
 #: NewWindowDialog.cpp:12
 msgid "New Window For"
 msgstr "Ffenestr Newydd ar Gyfer"
@@ -39,24 +247,11 @@ msgstr "Ffenestr Newydd ar Gyfer"
 msgid "C&hannel/Nick:"
 msgstr "&Sianel/Ffugenw:"
 
-#. i18n: file KSPrefs/page_autoconnectbase.ui line 249
-#: NewWindowDialog.cpp:27 rc.cpp:198
+#: KSPrefs/page_autoconnectbase.ui:249 NewWindowDialog.cpp:27
 #, no-c-format
 msgid "&Key:"
 msgstr "&Allwedd:"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Peter Bradley, KD drwy KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
 #: chanButtons.cpp:30
 msgid "Channel Modes"
 msgstr "Moddau Sianel"
@@ -210,14 +405,12 @@ msgstr "Rhagolwg:"
 msgid "Sample Text"
 msgstr "Testun Enghraifft"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 483
-#: colorpicker.cpp:55 rc.cpp:288
+#: KSPrefs/page_colorsbase.ui:483 colorpicker.cpp:55
 #, no-c-format
 msgid "&Foreground:"
 msgstr "&Blaendir:"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 106
-#: colorpicker.cpp:60 rc.cpp:231
+#: KSPrefs/page_colorsbase.ui:106 colorpicker.cpp:60
 #, no-c-format
 msgid "&Background:"
 msgstr "&Cefndir:"
@@ -272,8 +465,7 @@ msgstr "Cael"
 msgid "Send"
 msgstr "Anfon"
 
-#: dccManager.cpp:208 dockservercontroller.cpp:182
-#: dockservercontroller.cpp:239
+#: dccManager.cpp:208 dockservercontroller.cpp:182 dockservercontroller.cpp:239
 msgid "Chat"
 msgstr "Sgwrsio"
 
@@ -285,6 +477,11 @@ msgstr "Gweithgarwch dcc"
 msgid "aListBox::"
 msgstr "aListBox::"
 
+#: dccToplevel.cpp:31 servercontroller.cpp:159
+#, fuzzy
+msgid "&File"
+msgstr "Anfon &ffeil"
+
 #: displayMgrMDI.cpp:48
 msgid "Detach Window"
 msgstr "Datgysylltu Ffenestr"
@@ -309,6 +506,15 @@ msgstr "B&ar Tab"
 msgid "&Top"
 msgstr "&Pen"
 
+#: displayMgrMDI.cpp:69
+msgid "&Bottom"
+msgstr ""
+
+#: displayMgrMDI.cpp:79 servercontroller.cpp:180
+#, fuzzy
+msgid "&Settings"
+msgstr "Gosodiadau Enwau"
+
 #: displayMgrMDI.cpp:242
 msgid "Cycle left"
 msgstr "Cylchu i'r chwith"
@@ -343,8 +549,8 @@ msgstr "Codi'r Ffenestr Ddiwethaf"
 
 #: dockservercontroller.cpp:107
 msgid ""
-"If someone said your nick in a window, this action will make that window active "
-"for you."
+"If someone said your nick in a window, this action will make that window "
+"active for you."
 msgstr ""
 "Os defnyddiwyd eich ffugenw mewn ffenestr, bydd y weithred hon yn gwneud y "
 "ffenestr honno'n weithredol"
@@ -355,11 +561,11 @@ msgstr "Gwaredu'r Eicon Docio Amrantol"
 
 #: dockservercontroller.cpp:114
 msgid ""
-"If the dock icon is blinking, but you don't want to go to the window this will "
-"clear the blinking."
+"If the dock icon is blinking, but you don't want to go to the window this "
+"will clear the blinking."
 msgstr ""
-"Os ydi'r eicon docio'n amrantu, ond nad ydych eisiau mynd i'r ffenestr bydd hwn "
-"yn clirio'r amrantu."
+"Os ydi'r eicon docio'n amrantu, ond nad ydych eisiau mynd i'r ffenestr bydd "
+"hwn yn clirio'r amrantu."
 
 #: dockservercontroller.cpp:176
 msgid "Came Online: "
@@ -408,16 +614,16 @@ msgstr "Ffurfweddu Hysbysu..."
 #: dockservercontroller.cpp:405
 msgid ""
 "This popup menu can show a list of people you have in your notify list, and "
-"their status. You can configure this list by going to Configure KSirc->Startup->"
-"Notify and adding people to the list. This will take effect the next time you "
-"connect to a server. This message appears when there is nothing in your notify "
-"list or when no one in your list is online."
+"their status. You can configure this list by going to Configure KSirc-"
+">Startup->Notify and adding people to the list. This will take effect the "
+"next time you connect to a server. This message appears when there is "
+"nothing in your notify list or when no one in your list is online."
 msgstr ""
-"Gall y naidlen hon ddangos rhestr o'r bobl sy gennych ar eich rhestr hysbysu, "
-"a'u cyflwr.  Cewch addasu'r rhestr hon trwy fynd i Addasu KSirc->Cychwyn->"
-"Hysbysu ac ychwanegu pobl i'r rhestr. Daw hyn i rym y tro nesaf cysylltwch chi "
-"â gweinydd. Ymddengys y neges yma pan na fydd dim byd yn eich rhestr hysbysu "
-"neu pan bydd neb ar eich rhestr arlein. "
+"Gall y naidlen hon ddangos rhestr o'r bobl sy gennych ar eich rhestr "
+"hysbysu, a'u cyflwr.  Cewch addasu'r rhestr hon trwy fynd i Addasu KSirc-"
+">Cychwyn->Hysbysu ac ychwanegu pobl i'r rhestr. Daw hyn i rym y tro nesaf "
+"cysylltwch chi â gweinydd. Ymddengys y neges yma pan na fydd dim byd yn eich "
+"rhestr hysbysu neu pan bydd neb ar eich rhestr arlein. "
 
 #: dockservercontroller.cpp:417
 msgid "Help for Notification Popup"
@@ -467,30 +673,22 @@ msgstr "Y sianel i gysylltu a hi wrth gychwyn."
 msgid "Do not autoconnect on startup"
 msgstr "Na chysyllter yn ymysgogol wrth gychwyn."
 
-#: KSTicker/ksttest.cpp:67 ksirc.cpp:71
-msgid "KSirc"
-msgstr "KSirc"
-
 #: ksirc.cpp:73
 msgid "(c) 1997-2002, The KSirc Developers"
 msgstr "(h) 1997-2002, Datblygwyr KSirc"
 
-#: KSTicker/ksttest.cpp:70 ksirc.cpp:74
-msgid "Original Author"
-msgstr "Awdur Gwreiddiol"
-
 #: ksirc.cpp:80
 msgid "Icons Author"
 msgstr "Awdur yr Eiconau"
 
 #: ksircprocess.cpp:353
 msgid ""
-"5 Channel windows were opened in less than 5 seconds. Someone may be trying to "
-"flood your X server with windows.\n"
+"5 Channel windows were opened in less than 5 seconds. Someone may be trying "
+"to flood your X server with windows.\n"
 "Shall I turn off AutoCreate windows?"
 msgstr ""
-"Agorwyd 5 ffenestr sianel mewn llai na 5 eiliad. Hwyrach bod rhywun yn ceisio "
-"gorlifo eich gweinydd X gyda ffenestri.\n"
+"Agorwyd 5 ffenestr sianel mewn llai na 5 eiliad. Hwyrach bod rhywun yn "
+"ceisio gorlifo eich gweinydd X gyda ffenestri.\n"
 " Hoffech imi ddiffodd Hunan-Greu Ffenestri?"
 
 #: ksircprocess.cpp:358
@@ -505,6 +703,10 @@ msgstr ""
 msgid "Keep Enabled"
 msgstr ""
 
+#: ksview.cpp:91
+msgid "Save As"
+msgstr ""
+
 #: ksview.cpp:203
 msgid "Beep Received"
 msgstr ""
@@ -521,198 +723,341 @@ msgstr "URL Agored"
 msgid "Copy Link Address"
 msgstr "Copïo Cyfeiriad Cyswllt"
 
-#. i18n: file FilterRuleWidget.ui line 60
-#: rc.cpp:9 rc.cpp:201 rc.cpp:249
-#, no-c-format
-msgid "&New"
-msgstr "&Newydd"
+#: mditoplevel.cpp:57
+msgid "Close"
+msgstr ""
 
-#. i18n: file FilterRuleWidget.ui line 158
-#: rc.cpp:15
-#, no-c-format
-msgid "Details"
-msgstr "Manylion"
+#: servercontroller.cpp:163
+msgid "&New Server..."
+msgstr "Gweinydd &Newydd..."
 
-#. i18n: file FilterRuleWidget.ui line 180
-#: rc.cpp:18
-#, no-c-format
-msgid "D&escription:"
-msgstr "D&isgrifiad:"
+#: servercontroller.cpp:164
+msgid "&Join Channel..."
+msgstr "Y&muno â'r Sianel..."
 
-#. i18n: file FilterRuleWidget.ui line 191
-#: rc.cpp:21
-#, no-c-format
-msgid "&To:"
-msgstr "A&t:"
+#: servercontroller.cpp:168
+msgid "&Connections"
+msgstr "C&ysylltiadau"
 
-#. i18n: file FilterRuleWidget.ui line 217
-#: rc.cpp:24
-#, no-c-format
-msgid "M&atch:"
-msgstr "Cyd&weddu:"
+#: servercontroller.cpp:186
+msgid "New Server"
+msgstr "Gweinydd Newydd"
 
-#. i18n: file FilterRuleWidget.ui line 228
-#: rc.cpp:27
-#, no-c-format
-msgid "&From:"
-msgstr "&Oddi wrth:"
+#: servercontroller.cpp:187
+msgid ""
+"This action allows you to open a new server more easily when in docked mode, "
+"since you don't need to click on the dock icon."
+msgstr ""
+"Galluoga'r weithred hon ichi agor gweinydd newydd yn haws pan ydych mewn "
+"modd docio, am nad oes angen ichi glicio ar yr eicon docio."
 
-#. i18n: file dccManagerbase.ui line 16
-#: rc.cpp:30
-#, no-c-format
-msgid "DCC Manager"
-msgstr "Rheolydd DCC"
+#: servercontroller.cpp:201
+msgid "Server Control"
+msgstr "Rheoli Gweinydd"
 
-#. i18n: file dccManagerbase.ui line 31
-#: rc.cpp:33
-#, no-c-format
-msgid "Who"
-msgstr "Pwy"
+#: servercontroller.cpp:431 servercontroller.cpp:445 servercontroller.cpp:447
+msgid "Online"
+msgstr "Arlein"
 
-#. i18n: file dccManagerbase.ui line 53
-#: rc.cpp:39
-#, no-c-format
-msgid "Status"
-msgstr "Cyflwr"
+#: servercontroller.cpp:438
+msgid "%1 just went offline on %2"
+msgstr "%1 newydd fynd all-lein ar %2"
 
-#. i18n: file dccManagerbase.ui line 64
-#: rc.cpp:42
-#, no-c-format
-msgid "Size"
-msgstr "Maint"
+#: servercontroller.cpp:460
+msgid "%1 just came online on %2"
+msgstr "%1 newydd ddod arlein ar %2"
 
-#. i18n: file dccManagerbase.ui line 75
-#: rc.cpp:45
-#, no-c-format
-msgid "KB/s"
-msgstr "KB/eil"
+#: servercontroller.cpp:951
+msgid "Active server connections:"
+msgstr "Cysylltiadau gweinydd gweithredol:"
 
-#. i18n: file dccManagerbase.ui line 86
-#: rc.cpp:48
-#, no-c-format
-msgid "Progress"
-msgstr "Cynnydd"
+#: ssfeprompt.cpp:25
+msgid "Prompt"
+msgstr "Annog"
 
-#. i18n: file dccManagerbase.ui line 115
-#: rc.cpp:51
-#, no-c-format
-msgid "&New..."
-msgstr "&Newydd..."
+#: toplevel.cpp:160
+msgid "New Ser&ver..."
+msgstr "Gw&einydd Newydd..."
 
-#. i18n: file dccManagerbase.ui line 123
-#: rc.cpp:54
-#, no-c-format
-msgid "&Connect"
-msgstr "&Cysylltu"
+#: toplevel.cpp:162
+msgid "&DCC Manager..."
+msgstr "Rheolydd &DCC"
 
-#. i18n: file dccManagerbase.ui line 131
-#: rc.cpp:57
-#, no-c-format
-msgid "R&esume"
-msgstr "Ail&gychwyn"
+#: toplevel.cpp:163
+msgid "&Save to Logfile..."
+msgstr "&Cadw i Ffeil Cofnod..."
 
-#. i18n: file dccManagerbase.ui line 139
-#: rc.cpp:60
-#, no-c-format
-msgid "&Rename"
-msgstr "Ail&enwi"
+#: toplevel.cpp:165
+msgid "Time St&amp"
+msgstr "&Amsernod"
 
-#. i18n: file dccManagerbase.ui line 147
-#: rc.cpp:63
-#, no-c-format
-msgid "&Disconnect"
-msgstr "&Datgysylltu"
+#: toplevel.cpp:168
+msgid "Hide Join/Part Messages"
+msgstr "Cuddio Negeseuon Ymuno/Ymadael"
+
+#: toplevel.cpp:171
+msgid "Character &Table"
+msgstr "&Tabl Nodau"
+
+#: toplevel.cpp:172
+msgid "N&otify on Change"
+msgstr "&Hysbysu ar Newid"
+
+#: toplevel.cpp:175
+msgid "&Encoding"
+msgstr "A&mgodiad"
+
+#: toplevel.cpp:179
+msgid "S&how Topic"
+msgstr "&Dangos Pwnc"
+
+#: toplevel.cpp:187
+msgid "Ticker &Mode"
+msgstr "&Modd Ticer"
+
+#: toplevel.cpp:215
+msgid "&Channel"
+msgstr "&Sianel"
+
+#: toplevel.cpp:262
+msgid "Lag: Wait"
+msgstr "Oedi: Arhoswch"
+
+#: toplevel.cpp:319
+msgid "C&lear Window"
+msgstr "C&lirio'r Ffenestr"
 
-#. i18n: file dccNewbase.ui line 17
-#: rc.cpp:66
+#: toplevel.cpp:320
+msgid "&Edit"
+msgstr ""
+
+#: toplevel.cpp:425
+msgid "&Users"
+msgstr "De&fnyddwyr"
+
+#: toplevel.cpp:448
+msgid "C&ommand"
+msgstr "G&orchymyn"
+
+#: toplevel.cpp:614 toplevel.cpp:666
+msgid "Help"
+msgstr ""
+
+#: toplevel.cpp:615 toplevel.cpp:617 toplevel.cpp:618 toplevel.cpp:623
+#: toplevel.cpp:624 toplevel.cpp:625 toplevel.cpp:636 toplevel.cpp:651
+#: toplevel.cpp:657 toplevel.cpp:660 toplevel.cpp:673
+msgid "Client"
+msgstr "Dibynnydd"
+
+#: toplevel.cpp:616 toplevel.cpp:622
+msgid "User"
+msgstr "Defnyddiwr"
+
+#: toplevel.cpp:619 toplevel.cpp:620 toplevel.cpp:626 toplevel.cpp:629
+#: toplevel.cpp:632 toplevel.cpp:634 toplevel.cpp:635 toplevel.cpp:639
+#: toplevel.cpp:642 toplevel.cpp:643 toplevel.cpp:644 toplevel.cpp:645
+#: toplevel.cpp:648 toplevel.cpp:650 toplevel.cpp:655 toplevel.cpp:663
+#: toplevel.cpp:664 toplevel.cpp:665 toplevel.cpp:671 toplevel.cpp:674
+msgid "Basic"
+msgstr "Sylfaenol"
+
+#: toplevel.cpp:621 toplevel.cpp:630 toplevel.cpp:646
+msgid "Operator"
+msgstr "Gweithredwr"
+
+#: KSPrefs/page_servchanbase.ui:30 KSPrefs/page_startupbase.ui:38
+#: toplevel.cpp:627 toplevel.cpp:633 toplevel.cpp:637 toplevel.cpp:638
+#: toplevel.cpp:641 toplevel.cpp:652 toplevel.cpp:656 toplevel.cpp:658
 #, no-c-format
-msgid "New DCC"
-msgstr "DCC Newydd"
+msgid "Server"
+msgstr "Gweinydd"
+
+#: toplevel.cpp:628 toplevel.cpp:640 toplevel.cpp:649 toplevel.cpp:659
+#: toplevel.cpp:662 toplevel.cpp:667 toplevel.cpp:668 toplevel.cpp:669
+#: toplevel.cpp:670 toplevel.cpp:672
+msgid "Channel"
+msgstr "Sianel"
+
+#: toplevel.cpp:631 toplevel.cpp:647 toplevel.cpp:653 toplevel.cpp:654
+#: toplevel.cpp:661
+msgid "Oper"
+msgstr "Gweithredwr"
+
+#: toplevel.cpp:1577
+msgid ""
+"You are about to send %1 lines of text.\n"
+"Do you really want to send that much?"
+msgstr ""
+"'Rydych ar anfon %1 llinell o destun.\n"
+" Ydych eisiau danfon gymaint?"
+
+#: toplevel.cpp:1603
+msgid ""
+"The text you pasted contains lines that start with /.\n"
+"Should they be interpreted as IRC commands?"
+msgstr ""
+"Cynnwys y testun y wnaethoch ludo linellau a gychwyn efo /.\n"
+" Dylen nhw gael eu trin fel gorchmynion IRC?"
+
+#: toplevel.cpp:1604
+msgid "Interpret"
+msgstr ""
+
+#: toplevel.cpp:1604
+msgid "Do Not Interpret"
+msgstr ""
+
+#: toplevel.cpp:1664
+msgid "Save Chat/Query Logfile"
+msgstr "Cadw Ffeil Cofnod Sgwrs/Holi"
+
+#: toplevel.cpp:1745
+#, c-format
+msgid "Your nick appeared on channel %1"
+msgstr "Ymddangosodd eich ffugenw ar sianel %1"
+
+#: toplevel.cpp:1750
+msgid "Channel %1 changed"
+msgstr "Newidodd sianel %1"
+
+#: usercontrolmenu.cpp:41
+msgid "&Refresh Nicks"
+msgstr "&Adfer ffugenwau"
+
+#: usercontrolmenu.cpp:45
+msgid "&Follow"
+msgstr "&Dilyn"
+
+#: usercontrolmenu.cpp:48
+msgid "&UnFollow"
+msgstr "Da&t-ddilyn"
+
+#: usercontrolmenu.cpp:52
+msgid "&Whois"
+msgstr "Pw&y-ydi"
+
+#: usercontrolmenu.cpp:55
+msgid "&Ping"
+msgstr "&Ping"
+
+#: usercontrolmenu.cpp:58
+msgid "V&ersion"
+msgstr "F&ersiwn"
+
+#: usercontrolmenu.cpp:62
+msgid "&Abuse"
+msgstr "Ca&mddefnydd"
+
+#: usercontrolmenu.cpp:66
+msgid "&Kick"
+msgstr "&Lluchio"
+
+#: usercontrolmenu.cpp:71
+msgid "&Ban"
+msgstr "G&wahardd"
+
+#: usercontrolmenu.cpp:76
+msgid "U&nBan"
+msgstr "Dat-wa&hardd"
+
+#: usercontrolmenu.cpp:82
+msgid "&Op"
+msgstr "Gwei&thredu (Op)"
+
+#: usercontrolmenu.cpp:87
+msgid "&Deop"
+msgstr "Dadweit&hredu (Deop)"
+
+#: usercontrolmenu.cpp:93
+msgid "&Voice"
+msgstr "&Lleisio"
+
+#: usercontrolmenu.cpp:98
+msgid "Devo&ice"
+msgstr "Datle&isio"
 
-#. i18n: file dccNewbase.ui line 34
-#: rc.cpp:69
+#: FilterRuleWidget.ui:44
+#, fuzzy, no-c-format
+msgid "&Insert"
+msgstr "&Mewnosod Nod"
+
+#: FilterRuleWidget.ui:52 KSPrefs/page_autoconnectbase.ui:293
+#: KSPrefs/page_colorsbase.ui:326
 #, no-c-format
-msgid "DCC Type"
-msgstr "Math DCC"
+msgid "&Delete"
+msgstr ""
 
-#. i18n: file dccNewbase.ui line 45
-#: rc.cpp:72
+#: FilterRuleWidget.ui:60 KSPrefs/page_autoconnectbase.ui:277
+#: KSPrefs/page_colorsbase.ui:310
 #, no-c-format
-msgid "&File send"
-msgstr "Anfon &ffeil"
+msgid "&New"
+msgstr "&Newydd"
 
-#. i18n: file dccNewbase.ui line 53
-#: rc.cpp:75
+#: FilterRuleWidget.ui:68
+#, fuzzy, no-c-format
+msgid "&Modify"
+msgstr "&Addasu"
+
+#: FilterRuleWidget.ui:158
 #, no-c-format
-msgid "C&hat"
-msgstr "S&gwrsio"
+msgid "Details"
+msgstr "Manylion"
 
-#. i18n: file dccNewbase.ui line 80
-#: rc.cpp:78
+#: FilterRuleWidget.ui:180
 #, no-c-format
-msgid "Nick"
-msgstr "Ffugenw"
+msgid "D&escription:"
+msgstr "D&isgrifiad:"
 
-#. i18n: file dccNewbase.ui line 118
-#: KSProgress/ksprogressdata.cpp:48 rc.cpp:81
+#: FilterRuleWidget.ui:191
 #, no-c-format
-msgid "File Name"
-msgstr "Enw Ffeil"
+msgid "&To:"
+msgstr "A&t:"
 
-#. i18n: file dccNewbase.ui line 134
-#: rc.cpp:84
+#: FilterRuleWidget.ui:217
 #, no-c-format
-msgid "&..."
-msgstr "&..."
+msgid "M&atch:"
+msgstr "Cyd&weddu:"
 
-#. i18n: file dccNewbase.ui line 155
-#: rc.cpp:87
+#: FilterRuleWidget.ui:228
 #, no-c-format
-msgid "&Send"
-msgstr "&Anfon"
+msgid "&From:"
+msgstr "&Oddi wrth:"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 30
-#: rc.cpp:93
+#: KSOpenkSirc/open_ksircData.ui:30
 #, no-c-format
 msgid "&Server/Quick connect to:"
 msgstr "&Gweinydd/Chwimgyswllt i:"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 41
-#: rc.cpp:96 rc.cpp:186
+#: KSOpenkSirc/open_ksircData.ui:41 KSPrefs/page_autoconnectbase.ui:135
 #, no-c-format
 msgid "&Port:"
 msgstr "&Porth:"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 52
-#: rc.cpp:99
+#: KSOpenkSirc/open_ksircData.ui:52
 #, no-c-format
 msgid "Choose a server for an IRC Network"
 msgstr "Dewiswch weinydd ar gyfer Rhwydwaith IRC"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 55
-#: rc.cpp:102
+#: KSOpenkSirc/open_ksircData.ui:55
 #, no-c-format
 msgid ""
-"Usually IRC Servers are connected to a net (IRCNet, Freenode, etc.). Here, you "
-"can select the closest server for your favorite network."
+"Usually IRC Servers are connected to a net (IRCNet, Freenode, etc.). Here, "
+"you can select the closest server for your favorite network."
 msgstr ""
-"Fel arfer cysylltir Gweinyddion IRC â rhwydwaith (IRCNet, Freenode, etc). Yma "
-"cewch ddewis eich hoff rwydwaith."
+"Fel arfer cysylltir Gweinyddion IRC â rhwydwaith (IRCNet, Freenode, etc). "
+"Yma cewch ddewis eich hoff rwydwaith."
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 63
-#: rc.cpp:105
+#: KSOpenkSirc/open_ksircData.ui:63
 #, no-c-format
 msgid "&Group:"
 msgstr "&Grŵp:"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 85
-#: rc.cpp:108
+#: KSOpenkSirc/open_ksircData.ui:85
 #, no-c-format
 msgid "Enter/choose a server to connect to"
 msgstr "Rhowch/dewiswch weinydd i gysylltu ag ef"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 88
-#: rc.cpp:111
+#: KSOpenkSirc/open_ksircData.ui:88
 #, fuzzy, no-c-format
 msgid ""
 "If you selected an IRC Network in <i>\"Group\"</i>, this window shows all of "
@@ -723,502 +1068,402 @@ msgstr ""
 "weinyddion i gyd. Os na ddewisoch chi grŵp, cewch roi eich un chi yma neu "
 "ddewis un o'r rhai sy wedi'u defnyddio'n ddiweddar (<i>\"ChwimGyswllt\"</i>)."
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 99
-#: rc.cpp:114
+#: KSOpenkSirc/open_ksircData.ui:99
 #, no-c-format
 msgid "Choose a server port"
 msgstr "Dewiswch porth gweinydd"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 102
-#: rc.cpp:117
+#: KSOpenkSirc/open_ksircData.ui:102
 #, no-c-format
 msgid ""
-"Using <i>\"6667\"</i> or <i>\"6666\"</i> here is safe in most cases. Only use "
-"other values if you have been told so."
+"Using <i>\"6667\"</i> or <i>\"6666\"</i> here is safe in most cases. Only "
+"use other values if you have been told so."
 msgstr ""
-"Mae defnyddio <i>\"6667\"</i> neu <i>\"6666\"</i> yma'n ddiogel ran fwyaf. Na "
-"ddefnyddiwch werthoedd eraill onibai eich bod chi wedi cael cyfarwyddyd i "
+"Mae defnyddio <i>\"6667\"</i> neu <i>\"6666\"</i> yma'n ddiogel ran fwyaf. "
+"Na ddefnyddiwch werthoedd eraill onibai eich bod chi wedi cael cyfarwyddyd i "
 "wneud."
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 110
-#: rc.cpp:120
+#: KSOpenkSirc/open_ksircData.ui:110
 #, no-c-format
 msgid "Server Description"
 msgstr "Disgrifiad y Gweinydd"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 113
-#: rc.cpp:123
+#: KSOpenkSirc/open_ksircData.ui:113
 #, no-c-format
 msgid "This is the description of the server currently selected"
 msgstr "Disgrifiad y gweinydd wedi'i ddewis ar hyn o bryd ydi hyn."
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 160
-#: rc.cpp:126
+#: KSOpenkSirc/open_ksircData.ui:160
 #, no-c-format
 msgid "Server Access"
 msgstr "Mynediad i'r Gweinydd"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 177
-#: rc.cpp:129
+#: KSOpenkSirc/open_ksircData.ui:177
 #, no-c-format
 msgid "Pass&word:"
 msgstr "Cy&frinair:"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 204
-#: rc.cpp:132 rc.cpp:192
+#: KSOpenkSirc/open_ksircData.ui:204 KSPrefs/page_autoconnectbase.ui:195
 #, no-c-format
 msgid "Use SS&L"
 msgstr "Defnyddier SS&L"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 207
-#: rc.cpp:135
+#: KSOpenkSirc/open_ksircData.ui:207
 #, no-c-format
 msgid ""
-"This will use a secure connection to the server. This must be supported by the "
-"server."
+"This will use a secure connection to the server. This must be supported by "
+"the server."
 msgstr ""
-"Defnyddia hyn cysylltiad diogel â'r gweinydd. Rhaid bod hyn yn cael ei gynnal "
-"gan y gweinydd. "
+"Defnyddia hyn cysylltiad diogel â'r gweinydd. Rhaid bod hyn yn cael ei "
+"gynnal gan y gweinydd. "
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 215
-#: rc.cpp:138
+#: KSOpenkSirc/open_ksircData.ui:215
 #, no-c-format
 msgid "S&tore password"
 msgstr "&Cadw'r cyfrinair"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 218
-#: rc.cpp:141
+#: KSOpenkSirc/open_ksircData.ui:218
 #, no-c-format
 msgid "This will cause your server password to be stored on your disk."
 msgstr "Achosith hyn i'ch cyfrinair gael ei gadw ar eich ddisg."
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 231
-#: rc.cpp:147 rc.cpp:150
+#: KSOpenkSirc/open_ksircData.ui:228 dccNewbase.ui:166
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "&Diddymu"
+
+#: KSOpenkSirc/open_ksircData.ui:231 KSOpenkSirc/open_ksircData.ui:234
 #, no-c-format
 msgid "Cancel Connect"
 msgstr "Diddymu Cysylltiad"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 250
-#: rc.cpp:153
+#: KSOpenkSirc/open_ksircData.ui:250
 #, no-c-format
 msgid "C&onnect"
 msgstr "C&ysylltu"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 256
-#: rc.cpp:156
+#: KSOpenkSirc/open_ksircData.ui:256
 #, no-c-format
 msgid "Connect to the selected server"
 msgstr "Cysylltu â'r gweinydd dewisiedig"
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 259
-#: rc.cpp:159
+#: KSOpenkSirc/open_ksircData.ui:259
 #, no-c-format
 msgid ""
-"Connect to the server given in <i>\"Server / Quick Connect to:\"</i> "
-"on the port given in <i>\"Port:\"</i>."
+"Connect to the server given in <i>\"Server / Quick Connect to:\"</i> on the "
+"port given in <i>\"Port:\"</i>."
 msgstr ""
 "Cysylltu â'r gweinydd sy wedi'i roi yn <i>\"Gweinydd/ChwimGyswllt â:\"</i> "
 "ar y porth sy wedi'i roi yn <i>\"Porth:\"</i>."
 
-#. i18n: file KSOpenkSirc/open_ksircData.ui line 267
-#: rc.cpp:162
+#: KSOpenkSirc/open_ksircData.ui:267
 #, no-c-format
 msgid "&Edit Servers"
 msgstr "Golygu Gw&einyddion"
 
-#. i18n: file KSPrefs/page_autoconnectbase.ui line 16
-#: KSPrefs/ksprefs.cpp:43 rc.cpp:165
-#, no-c-format
-msgid "Auto Connect"
-msgstr "Hunan-gysylltu"
-
-#. i18n: file KSPrefs/page_autoconnectbase.ui line 28
-#: rc.cpp:168
+#: KSPrefs/page_autoconnectbase.ui:28
 #, no-c-format
 msgid "Auto Connect List"
 msgstr "Rhestr Hunan-gysylltu"
 
-#. i18n: file KSPrefs/page_autoconnectbase.ui line 39
-#: rc.cpp:171
+#: KSPrefs/page_autoconnectbase.ui:39
 #, no-c-format
 msgid "Port/Key"
 msgstr "Porth/Allwedd"
 
-#. i18n: file KSPrefs/page_autoconnectbase.ui line 50
-#: rc.cpp:174
+#: KSPrefs/page_autoconnectbase.ui:50
 #, no-c-format
 msgid "Server Password"
 msgstr "Cyfrinair i'r Gweinydd"
 
-#. i18n: file KSPrefs/page_autoconnectbase.ui line 61
-#: KSPrefs/page_autoconnect.cpp:110 KSPrefs/page_autoconnect.cpp:165
-#: KSPrefs/page_autoconnect.cpp:189 rc.cpp:177
-#, no-c-format
-msgid "SSL"
-msgstr "SSL"
-
-#. i18n: file KSPrefs/page_autoconnectbase.ui line 85
-#: rc.cpp:180
+#: KSPrefs/page_autoconnectbase.ui:85
 #, no-c-format
 msgid "Auto Connect Setup"
 msgstr "Gosod Hunan-Gysylltu"
 
-#. i18n: file KSPrefs/page_autoconnectbase.ui line 112
-#: rc.cpp:183
+#: KSPrefs/page_autoconnectbase.ui:112
 #, no-c-format
 msgid "Server:"
 msgstr "Gweinydd:"
 
-#. i18n: file KSPrefs/page_autoconnectbase.ui line 161
-#: rc.cpp:189
+#: KSPrefs/page_autoconnectbase.ui:161
 #, no-c-format
 msgid "Server password:"
 msgstr "Cyfrinair y Gweinydd:"
 
-#. i18n: file KSPrefs/page_autoconnectbase.ui line 223
-#: rc.cpp:195
+#: KSPrefs/page_autoconnectbase.ui:223
 #, no-c-format
 msgid "&Channel:"
 msgstr "&Sianel:"
 
-#. i18n: file KSPrefs/page_autoconnectbase.ui line 285
-#: KSPrefs/page_autoconnect.cpp:219 rc.cpp:204 rc.cpp:252
-#, no-c-format
-msgid "&Add"
-msgstr "Ychw&anegu"
-
-#. i18n: file KSPrefs/page_colorsbase.ui line 16
-#: KSPrefs/ksprefs.cpp:38 rc.cpp:210
-#, no-c-format
-msgid "Colors"
-msgstr "Lliwiau"
-
-#. i18n: file KSPrefs/page_colorsbase.ui line 34
-#: rc.cpp:213
+#: KSPrefs/page_colorsbase.ui:34
 #, no-c-format
 msgid "&Scheme"
 msgstr "C&ynllun"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 45
-#: rc.cpp:216
+#: KSPrefs/page_colorsbase.ui:45
 #, no-c-format
 msgid "Chat Colors"
 msgstr "Lliwiau Sgwrsio"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 62
-#: rc.cpp:219
+#: KSPrefs/page_colorsbase.ui:62
 #, no-c-format
 msgid "C&hannel messages:"
 msgstr "Ne&geseuon Sianel:"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 73
-#: rc.cpp:222
+#: KSPrefs/page_colorsbase.ui:73
 #, no-c-format
 msgid "&Generic text:"
 msgstr "Testun Cy&ffredinol:"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 84
-#: rc.cpp:225
+#: KSPrefs/page_colorsbase.ui:84
 #, no-c-format
 msgid "&Errors:"
 msgstr "G&wallau:"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 95
-#: rc.cpp:228
+#: KSPrefs/page_colorsbase.ui:95
 #, no-c-format
 msgid "&Info:"
 msgstr "Gwy&bodaeth:"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 131
-#: rc.cpp:234
+#: KSPrefs/page_colorsbase.ui:131
 #, no-c-format
 msgid "&Links:"
 msgstr "&Cysylltau:"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 201
-#: rc.cpp:237
+#: KSPrefs/page_colorsbase.ui:201
 #, no-c-format
 msgid "Selection backgr&ound:"
 msgstr "C&efndir y Dewis:"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 268
-#: rc.cpp:240
+#: KSPrefs/page_colorsbase.ui:268
 #, no-c-format
 msgid "Sele&ction foreground:"
 msgstr "Blae&ndir y Dewis:"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 279
-#: rc.cpp:243
+#: KSPrefs/page_colorsbase.ui:279
 #, no-c-format
 msgid "&Use background color for links"
 msgstr "&Defnyddio lliw cefndir ar gyfer cysylltau"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 289
-#: rc.cpp:246
+#: KSPrefs/page_colorsbase.ui:289
 #, no-c-format
 msgid "Sample Color Themes"
 msgstr "Cynlluniau Lliwiau Enghreifftiol"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 355
-#: rc.cpp:258
+#: KSPrefs/page_colorsbase.ui:355
 #, no-c-format
 msgid "&Highlighting"
 msgstr "&Amlygu"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 366
-#: rc.cpp:261
+#: KSPrefs/page_colorsbase.ui:366
 #, no-c-format
 msgid "Your Nick"
 msgstr "Eich Ffugenw"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 377
-#: rc.cpp:264
+#: KSPrefs/page_colorsbase.ui:377
 #, no-c-format
 msgid "Color: "
 msgstr "Lliw:"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 402
-#: rc.cpp:267
+#: KSPrefs/page_colorsbase.ui:402
 #, no-c-format
 msgid "Bold"
 msgstr "Trwm"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 410
-#: rc.cpp:270
+#: KSPrefs/page_colorsbase.ui:410
 #, no-c-format
 msgid "Reverse"
 msgstr "Gwrthwynebu"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 418
-#: rc.cpp:273
+#: KSPrefs/page_colorsbase.ui:418
 #, no-c-format
 msgid "Underline"
 msgstr "Tanlinellu"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 445
-#: rc.cpp:276
+#: KSPrefs/page_colorsbase.ui:445
 #, no-c-format
 msgid "Other Nicks"
 msgstr "Ffugenwau Eraill"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 459
-#: rc.cpp:279
+#: KSPrefs/page_colorsbase.ui:459
 #, no-c-format
 msgid "N&o nick colors"
 msgstr "&Dim Lliwiau Ffugenw"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 467
-#: rc.cpp:282
+#: KSPrefs/page_colorsbase.ui:467
 #, no-c-format
 msgid "Au&to nick colorization"
 msgstr "Lliwiau Ymysgogol &Ffugenw"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 475
-#: rc.cpp:285
+#: KSPrefs/page_colorsbase.ui:475
 #, no-c-format
 msgid "Fi&xed"
 msgstr "&Sefydlog"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 514
-#: rc.cpp:291
+#: KSPrefs/page_colorsbase.ui:514
 #, no-c-format
 msgid "Backg&round:"
 msgstr "&Cefndir:"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 561
-#: rc.cpp:294
+#: KSPrefs/page_colorsbase.ui:561
 #, no-c-format
 msgid "Highlight Messages"
 msgstr "Amlygu Negeseuon"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 580
-#: rc.cpp:297
+#: KSPrefs/page_colorsbase.ui:580
 #, no-c-format
 msgid "Containing &your nick:"
 msgstr "Yn cynnwys eich &ffugenw:"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 632
-#: rc.cpp:300 rc.cpp:306
+#: KSPrefs/page_colorsbase.ui:632 KSPrefs/page_colorsbase.ui:697
 #, no-c-format
 msgid "Containing:"
 msgstr "Yn cynnwys:"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 662
-#: rc.cpp:303 rc.cpp:309
+#: KSPrefs/page_colorsbase.ui:662 KSPrefs/page_colorsbase.ui:727
 #, no-c-format
 msgid "Regex"
 msgstr "Regex"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 756
-#: rc.cpp:312
+#: KSPrefs/page_colorsbase.ui:756
 #, no-c-format
 msgid "Color Codes"
 msgstr "Codau Lliw"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 773
-#: rc.cpp:315
+#: KSPrefs/page_colorsbase.ui:773
 #, no-c-format
 msgid "Strip &kSirc color codes"
 msgstr "Gwaredu codau lliw &kSirc"
 
-#. i18n: file KSPrefs/page_colorsbase.ui line 784
-#: rc.cpp:318
+#: KSPrefs/page_colorsbase.ui:784
 #, no-c-format
 msgid "Strip &mIRC color codes"
 msgstr "Gwaredu codau lliw &mIRC"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 22
-#: KSPrefs/ksprefs.cpp:36 rc.cpp:321
-#, no-c-format
-msgid "General"
-msgstr "Cyffredinol"
-
-#. i18n: file KSPrefs/page_generalbase.ui line 48
-#: rc.cpp:324
+#: KSPrefs/page_generalbase.ui:48
 #, no-c-format
 msgid "Global Options"
 msgstr "Dewisiadau Eang"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 79
-#: rc.cpp:327
+#: KSPrefs/page_generalbase.ui:79
 #, no-c-format
 msgid "Histor&y length:"
 msgstr "&Hyd Hanes:"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 98
-#: rc.cpp:330
+#: KSPrefs/page_generalbase.ui:98
 #, no-c-format
 msgid " lines"
 msgstr "o linellau"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 101
-#: rc.cpp:333
+#: KSPrefs/page_generalbase.ui:101
 #, no-c-format
 msgid "unlimited"
 msgstr "heb derfyn"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 107
-#: rc.cpp:336
+#: KSPrefs/page_generalbase.ui:107
 #, no-c-format
 msgid "Stores up to this many lines of chat from each window as history"
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 110
-#: rc.cpp:339
+#: KSPrefs/page_generalbase.ui:110
 #, no-c-format
 msgid ""
-"Stores up to this many lines of chat from each window, allowing you to scroll "
-"upwards and see what has already been said."
+"Stores up to this many lines of chat from each window, allowing you to "
+"scroll upwards and see what has already been said."
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 120
-#: rc.cpp:342
+#: KSPrefs/page_generalbase.ui:120
 #, no-c-format
 msgid "&Announce away messages"
 msgstr "&Cyhoeddi negeseuon i ffwrdd"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 123
-#: rc.cpp:345
+#: KSPrefs/page_generalbase.ui:123
 #, no-c-format
 msgid "See the messages when a user selects the away option"
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 126
-#: rc.cpp:348
+#: KSPrefs/page_generalbase.ui:126
 #, no-c-format
 msgid ""
 "If this is checked, you will see the messages when a user selects the away "
 "option. By default this option is not checked."
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 134
-#: rc.cpp:351
+#: KSPrefs/page_generalbase.ui:134
 #, no-c-format
 msgid "A&uto create window"
 msgstr "Hunan-greu &ffenestr"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 137
-#: rc.cpp:354
+#: KSPrefs/page_generalbase.ui:137
 #, no-c-format
 msgid "Will auto create a window for each user who sends a /msg to you"
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 140
-#: rc.cpp:357
+#: KSPrefs/page_generalbase.ui:140
 #, no-c-format
 msgid ""
 "If selected, KSirc  will automatically create a new window for each user who "
-"sends a /msg command to you. If not selected, any text sent to you with /msg is "
-"displayed in the current window and you can use /query username to create a "
-"window to chat to that user."
+"sends a /msg command to you. If not selected, any text sent to you with /msg "
+"is displayed in the current window and you can use /query username to create "
+"a window to chat to that user."
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 148
-#: rc.cpp:360
+#: KSPrefs/page_generalbase.ui:148
 #, no-c-format
 msgid "Auto create &on notice"
 msgstr "Hunan-greu ar &sylwad"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 156
-#: rc.cpp:363
+#: KSPrefs/page_generalbase.ui:156
 #, no-c-format
 msgid "Auto-re&join"
 msgstr "Ail-y&muno'n ymysgogol"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 159
-#: rc.cpp:366
+#: KSPrefs/page_generalbase.ui:159
 #, no-c-format
 msgid "Rejoin channels automatically if you are disconnected."
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 162
-#: rc.cpp:369
+#: KSPrefs/page_generalbase.ui:162
 #, no-c-format
 msgid ""
 "If selected, it allows you to  rejoin channels automatically if you are "
 "disconnected."
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 170
-#: rc.cpp:372
+#: KSPrefs/page_generalbase.ui:170
 #, no-c-format
 msgid "Dock &passive popups"
 msgstr "Docio naidlenni &goddefol"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 178
-#: rc.cpp:375
+#: KSPrefs/page_generalbase.ui:178
 #, no-c-format
 msgid "D&isplay topic in caption"
 msgstr "A&rddangos y pwnc yn yr egluryn"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 181
-#: rc.cpp:378
+#: KSPrefs/page_generalbase.ui:181
 #, no-c-format
 msgid "Display the topic of the current channel in the window caption"
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 184
-#: rc.cpp:381
+#: KSPrefs/page_generalbase.ui:184
 #, no-c-format
 msgid ""
 "Displays the topic of the current channel in the window caption. If not "
 "selected, the topic is only displayed inside the window."
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 192
-#: rc.cpp:384
+#: KSPrefs/page_generalbase.ui:192
 #, no-c-format
 msgid "Color pi&cker popup"
 msgstr "Naidlen dewis &lliwiau"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 195
-#: rc.cpp:387
+#: KSPrefs/page_generalbase.ui:195
 #, no-c-format
 msgid "Allow you to get the color pickup dialog with Ctrl K"
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 198
-#: rc.cpp:390
+#: KSPrefs/page_generalbase.ui:198
 #, no-c-format
 msgid ""
 "If selected, a popup window from which to select the color of your text is "
@@ -1226,48 +1471,41 @@ msgid ""
 "manually."
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 206
-#: rc.cpp:393
+#: KSPrefs/page_generalbase.ui:206
 #, no-c-format
 msgid "One line te&xt entry box"
 msgstr "Blwch mewnosod testun un llinell"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 214
-#: rc.cpp:396
+#: KSPrefs/page_generalbase.ui:214
 #, no-c-format
 msgid "Us&e color nick list"
 msgstr "D&efnyddio rhestr liwiau ffugenwau"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 217
-#: rc.cpp:399
+#: KSPrefs/page_generalbase.ui:217
 #, no-c-format
 msgid ""
-"Use the colors set in the Colors tab of the Configure KSirc dialog for coloring "
-"the nicknames"
+"Use the colors set in the Colors tab of the Configure KSirc dialog for "
+"coloring the nicknames"
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 220
-#: rc.cpp:402
+#: KSPrefs/page_generalbase.ui:220
 #, no-c-format
 msgid ""
 "If selected, it will use the colors set in the Colors tab of the Configure "
 "KSirc dialog for coloring the nicknames."
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 245
-#: rc.cpp:405
+#: KSPrefs/page_generalbase.ui:245
 #, no-c-format
 msgid "&Nick completion"
 msgstr "C&wblhau ffugenw"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 248
-#: rc.cpp:408
+#: KSPrefs/page_generalbase.ui:248
 #, fuzzy, no-c-format
 msgid "Switch nickname completion on"
 msgstr "C&wblhau ffugenw"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 251
-#: rc.cpp:411
+#: KSPrefs/page_generalbase.ui:251
 #, no-c-format
 msgid ""
 "If selected, switches nickname completion on. Nickname completion works as "
@@ -1276,76 +1514,65 @@ msgid ""
 "capitalization if necessary."
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 259
-#: rc.cpp:414
+#: KSPrefs/page_generalbase.ui:259
 #, no-c-format
 msgid "&Dock in system tray"
 msgstr "&Docio yn y cafn cysawd"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 262
-#: rc.cpp:417
+#: KSPrefs/page_generalbase.ui:262
 #, no-c-format
 msgid "Put the KSirc icon in the system tray"
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 265
-#: rc.cpp:420
+#: KSPrefs/page_generalbase.ui:265
 #, no-c-format
 msgid ""
 "This allows KSirc to be docked in the system tray. By default this is not "
 "enabled. When KSirc is docked in the system tray, you are able to access "
-"several options by clicking on the KSirc icon. When you close KSirc window, the "
-"icon stays in the systray until you quit KSirc."
+"several options by clicking on the KSirc icon. When you close KSirc window, "
+"the icon stays in the systray until you quit KSirc."
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 273
-#: rc.cpp:423
+#: KSPrefs/page_generalbase.ui:273
 #, no-c-format
 msgid "Auto save history"
 msgstr "Hunan-gadw hanes"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 283
-#: rc.cpp:426
+#: KSPrefs/page_generalbase.ui:283
 #, no-c-format
 msgid "Per Channel Options"
 msgstr "Dewisiadau sianeli"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 294
-#: rc.cpp:429
+#: KSPrefs/page_generalbase.ui:294
 #, no-c-format
 msgid "&Time stamp"
 msgstr "&Amsernod"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 297
-#: rc.cpp:432
+#: KSPrefs/page_generalbase.ui:297
 #, no-c-format
 msgid "Add the time and date on the left of each message"
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 300
-#: rc.cpp:435
+#: KSPrefs/page_generalbase.ui:300
 #, no-c-format
 msgid ""
-"Prepends each thing said in the channel with the time it was said, in the form "
-"[HH:MM:SS]."
+"Prepends each thing said in the channel with the time it was said, in the "
+"form [HH:MM:SS]."
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 308
-#: rc.cpp:438
+#: KSPrefs/page_generalbase.ui:308
 #, no-c-format
 msgid "O&verride existing channel options"
 msgstr "Anwy&byddu dewisiadau sianeli presennol"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 311
-#: rc.cpp:441
+#: KSPrefs/page_generalbase.ui:311
 #, no-c-format
 msgid ""
 "The settings in this tab will be applied and each channel settings will be "
 "ignored"
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 314
-#: rc.cpp:444
+#: KSPrefs/page_generalbase.ui:314
 #, no-c-format
 msgid ""
 "If this is selected, the settings in this tab will override each channel's "
@@ -1356,63 +1583,49 @@ msgid ""
 "channels options all the time."
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 322
-#: rc.cpp:447
+#: KSPrefs/page_generalbase.ui:322
 #, no-c-format
 msgid "Sho&w topic"
 msgstr "Dang&os pwnc"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 325
-#: rc.cpp:450
+#: KSPrefs/page_generalbase.ui:325
 #, fuzzy, no-c-format
 msgid "Displays the channel topic on top"
 msgstr "A&rddangos y pwnc yn yr egluryn"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 328
-#: rc.cpp:453
+#: KSPrefs/page_generalbase.ui:328
 #, no-c-format
 msgid "Displays the channel topic on top of each channel window."
 msgstr ""
 
-#. i18n: file KSPrefs/page_generalbase.ui line 336
-#: rc.cpp:456
+#: KSPrefs/page_generalbase.ui:336
 #, no-c-format
 msgid "&Beep on change"
 msgstr "Bi&pio pan fo newid"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 344
-#: rc.cpp:459
+#: KSPrefs/page_generalbase.ui:344
 #, no-c-format
 msgid "Hide part/join messages"
 msgstr "Cuddio negeseuon gadael/ymuno"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 352
-#: rc.cpp:462
+#: KSPrefs/page_generalbase.ui:352
 #, no-c-format
 msgid "Enable lo&gging"
 msgstr "&Galluogi cofnodi"
 
-#. i18n: file KSPrefs/page_generalbase.ui line 371
-#: rc.cpp:465
+#: KSPrefs/page_generalbase.ui:371
 #, no-c-format
 msgid "Default en&coding:"
 msgstr "A&mgodiad rhagosodedig:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 16
-#: KSPrefs/ksprefs.cpp:39 rc.cpp:468
-#, no-c-format
-msgid "IRC Colors"
-msgstr "Lliwiau IRC"
-
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 30
-#: rc.cpp:471
+#: KSPrefs/page_irccolorsbase.ui:30
 #, no-c-format
 msgid ""
-"<p>This selection allows you to control what the colors displayed inline in the "
-"channel look like. These colors are used for both mIRC style colors in channels "
-"and colorful nicks. The sample box beside the button gives you an example of "
-"what it will look like in the channel. The checkbox controls if the color is "
-"used for the colorful nick features. Checked means use it.</p>"
+"<p>This selection allows you to control what the colors displayed inline in "
+"the channel look like. These colors are used for both mIRC style colors in "
+"channels and colorful nicks. The sample box beside the button gives you an "
+"example of what it will look like in the channel. The checkbox controls if "
+"the color is used for the colorful nick features. Checked means use it.</p>"
 msgstr ""
 "<p>Mae'r dewisiad yma'n caniatau ichi reoli sut mae'r lliwiau a ymddengys "
 "mewnlein yn y sianel yn edrych. Defnyddir y lliwiau hyn am arddull mIRC mewn "
@@ -1421,788 +1634,441 @@ msgstr ""
 "defnyddia'r lliw ar gyfer y nodweddion ffugenwau lliwgar ai peidio. Pan fo "
 "wedi'i fritho, yr ystyr yw i'w ddefnyddio.</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 42
-#: rc.cpp:474 rc.cpp:477
+#: KSPrefs/page_irccolorsbase.ui:42 KSPrefs/page_irccolorsbase.ui:53
 #, no-c-format
 msgid "Dark Colors"
 msgstr "Lliwiau Tywyll"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 64
-#: rc.cpp:480
+#: KSPrefs/page_irccolorsbase.ui:64
 #, no-c-format
 msgid "Black:"
 msgstr "Du:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 103
-#: rc.cpp:483
+#: KSPrefs/page_irccolorsbase.ui:103
 #, no-c-format
 msgid "<p align=\"center\">Black</p>"
 msgstr "<p align=\"center\">Du</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 122
-#: rc.cpp:486
+#: KSPrefs/page_irccolorsbase.ui:122
 #, no-c-format
 msgid "White:"
 msgstr "Gwyn:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 169
-#: rc.cpp:489
+#: KSPrefs/page_irccolorsbase.ui:169
 #, no-c-format
 msgid "<p align=\"center\">White</p>"
 msgstr "<p align=\"center\">Gwyn</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 180
-#: rc.cpp:492
+#: KSPrefs/page_irccolorsbase.ui:180
 #, no-c-format
 msgid "Dark blue:"
 msgstr "Glas tywyll:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 219
-#: rc.cpp:495
+#: KSPrefs/page_irccolorsbase.ui:219
 #, no-c-format
 msgid "<p align=\"center\">Dark Blue</p>"
 msgstr "<p align=\"center\">Glas Tywyll</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 230
-#: rc.cpp:498
+#: KSPrefs/page_irccolorsbase.ui:230
 #, no-c-format
 msgid "Red:"
 msgstr "***"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 261
-#: rc.cpp:501
+#: KSPrefs/page_irccolorsbase.ui:261
 #, no-c-format
 msgid "<p align=\"center\">Red</p>"
 msgstr "<p align=\"center\">Coch</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 272
-#: rc.cpp:504
+#: KSPrefs/page_irccolorsbase.ui:272
 #, no-c-format
 msgid "Dark green:"
 msgstr "Gwyrdd tywyll:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 303
-#: rc.cpp:507
+#: KSPrefs/page_irccolorsbase.ui:303
 #, no-c-format
 msgid "<p align=\"center\">Dark Green</p>"
 msgstr "<p align=\"center\">Gwyrdd Tywyll</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 314
-#: rc.cpp:510
+#: KSPrefs/page_irccolorsbase.ui:314
 #, no-c-format
 msgid "Brown:"
 msgstr "Brown:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 345
-#: rc.cpp:513
+#: KSPrefs/page_irccolorsbase.ui:345
 #, no-c-format
 msgid "<p align=\"center\">Brown</p>"
 msgstr "<p align=\"center\">Brown</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 356
-#: rc.cpp:516
+#: KSPrefs/page_irccolorsbase.ui:356
 #, no-c-format
 msgid "Magenta:"
 msgstr "Magenta:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 387
-#: rc.cpp:519
+#: KSPrefs/page_irccolorsbase.ui:387
 #, no-c-format
 msgid "<p align=\"center\">Magenta</p>"
 msgstr "<p align=\"center\">Magenta</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 398
-#: rc.cpp:522
+#: KSPrefs/page_irccolorsbase.ui:398
 #, no-c-format
 msgid "Orange:"
 msgstr "Oren:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 429
-#: rc.cpp:525
+#: KSPrefs/page_irccolorsbase.ui:429
 #, no-c-format
 msgid "<p align=\"center\">Orange<p>"
 msgstr "<p align=\"center\">Oren<p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 533
-#: rc.cpp:528
+#: KSPrefs/page_irccolorsbase.ui:533
 #, no-c-format
 msgid "Light Colors"
 msgstr "Lliwiau Golau"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 550
-#: rc.cpp:531
+#: KSPrefs/page_irccolorsbase.ui:550
 #, no-c-format
 msgid "IRC Channel Colors"
 msgstr "Lliwiau Sianel IRC"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 567
-#: rc.cpp:534
+#: KSPrefs/page_irccolorsbase.ui:567
 #, no-c-format
 msgid "Dark cyan:"
 msgstr "Gwyrddlas tywyll:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 578
-#: rc.cpp:537
+#: KSPrefs/page_irccolorsbase.ui:578
 #, no-c-format
 msgid "Cyan:"
 msgstr "Gwyrddlas:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 589
-#: rc.cpp:540
+#: KSPrefs/page_irccolorsbase.ui:589
 #, no-c-format
 msgid "Blue:"
 msgstr "Glas:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 600
-#: rc.cpp:543
+#: KSPrefs/page_irccolorsbase.ui:600
 #, no-c-format
 msgid "Purple:"
 msgstr "Porffor:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 611
-#: rc.cpp:546
+#: KSPrefs/page_irccolorsbase.ui:611
 #, no-c-format
 msgid "Gray:"
 msgstr "Llwyd:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 622
-#: rc.cpp:549
+#: KSPrefs/page_irccolorsbase.ui:622
 #, no-c-format
 msgid "Light gray:"
 msgstr "Llwyd golau:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 745
-#: rc.cpp:552
+#: KSPrefs/page_irccolorsbase.ui:745
 #, no-c-format
 msgid "Green:"
 msgstr "Gwyrdd:"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 770
-#: rc.cpp:555
+#: KSPrefs/page_irccolorsbase.ui:770
 #, no-c-format
 msgid "<p align=\"center\">Yellow</p>"
 msgstr "<p align=\"center\">Melyn</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 787
-#: rc.cpp:558
+#: KSPrefs/page_irccolorsbase.ui:787
 #, no-c-format
 msgid "<p align=\"center\">Green</p>"
 msgstr "<p align=\"center\">Gwyrdd</p> "
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 804
-#: rc.cpp:561
+#: KSPrefs/page_irccolorsbase.ui:804
 #, no-c-format
 msgid "<p align=\"center\">Cyan</p>"
 msgstr "<p align=\"center\">Gwyrddlas</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 821
-#: rc.cpp:564
+#: KSPrefs/page_irccolorsbase.ui:821
 #, no-c-format
 msgid "<p align=\"center\">Dark Cyan</p>"
 msgstr "<p align=\"center\">Gwyrddlas Tywyll</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 838
-#: rc.cpp:567
+#: KSPrefs/page_irccolorsbase.ui:838
 #, no-c-format
 msgid "<p align=\"center\">Blue</p>"
 msgstr "<p align=\"center\">Glas</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 855
-#: rc.cpp:570
+#: KSPrefs/page_irccolorsbase.ui:855
 #, no-c-format
 msgid "<p align=\"center\">Purple</p>"
 msgstr "<p align=\"center\">Porffor</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 872
-#: rc.cpp:573
+#: KSPrefs/page_irccolorsbase.ui:872
 #, no-c-format
 msgid "<p align=\"center\">Gray</p>"
 msgstr "<p align=\"center\">Llwyd</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 889
-#: rc.cpp:576
+#: KSPrefs/page_irccolorsbase.ui:889
 #, no-c-format
 msgid "<p align=\"center\">Light Gray</p>"
 msgstr "<p align=\"center\">Llwyd Golau</p>"
 
-#. i18n: file KSPrefs/page_irccolorsbase.ui line 1028
-#: rc.cpp:579
+#: KSPrefs/page_irccolorsbase.ui:1028
 #, no-c-format
 msgid "Yellow:"
 msgstr "Melyn:"
 
-#. i18n: file KSPrefs/page_looknfeelbase.ui line 22
-#: rc.cpp:582
+#: KSPrefs/page_looknfeelbase.ui:22
 #, no-c-format
 msgid "LooknFeel"
 msgstr "Golwg a Theimlad"
 
-#. i18n: file KSPrefs/page_looknfeelbase.ui line 48
-#: rc.cpp:585
+#: KSPrefs/page_looknfeelbase.ui:48
 #, no-c-format
 msgid "Window Mode"
 msgstr "Modd Ffenestri"
 
-#. i18n: file KSPrefs/page_looknfeelbase.ui line 76
-#: rc.cpp:588
+#: KSPrefs/page_looknfeelbase.ui:76
 #, no-c-format
 msgid "&Paged MDI mode (XChat)"
 msgstr "Modd MDI &hysbysiedig (XChat)"
 
-#. i18n: file KSPrefs/page_looknfeelbase.ui line 107
-#: rc.cpp:591
+#: KSPrefs/page_looknfeelbase.ui:107
 #, no-c-format
 msgid "Choose your favorite window mode:"
 msgstr "Dewiswch eich hoff fodd ffenestri:"
 
-#. i18n: file KSPrefs/page_looknfeelbase.ui line 122
-#: rc.cpp:594
+#: KSPrefs/page_looknfeelbase.ui:122
 #, no-c-format
 msgid "&SDI mode (old behavior)"
 msgstr "Modd &SDI (hen ymddygiad)"
 
-#. i18n: file KSPrefs/page_looknfeelbase.ui line 177
-#: rc.cpp:597
+#: KSPrefs/page_looknfeelbase.ui:177
 #, no-c-format
 msgid "Wallpaper"
 msgstr "Papur wal"
 
-#. i18n: file KSPrefs/page_rmbmenubase.ui line 16
-#: rc.cpp:600
+#: KSPrefs/page_rmbmenubase.ui:16
 #, no-c-format
 msgid "Nick Option Menu"
 msgstr "Dewislen Dewisiadau Ffugenwau"
 
-#. i18n: file KSPrefs/page_rmbmenubase.ui line 42
-#: rc.cpp:603
+#: KSPrefs/page_rmbmenubase.ui:42
 #, no-c-format
 msgid ""
-"This page allows configuration of the RMB Menu for the nicklist located on the "
-"right. You can define names for certain actions. Look at the predefined "
+"This page allows configuration of the RMB Menu for the nicklist located on "
+"the right. You can define names for certain actions. Look at the predefined "
 "commands to learn how it works."
 msgstr ""
 "Galluoga'r dudalen hon addasu'r Ddewislen RMB ar gyfer y rhestr ffugenwau sy "
 "wedi'i leoli ar y dde.  Cewch ddiffinio enwau ar gyfer rhai gweithredoedd "
-"arbennig.  Edrychwch ar y gorchmynion rhagosodedig i ddysgu sut mae'n gweithio."
+"arbennig.  Edrychwch ar y gorchmynion rhagosodedig i ddysgu sut mae'n "
+"gweithio."
 
-#. i18n: file KSPrefs/page_rmbmenubase.ui line 91
-#: rc.cpp:606
+#: KSPrefs/page_rmbmenubase.ui:91
 #, no-c-format
 msgid "&Entry name:"
 msgstr "&Enw cofnod:"
 
-#. i18n: file KSPrefs/page_rmbmenubase.ui line 107
-#: rc.cpp:609
+#: KSPrefs/page_rmbmenubase.ui:107
 #, no-c-format
 msgid "Associated co&mmand:"
 msgstr "Gorchy&myn cysylltiedig:"
 
-#. i18n: file KSPrefs/page_rmbmenubase.ui line 123
-#: rc.cpp:612
+#: KSPrefs/page_rmbmenubase.ui:123
 #, no-c-format
 msgid "Onl&y enable on Op status"
 msgstr "Galluogi ar gyflwr &Op yn unig"
 
-#. i18n: file KSPrefs/page_rmbmenubase.ui line 171
-#: rc.cpp:615
+#: KSPrefs/page_rmbmenubase.ui:171
 #, no-c-format
 msgid "Move Down"
 msgstr "Symud i Lawr"
 
-#. i18n: file KSPrefs/page_rmbmenubase.ui line 188
-#: rc.cpp:618
+#: KSPrefs/page_rmbmenubase.ui:188
 #, no-c-format
 msgid "Move Up"
 msgstr "Symud i Fyny"
 
-#. i18n: file KSPrefs/page_rmbmenubase.ui line 215
-#: rc.cpp:621
+#: KSPrefs/page_rmbmenubase.ui:215
 #, no-c-format
 msgid "Insert &Separator"
 msgstr "Mewnosod &Gwahanydd"
 
-#. i18n: file KSPrefs/page_rmbmenubase.ui line 223
-#: rc.cpp:624
+#: KSPrefs/page_rmbmenubase.ui:223
 #, no-c-format
 msgid "&Insert Command"
 msgstr "Mewnosod Go&rchymyn"
 
-#. i18n: file KSPrefs/page_rmbmenubase.ui line 231
-#: rc.cpp:627
+#: KSPrefs/page_rmbmenubase.ui:231
 #, no-c-format
 msgid "M&odify"
 msgstr "&Addasu"
 
-#. i18n: file KSPrefs/page_rmbmenubase.ui line 239
-#: rc.cpp:630
+#: KSPrefs/page_rmbmenubase.ui:239
 #, no-c-format
 msgid "De&lete Selected Command"
 msgstr "Di&leu'r Gorchymyn Dewisiedig"
 
-#. i18n: file KSPrefs/page_servchanbase.ui line 16
-#: rc.cpp:633
+#: KSPrefs/page_servchanbase.ui:16
 #, no-c-format
 msgid "Server/Channels"
 msgstr "Gweinydd/Sianeli"
 
-#. i18n: file KSPrefs/page_servchanbase.ui line 30
-#: rc.cpp:636 rc.cpp:663 toplevel.cpp:627 toplevel.cpp:633 toplevel.cpp:637
-#: toplevel.cpp:638 toplevel.cpp:641 toplevel.cpp:652 toplevel.cpp:656
-#: toplevel.cpp:658
-#, no-c-format
-msgid "Server"
-msgstr "Gweinydd"
-
-#. i18n: file KSPrefs/page_servchanbase.ui line 66
-#: rc.cpp:639
+#: KSPrefs/page_servchanbase.ui:66
 #, no-c-format
 msgid "De&lete Server From List"
 msgstr "Di&leu'r Gweinydd o'r Rhestr"
 
-#. i18n: file KSPrefs/page_servchanbase.ui line 85
-#: rc.cpp:642
+#: KSPrefs/page_servchanbase.ui:85
 #, no-c-format
 msgid "Add &Server to List"
 msgstr "Ychwanegu'r Gweinydd at y R&hestr"
 
-#. i18n: file KSPrefs/page_servchanbase.ui line 102
-#: rc.cpp:645
+#: KSPrefs/page_servchanbase.ui:102
 #, no-c-format
 msgid "Channels"
 msgstr "Sianeli"
 
-#. i18n: file KSPrefs/page_servchanbase.ui line 138
-#: rc.cpp:648
+#: KSPrefs/page_servchanbase.ui:138
 #, no-c-format
 msgid "D&elete Channel From List"
 msgstr "Dil&eu Sianel o'r Rhestr"
 
-#. i18n: file KSPrefs/page_servchanbase.ui line 157
-#: rc.cpp:651
+#: KSPrefs/page_servchanbase.ui:157
 #, no-c-format
 msgid "Add Cha&nnel to List"
 msgstr "Ychwanegu Sia&nel at y Rhestr"
 
-#. i18n: file KSPrefs/page_shortcutsbase.ui line 22
-#: KSPrefs/ksprefs.cpp:45 rc.cpp:654
-#, no-c-format
-msgid "Shortcuts"
-msgstr "Byrlwybrau"
-
-#. i18n: file KSPrefs/page_shortcutsbase.ui line 42
-#: rc.cpp:657
+#: KSPrefs/page_shortcutsbase.ui:42
 #, no-c-format
 msgid "Global Shortcuts"
 msgstr "Byrlwybrau Eang"
 
-#. i18n: file KSPrefs/page_startupbase.ui line 16
-#: rc.cpp:660
+#: KSPrefs/page_startupbase.ui:16
 #, no-c-format
 msgid "StartUp"
 msgstr "Cychwyniad"
 
-#. i18n: file KSPrefs/page_startupbase.ui line 52
-#: rc.cpp:666
+#: KSPrefs/page_startupbase.ui:52
 #, no-c-format
 msgid "Name Settings"
 msgstr "Gosodiadau Enwau"
 
-#. i18n: file KSPrefs/page_startupbase.ui line 84
-#: rc.cpp:669
+#: KSPrefs/page_startupbase.ui:84
 #, no-c-format
 msgid "&Nick name:"
 msgstr "&Ffugenw:"
 
-#. i18n: file KSPrefs/page_startupbase.ui line 95
-#: rc.cpp:672
+#: KSPrefs/page_startupbase.ui:95
 #, no-c-format
 msgid "A&lternative nick:"
 msgstr "Ffugenw &arall:"
 
-#. i18n: file KSPrefs/page_startupbase.ui line 111
-#: rc.cpp:675
+#: KSPrefs/page_startupbase.ui:111
 #, no-c-format
 msgid "&User ID:"
 msgstr "&Dynodiad Defnyddiwr:"
 
-#. i18n: file KSPrefs/page_startupbase.ui line 122
-#: rc.cpp:678
+#: KSPrefs/page_startupbase.ui:122
 #, no-c-format
 msgid "&Real name:"
 msgstr "&Enw go iawn:"
 
-#. i18n: file KSPrefs/page_startupbase.ui line 143
-#: rc.cpp:681
+#: KSPrefs/page_startupbase.ui:143
 #, no-c-format
 msgid "Notify List"
 msgstr "Rhestr Hysbysu"
 
-#: servercontroller.cpp:163
-msgid "&New Server..."
-msgstr "Gweinydd &Newydd..."
-
-#: servercontroller.cpp:164
-msgid "&Join Channel..."
-msgstr "Y&muno â'r Sianel..."
-
-#: servercontroller.cpp:168
-msgid "&Connections"
-msgstr "C&ysylltiadau"
-
-#: servercontroller.cpp:186
-msgid "New Server"
-msgstr "Gweinydd Newydd"
-
-#: servercontroller.cpp:187
-msgid ""
-"This action allows you to open a new server more easily when in docked mode, "
-"since you don't need to click on the dock icon."
-msgstr ""
-"Galluoga'r weithred hon ichi agor gweinydd newydd yn haws pan ydych mewn modd "
-"docio, am nad oes angen ichi glicio ar yr eicon docio."
-
-#: servercontroller.cpp:201
-msgid "Server Control"
-msgstr "Rheoli Gweinydd"
-
-#: servercontroller.cpp:431 servercontroller.cpp:445 servercontroller.cpp:447
-msgid "Online"
-msgstr "Arlein"
-
-#: servercontroller.cpp:438
-msgid "%1 just went offline on %2"
-msgstr "%1 newydd fynd all-lein ar %2"
-
-#: servercontroller.cpp:460
-msgid "%1 just came online on %2"
-msgstr "%1 newydd ddod arlein ar %2"
-
-#: servercontroller.cpp:951
-msgid "Active server connections:"
-msgstr "Cysylltiadau gweinydd gweithredol:"
-
-#: ssfeprompt.cpp:25
-msgid "Prompt"
-msgstr "Annog"
-
-#: toplevel.cpp:160
-msgid "New Ser&ver..."
-msgstr "Gw&einydd Newydd..."
-
-#: toplevel.cpp:162
-msgid "&DCC Manager..."
-msgstr "Rheolydd &DCC"
-
-#: toplevel.cpp:163
-msgid "&Save to Logfile..."
-msgstr "&Cadw i Ffeil Cofnod..."
-
-#: toplevel.cpp:165
-msgid "Time St&amp"
-msgstr "&Amsernod"
-
-#: toplevel.cpp:168
-msgid "Hide Join/Part Messages"
-msgstr "Cuddio Negeseuon Ymuno/Ymadael"
-
-#: toplevel.cpp:171
-msgid "Character &Table"
-msgstr "&Tabl Nodau"
-
-#: toplevel.cpp:172
-msgid "N&otify on Change"
-msgstr "&Hysbysu ar Newid"
-
-#: toplevel.cpp:175
-msgid "&Encoding"
-msgstr "A&mgodiad"
-
-#: toplevel.cpp:179
-msgid "S&how Topic"
-msgstr "&Dangos Pwnc"
-
-#: toplevel.cpp:187
-msgid "Ticker &Mode"
-msgstr "&Modd Ticer"
-
-#: toplevel.cpp:215
-msgid "&Channel"
-msgstr "&Sianel"
-
-#: toplevel.cpp:262
-msgid "Lag: Wait"
-msgstr "Oedi: Arhoswch"
-
-#: toplevel.cpp:319
-msgid "C&lear Window"
-msgstr "C&lirio'r Ffenestr"
-
-#: toplevel.cpp:425
-msgid "&Users"
-msgstr "De&fnyddwyr"
-
-#: toplevel.cpp:448
-msgid "C&ommand"
-msgstr "G&orchymyn"
-
-#: toplevel.cpp:615 toplevel.cpp:617 toplevel.cpp:618 toplevel.cpp:623
-#: toplevel.cpp:624 toplevel.cpp:625 toplevel.cpp:636 toplevel.cpp:651
-#: toplevel.cpp:657 toplevel.cpp:660 toplevel.cpp:673
-msgid "Client"
-msgstr "Dibynnydd"
-
-#: toplevel.cpp:616 toplevel.cpp:622
-msgid "User"
-msgstr "Defnyddiwr"
-
-#: toplevel.cpp:619 toplevel.cpp:620 toplevel.cpp:626 toplevel.cpp:629
-#: toplevel.cpp:632 toplevel.cpp:634 toplevel.cpp:635 toplevel.cpp:639
-#: toplevel.cpp:642 toplevel.cpp:643 toplevel.cpp:644 toplevel.cpp:645
-#: toplevel.cpp:648 toplevel.cpp:650 toplevel.cpp:655 toplevel.cpp:663
-#: toplevel.cpp:664 toplevel.cpp:665 toplevel.cpp:671 toplevel.cpp:674
-msgid "Basic"
-msgstr "Sylfaenol"
-
-#: toplevel.cpp:621 toplevel.cpp:630 toplevel.cpp:646
-msgid "Operator"
-msgstr "Gweithredwr"
-
-#: toplevel.cpp:628 toplevel.cpp:640 toplevel.cpp:649 toplevel.cpp:659
-#: toplevel.cpp:662 toplevel.cpp:667 toplevel.cpp:668 toplevel.cpp:669
-#: toplevel.cpp:670 toplevel.cpp:672
-msgid "Channel"
-msgstr "Sianel"
-
-#: toplevel.cpp:631 toplevel.cpp:647 toplevel.cpp:653 toplevel.cpp:654
-#: toplevel.cpp:661
-msgid "Oper"
-msgstr "Gweithredwr"
-
-#: toplevel.cpp:1577
-msgid ""
-"You are about to send %1 lines of text.\n"
-"Do you really want to send that much?"
-msgstr ""
-"'Rydych ar anfon %1 llinell o destun.\n"
-" Ydych eisiau danfon gymaint?"
-
-#: toplevel.cpp:1603
-msgid ""
-"The text you pasted contains lines that start with /.\n"
-"Should they be interpreted as IRC commands?"
-msgstr ""
-"Cynnwys y testun y wnaethoch ludo linellau a gychwyn efo /.\n"
-" Dylen nhw gael eu trin fel gorchmynion IRC?"
-
-#: toplevel.cpp:1604
-msgid "Interpret"
-msgstr ""
-
-#: toplevel.cpp:1604
-msgid "Do Not Interpret"
-msgstr ""
-
-#: toplevel.cpp:1664
-msgid "Save Chat/Query Logfile"
-msgstr "Cadw Ffeil Cofnod Sgwrs/Holi"
-
-#: toplevel.cpp:1745
-#, c-format
-msgid "Your nick appeared on channel %1"
-msgstr "Ymddangosodd eich ffugenw ar sianel %1"
-
-#: toplevel.cpp:1750
-msgid "Channel %1 changed"
-msgstr "Newidodd sianel %1"
-
-#: usercontrolmenu.cpp:41
-msgid "&Refresh Nicks"
-msgstr "&Adfer ffugenwau"
-
-#: usercontrolmenu.cpp:45
-msgid "&Follow"
-msgstr "&Dilyn"
-
-#: usercontrolmenu.cpp:48
-msgid "&UnFollow"
-msgstr "Da&t-ddilyn"
-
-#: usercontrolmenu.cpp:52
-msgid "&Whois"
-msgstr "Pw&y-ydi"
-
-#: usercontrolmenu.cpp:55
-msgid "&Ping"
-msgstr "&Ping"
-
-#: usercontrolmenu.cpp:58
-msgid "V&ersion"
-msgstr "F&ersiwn"
-
-#: usercontrolmenu.cpp:62
-msgid "&Abuse"
-msgstr "Ca&mddefnydd"
-
-#: usercontrolmenu.cpp:66
-msgid "&Kick"
-msgstr "&Lluchio"
-
-#: usercontrolmenu.cpp:71
-msgid "&Ban"
-msgstr "G&wahardd"
-
-#: usercontrolmenu.cpp:76
-msgid "U&nBan"
-msgstr "Dat-wa&hardd"
-
-#: usercontrolmenu.cpp:82
-msgid "&Op"
-msgstr "Gwei&thredu (Op)"
-
-#: usercontrolmenu.cpp:87
-msgid "&Deop"
-msgstr "Dadweit&hredu (Deop)"
-
-#: usercontrolmenu.cpp:93
-msgid "&Voice"
-msgstr "&Lleisio"
-
-#: usercontrolmenu.cpp:98
-msgid "Devo&ice"
-msgstr "Datle&isio"
-
-#: KSOpenkSirc/open_ksirc.cpp:44
-msgid "Connect to Server"
-msgstr "Cysylltu â'r Gweinydd"
-
-#: KSOpenkSirc/open_ksirc.cpp:60 KSOpenkSirc/open_ksirc.cpp:77
-#: KSOpenkSirc/open_ksirc.cpp:100 KSOpenkSirc/open_ksirc.cpp:110
-#: KSOpenkSirc/open_ksirc.cpp:144
-msgid "Recent"
-msgstr "Diweddar"
-
-#: KSOpenkSirc/open_ksirc.cpp:78 KSOpenkSirc/open_ksirc.cpp:101
-msgid "Recent Server"
-msgstr "Gweinydd Diweddar"
-
-#: KSOpenkSirc/open_ksirc.cpp:145
-msgid "Random"
-msgstr "Hap"
-
-#: KSOpenkSirc/open_ksirc.cpp:215
-msgid "Not available"
-msgstr "Dim ar gael"
-
-#: KSOpenkSirc/open_ksirc.cpp:271
-msgid "Please enter a server name."
-msgstr "Rhowch enw gweinydd."
-
-#: KSPrefs/ksprefs.cpp:30
-msgid "Configure KSirc"
-msgstr "Ffurfweddu KSirc"
-
-#: KSPrefs/ksprefs.cpp:35
-msgid "Look and Feel"
-msgstr "Golwg a Theimlad"
-
-#: KSPrefs/ksprefs.cpp:35
-msgid "Controls how kSirc looks"
-msgstr "Rheoli sut bydd kSirc yn edrych"
-
-#: KSPrefs/ksprefs.cpp:36
-msgid "General KSirc Settings"
-msgstr "Gosodiadau Cyffredinol KSirc"
-
-#: KSPrefs/ksprefs.cpp:37
-msgid "Startup"
-msgstr "Ymgychwyniad"
-
-#: KSPrefs/ksprefs.cpp:37
-msgid "KSirc Startup Settings"
-msgstr "Gosodiadau Ymcychwyn KSirc"
-
-#: KSPrefs/ksprefs.cpp:38
-msgid "KSirc Color Settings"
-msgstr "Gosodiadau Lliw KSirc"
+#: dccManagerbase.ui:16
+#, no-c-format
+msgid "DCC Manager"
+msgstr "Rheolydd DCC"
 
-#: KSPrefs/ksprefs.cpp:39
-msgid "KSirc IRC Color Settings"
-msgstr "Gosodiadau Lliw IRC KSirc"
+#: dccManagerbase.ui:31
+#, no-c-format
+msgid "Who"
+msgstr "Pwy"
 
-#: KSPrefs/ksprefs.cpp:41
-msgid "User Menu"
-msgstr "Dewislen y Defnyddiwr"
+#: dccManagerbase.ui:42
+#, fuzzy, no-c-format
+msgid "File"
+msgstr "Enw Ffeil"
 
-#: KSPrefs/ksprefs.cpp:41
-msgid "User Menu Configuration"
-msgstr "Ffurfweddiad Dewislen y Defnyddiwr"
+#: dccManagerbase.ui:53
+#, no-c-format
+msgid "Status"
+msgstr "Cyflwr"
 
-#: KSPrefs/ksprefs.cpp:42
-msgid "Server/Channel"
-msgstr "Gweinydd/Sianel"
+#: dccManagerbase.ui:64
+#, no-c-format
+msgid "Size"
+msgstr "Maint"
 
-#: KSPrefs/ksprefs.cpp:42
-msgid "Server/Channel Configuration"
-msgstr "Ffurfweddiad y Gweinydd/Sianel"
+#: dccManagerbase.ui:75
+#, no-c-format
+msgid "KB/s"
+msgstr "KB/eil"
 
-#: KSPrefs/ksprefs.cpp:43
-msgid "Auto Connect Configuration"
-msgstr "Ffurfweddiad Hunan-gysylltu"
+#: dccManagerbase.ui:86
+#, no-c-format
+msgid "Progress"
+msgstr "Cynnydd"
 
-#: KSPrefs/ksprefs.cpp:44
-msgid "Font Settings"
-msgstr "Gosodiadau Wynebfath"
+#: dccManagerbase.ui:115
+#, no-c-format
+msgid "&New..."
+msgstr "&Newydd..."
 
-#: KSPrefs/ksprefs.cpp:45
-msgid "Shortcut Configuration"
-msgstr "Ffurfweddiad Byrlwybrau"
+#: dccManagerbase.ui:123
+#, no-c-format
+msgid "&Connect"
+msgstr "&Cysylltu"
 
-#: KSPrefs/page_autoconnect.cpp:275
-msgid "&Update/Add"
-msgstr "&Diweddaru/Ychwanegu"
+#: dccManagerbase.ui:131
+#, no-c-format
+msgid "R&esume"
+msgstr "Ail&gychwyn"
 
-#: KSProgress/ksprogressdata.cpp:56
-msgid "Transfer Status"
-msgstr "Cyflwr Trosglwyddo"
+#: dccManagerbase.ui:139
+#, no-c-format
+msgid "&Rename"
+msgstr "Ail&enwi"
 
-#: KSTicker/ksticker.cpp:58
-msgid "Font..."
-msgstr "Wynebfath..."
+#: dccManagerbase.ui:147
+#, no-c-format
+msgid "&Disconnect"
+msgstr "&Datgysylltu"
 
-#: KSTicker/ksticker.cpp:59
-msgid "Scroll Rate..."
-msgstr "Cyfradd Sgrolio..."
+#: dccNewbase.ui:17
+#, no-c-format
+msgid "New DCC"
+msgstr "DCC Newydd"
 
-#: KSTicker/ksticker.cpp:60
-msgid "Scroll Constantly"
-msgstr "Sgrolio o Hyd"
+#: dccNewbase.ui:34
+#, no-c-format
+msgid "DCC Type"
+msgstr "Math DCC"
 
-#: KSTicker/ksticker.cpp:63
-msgid "Return to Normal Mode"
-msgstr "Dychwelyd i'r Modd Arferol"
+#: dccNewbase.ui:45
+#, no-c-format
+msgid "&File send"
+msgstr "Anfon &ffeil"
 
-#: KSTicker/ksttest.cpp:69
-msgid "(c) 1997-2002, Andrew Stanley-Jones"
-msgstr "(h) 1997-2002, Andrew Stanley-Jones"
+#: dccNewbase.ui:53
+#, no-c-format
+msgid "C&hat"
+msgstr "S&gwrsio"
 
-#: KSTicker/speeddialog.cpp:23
-msgid "Speed Setup"
-msgstr "Ffurfweddu Cyflymder"
+#: dccNewbase.ui:80
+#, no-c-format
+msgid "Nick"
+msgstr "Ffugenw"
 
-#: KSTicker/speeddialogData.cpp:68
-msgid "Tick interval:"
-msgstr "Cyfnod Tic:"
+#: dccNewbase.ui:134
+#, no-c-format
+msgid "&..."
+msgstr "&..."
 
-#: KSTicker/speeddialogData.cpp:76
-msgid "Step size:"
-msgstr "Maint y cam:"
+#: dccNewbase.ui:155
+#, no-c-format
+msgid "&Send"
+msgstr "&Anfon"
 
 #~ msgid "&Chat"
 #~ msgstr "&Sgwrsio"
 
-#~ msgid "C&ancel"
-#~ msgstr "&Diddymu"
-
 #~ msgid "Copy Link Location"
 #~ msgstr "Copïo Lleoliad y Cyswllt"