Update translation files

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

(cherry picked from commit a3226060fff9cad9a8fa88ccaddafe540a54c7c7)

1 files changed, 227 insertions, 188 deletions

diff --git a/tde-i18n-cy/messages/tdepim/knode.po b/tde-i18n-cy/messages/tdepim/knode.po
index 325b406ab84..673ce265aa5 100644
--- a/tde-i18n-cy/messages/tdepim/knode.po
+++ b/tde-i18n-cy/messages/tdepim/knode.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knode\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-14 01:31+0100\n"
 "PO-Revision-Date: 2004-02-26 17:15+0000\n"
 "Last-Translator: KD at KGyfieithu <[email protected]>\n"
 "Language-Team: Cymraeg <[email protected]>\n"
@@ -19,13 +19,13 @@ msgstr ""
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Peter Bradley, Sue Massey drwy KGyfieithu"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -186,22 +186,20 @@ msgstr "Set nodau anhysbys!   Defnyddir y set rhagosod yn lle."
 #: articlewidget.cpp:465
 #, fuzzy
 msgid ""
-"<br/><b>This article has the MIME type &quot;message/partial&quot;, which KNode "
-"cannot handle yet."
-"<br>Meanwhile you can save the article as a text file and reassemble it by "
-"hand.</b>"
+"<br/><b>This article has the MIME type &quot;message/partial&quot;, which "
+"KNode cannot handle yet.<br>Meanwhile you can save the article as a text "
+"file and reassemble it by hand.</b>"
 msgstr ""
-"<br><bodyblock><b>Mae math MIME &quot;neges/rhannol&quot; gan yr erthygl hon, "
-"na all KNode ymdrin ac ef eto."
-"<br>Yn y cyfamser, gallwch gadw'r erthygl fel ffeil testun a'u hail-gydosod â "
-"llaw.</b></bodyblock></qt>"
+"<br><bodyblock><b>Mae math MIME &quot;neges/rhannol&quot; gan yr erthygl "
+"hon, na all KNode ymdrin ac ef eto.<br>Yn y cyfamser, gallwch gadw'r erthygl "
+"fel ffeil testun a'u hail-gydosod â llaw.</b></bodyblock></qt>"
 
 #: articlewidget.cpp:482
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"knode:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"knode:showHTML"
+"\">by clicking here</a>."
 msgstr ""
 
 #: articlewidget.cpp:528
@@ -266,8 +264,7 @@ msgstr "di-enw"
 
 #: articlewidget.cpp:1032
 #, fuzzy
-msgid ""
-"An error occurred while downloading the article source:\n"
+msgid "An error occurred while downloading the article source:\n"
 msgstr "Bu gwallau wrth ddanfon yr erthyglau hyn:"
 
 #: articlewidget.cpp:1389 kncomposer.cpp:1218
@@ -322,13 +319,20 @@ msgstr "Methu creu plygell i'r cyfrif hwn!"
 msgid ""
 "This account cannot be deleted since there are some unsent messages for it."
 msgstr ""
-"Nid yw'r cyfrif hwn yn medru cael ei dileu oherwydd mae negeseuon heb eu hanfon "
-"amdano fo. "
+"Nid yw'r cyfrif hwn yn medru cael ei dileu oherwydd mae negeseuon heb eu "
+"hanfon amdano fo. "
 
 #: knaccountmanager.cpp:158
 msgid "Do you really want to delete this account?"
 msgstr "Ydych yn siwr eich bod chi eisiau dileu'r cyfrif yma?"
 
+#: knaccountmanager.cpp:158 knarticlemanager.cpp:583 knconfigwidgets.cpp:312
+#: knconfigwidgets.cpp:1323 knconfigwidgets.cpp:1427 knconfigwidgets.cpp:1677
+#: knfiltermanager.cpp:265 knmainwidget.cpp:1591 knmainwidget.cpp:1642
+#, fuzzy
+msgid "&Delete"
+msgstr "Dil&eu"
+
 #: knaccountmanager.cpp:162
 msgid ""
 "At least one group of this account is currently in use.\n"
@@ -376,8 +380,8 @@ msgstr ""
 msgid ""
 "This article contains attachments. Do you want them to be forwarded as well?"
 msgstr ""
-"Mae'r erthygl hon yn cynnwys atodiadau. Ydych chi eisiau iddynt gael eu anfon "
-"ymlaen hefyd?"
+"Mae'r erthygl hon yn cynnwys atodiadau. Ydych chi eisiau iddynt gael eu "
+"anfon ymlaen hefyd?"
 
 #: knarticlefactory.cpp:282
 msgid "Forward"
@@ -449,9 +453,8 @@ msgstr "Nid yw'n bosibl i olygu yr erthygl hon."
 
 #: knarticlefactory.cpp:602 knarticlefactory.cpp:896
 msgid ""
-"<qt>The signature generator program produced the following output:"
-"<br>"
-"<br>%1</qt>"
+"<qt>The signature generator program produced the following output:<br><br>"
+"%1</qt>"
 msgstr ""
 
 #: knarticlefactory.cpp:628
@@ -470,11 +473,11 @@ msgstr "Methu llwytho cyfeiriadur y blwch anfon!"
 
 #: knarticlefactory.cpp:733
 msgid ""
-"You have aborted the posting of articles. The unsent articles are stored in the "
-"\"Outbox\" folder."
+"You have aborted the posting of articles. The unsent articles are stored in "
+"the \"Outbox\" folder."
 msgstr ""
-"Yr ydych wedi erthylu hysbysu erthyglau.  Mae'r erthyglau sydd heb eu anfon yn "
-"cael eu cadw yn y blygell \"Blwch Anfon\"."
+"Yr ydych wedi erthylu hysbysu erthyglau.  Mae'r erthyglau sydd heb eu anfon "
+"yn cael eu cadw yn y blygell \"Blwch Anfon\"."
 
 #: knarticlefactory.cpp:782
 #, fuzzy
@@ -493,8 +496,8 @@ msgstr ""
 
 #: knarticlefactory.cpp:828
 msgid ""
-"Please enter a valid email address at the identity section of the configuration "
-"dialog."
+"Please enter a valid email address at the identity section of the "
+"configuration dialog."
 msgstr ""
 
 #: knarticlefactory.cpp:916
@@ -738,6 +741,11 @@ msgstr "Atodi &Ffeil..."
 msgid "Sign Article with &PGP"
 msgstr "Llofnodi'r Erthygl gyda &PGP"
 
+#: kncomposer.cpp:260 kncomposer.cpp:1928
+#, fuzzy
+msgid "&Remove"
+msgstr "Dileu Bl&wch"
+
 #: kncomposer.cpp:263 kncomposer.cpp:1933
 msgid "&Properties"
 msgstr "&Priodweddau"
@@ -977,7 +985,8 @@ msgstr "Atodi Ffeil"
 #: kncomposer.cpp:1167
 #, fuzzy
 msgid ""
-"The poster does not want a mail copy of your reply (Mail-Copies-To: nobody);\n"
+"The poster does not want a mail copy of your reply (Mail-Copies-To: "
+"nobody);\n"
 "please respect their request."
 msgstr ""
 "Nid yw'r hysbysydd eisiau copi ebost o'ch ateb (Ebostio-Copiau-I: neb).\n"
@@ -1058,8 +1067,8 @@ msgid ""
 "Please make sure you have ISpell properly configured and in your PATH."
 msgstr ""
 "Methu cychwyn ISpell.\n"
-"  A wnewch yn sicr bod ISpell wedi'i ffurfweddu'n iawn gennych a'i fod yn eich "
-"PATH."
+"  A wnewch yn sicr bod ISpell wedi'i ffurfweddu'n iawn gennych a'i fod yn "
+"eich PATH."
 
 #: kncomposer.cpp:1660 kncomposer.cpp:2436
 msgid "ISpell seems to have crashed."
@@ -1120,6 +1129,10 @@ msgstr "Cwestiwn"
 msgid "No Suggestions"
 msgstr "Cwestiwn"
 
+#: kncomposer.cpp:2497 kncomposer.cpp:2558
+msgid "File"
+msgstr ""
+
 #: kncomposer.cpp:2498
 msgid "Type"
 msgstr "Math"
@@ -1324,9 +1337,8 @@ msgstr "&Enw:"
 
 #: knconfigwidgets.cpp:65
 msgid ""
-"<qt>"
-"<p>Your name as it will appear to others reading your articles.</p>"
-"<p>Ex: <b>John Stuart Masterson III</b>.</p></qt>"
+"<qt><p>Your name as it will appear to others reading your articles.</"
+"p><p>Ex: <b>John Stuart Masterson III</b>.</p></qt>"
 msgstr ""
 
 #: knconfigwidgets.cpp:72
@@ -1335,9 +1347,8 @@ msgstr "Sefy&dliad:"
 
 #: knconfigwidgets.cpp:75
 msgid ""
-"<qt>"
-"<p>The name of the organization you work for.</p>"
-"<p>Ex: <b>KNode, Inc</b>.</p></qt>"
+"<qt><p>The name of the organization you work for.</p><p>Ex: <b>KNode, Inc</"
+"b>.</p></qt>"
 msgstr ""
 
 #: knconfigwidgets.cpp:82
@@ -1346,9 +1357,8 @@ msgstr "Cyfeiriad E&bost:"
 
 #: knconfigwidgets.cpp:85
 msgid ""
-"<qt>"
-"<p>Your email address as it will appear to others reading your articles</p>"
-"<p>Ex: <b>[email protected]</b>.</qt>"
+"<qt><p>Your email address as it will appear to others reading your articles</"
+"p><p>Ex: <b>[email protected]</b>.</qt>"
 msgstr ""
 
 #: knconfigwidgets.cpp:92
@@ -1357,11 +1367,9 @@ msgstr "Cyfei&riad Ateb-I:"
 
 #: knconfigwidgets.cpp:95
 msgid ""
-"<qt>"
-"<p>When someone reply to your article by email, this is the address the message "
-"will be sent. If you fill in this field, please do it with a real email "
-"address.</p>"
-"<p>Ex: <b>[email protected]</b>.</p></qt>"
+"<qt><p>When someone reply to your article by email, this is the address the "
+"message will be sent. If you fill in this field, please do it with a real "
+"email address.</p><p>Ex: <b>[email protected]</b>.</p></qt>"
 msgstr ""
 
 #: knconfigwidgets.cpp:103
@@ -1379,7 +1387,8 @@ msgstr "Eich allwedd OpenPGP"
 #: knconfigwidgets.cpp:111
 msgid "Select the OpenPGP key which should be used for signing articles."
 msgstr ""
-"Dewiswch pa allwedd OpenPGP a ddylir ei defnyddio ar gyfer llofnodi erthyglau."
+"Dewiswch pa allwedd OpenPGP a ddylir ei defnyddio ar gyfer llofnodi "
+"erthyglau."
 
 #: knconfigwidgets.cpp:113
 msgid "Signing ke&y:"
@@ -1387,12 +1396,11 @@ msgstr "Allwedd &Lofnodi:"
 
 #: knconfigwidgets.cpp:116
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to sign your articles.</p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to sign your articles.</"
+"p></qt>"
 msgstr ""
-"<qt>"
-"<p>Defnyddir yr allwedd OpenPGP a ddewisir yma i lofnodi eich erthyglau.</p>"
-"</qt>"
+"<qt><p>Defnyddir yr allwedd OpenPGP a ddewisir yma i lofnodi eich erthyglau."
+"</p></qt>"
 
 #: knconfigwidgets.cpp:128
 msgid "&Use a signature from file"
@@ -1408,9 +1416,8 @@ msgstr "&Ffeil llofnodion:"
 
 #: knconfigwidgets.cpp:140
 msgid ""
-"<qt>"
-"<p>The file from which the signature will be read.</p>"
-"<p>Ex: <b>/home/robt/.sig</b>.</p></qt>"
+"<qt><p>The file from which the signature will be read.</p><p>Ex: <b>/home/"
+"robt/.sig</b>.</p></qt>"
 msgstr ""
 
 #: knconfigwidgets.cpp:145 knconfigwidgets.cpp:2235
@@ -1427,9 +1434,8 @@ msgstr "&Rhaglen ydy'r ffeil"
 
 #: knconfigwidgets.cpp:156
 msgid ""
-"<qt>"
-"<p>Mark this option if the signature will be generated by a program</p>"
-"<p>Ex: <b>/home/robt/gensig.sh</b>.</p></qt>"
+"<qt><p>Mark this option if the signature will be generated by a program</"
+"p><p>Ex: <b>/home/robt/gensig.sh</b>.</p></qt>"
 msgstr ""
 
 #: knconfigwidgets.cpp:161
@@ -1497,14 +1503,12 @@ msgstr "Cyfrif Newydd"
 msgid "Ser&ver"
 msgstr "Gw&einydd"
 
-#. i18n: file smtpaccountwidget_base.ui line 32
-#: knconfigwidgets.cpp:478 rc.cpp:75
+#: knconfigwidgets.cpp:478 smtpaccountwidget_base.ui:32
 #, no-c-format
 msgid "&Server:"
 msgstr "Gwei&nydd:"
 
-#. i18n: file smtpaccountwidget_base.ui line 43
-#: knconfigwidgets.cpp:484 rc.cpp:78
+#: knconfigwidgets.cpp:484 smtpaccountwidget_base.ui:43
 #, no-c-format
 msgid "&Port:"
 msgstr "&Porth:"
@@ -1525,20 +1529,17 @@ msgstr "&Goramser:"
 msgid "&Fetch group descriptions"
 msgstr "&Nôl disgrifiadau grwpiau"
 
-#. i18n: file smtpaccountwidget_base.ui line 76
-#: knconfigwidgets.cpp:512 rc.cpp:87
+#: knconfigwidgets.cpp:512 smtpaccountwidget_base.ui:76
 #, no-c-format
 msgid "Server requires &authentication"
 msgstr "Mae &angen dilysiant ar y gweinydd"
 
-#. i18n: file smtpaccountwidget_base.ui line 54
-#: knconfigwidgets.cpp:517 rc.cpp:81
+#: knconfigwidgets.cpp:517 smtpaccountwidget_base.ui:54
 #, no-c-format
 msgid "&User:"
 msgstr "De&fnyddiwr:"
 
-#. i18n: file smtpaccountwidget_base.ui line 65
-#: knconfigwidgets.cpp:523 rc.cpp:84
+#: knconfigwidgets.cpp:523 smtpaccountwidget_base.ui:65
 #, no-c-format
 msgid "Pass&word:"
 msgstr "C&yfrinair:"
@@ -1679,6 +1680,10 @@ msgstr "Cau'r trywydd cyf&redol"
 msgid "Go to the next &unread thread"
 msgstr "Mynd i'r trywydd nesaf heb ei dda&rllen"
 
+#: knconfigwidgets.cpp:1213
+msgid "Appearance"
+msgstr ""
+
 #: knconfigwidgets.cpp:1214
 msgid "Attachments"
 msgstr "Atodiadau"
@@ -1855,8 +1860,8 @@ msgstr "Di&leu"
 #: knconfigwidgets.cpp:1999
 #, fuzzy
 msgid ""
-"<qt>Placeholders for replies: <b>%NAME</b>=sender's name, <b>%EMAIL</b>"
-"=sender's address</qt>"
+"<qt>Placeholders for replies: <b>%NAME</b>=sender's name, <b>%EMAIL</"
+"b>=sender's address</qt>"
 msgstr ""
 "Cefnogir y nodau lle canlynol:\n"
 " %MYNAME=eich enw'ch hun, %MYEMAIL=eich cyfeiriad ebost eich hun"
@@ -1989,17 +1994,17 @@ msgstr "Dechrau Trosi..."
 #: knconvert.cpp:72
 #, fuzzy
 msgid ""
-"<b>Congratulations, you have upgraded to KNode version %1.</b>"
-"<br>Unfortunately this version uses a different format for some data-files, so "
-"in order to keep your existing data it is necessary to convert it first. This "
-"is now done automatically by KNode. If you want to, a backup of your existing "
-"data will be created before the conversion starts."
+"<b>Congratulations, you have upgraded to KNode version %1.</"
+"b><br>Unfortunately this version uses a different format for some data-"
+"files, so in order to keep your existing data it is necessary to convert it "
+"first. This is now done automatically by KNode. If you want to, a backup of "
+"your existing data will be created before the conversion starts."
 msgstr ""
-"<b>Llongyfarchiadau, 'dych chi wedi diweddaru i fersiwn %1 KNode!</b> "
-"<br>Yn anffodus defnyddia'r fersiwn hwn fformat gwahanol ar gyfer rhai ffeiliau "
-"data, felly er mwyn cadw'ch data presennol rhaid eu trosi'n gyntaf.  Gwneir hyn "
-"yn ymysgogol yn awr gan KNode.  Os ydych eisiau, creir ffeil wrth gefn o'ch "
-"data cyfredol cyn cychwyn y trosi."
+"<b>Llongyfarchiadau, 'dych chi wedi diweddaru i fersiwn %1 KNode!</b> <br>Yn "
+"anffodus defnyddia'r fersiwn hwn fformat gwahanol ar gyfer rhai ffeiliau "
+"data, felly er mwyn cadw'ch data presennol rhaid eu trosi'n gyntaf.  Gwneir "
+"hyn yn ymysgogol yn awr gan KNode.  Os ydych eisiau, creir ffeil wrth gefn "
+"o'ch data cyfredol cyn cychwyn y trosi."
 
 #: knconvert.cpp:79
 msgid "Create backup of old data"
@@ -2009,6 +2014,11 @@ msgstr "Creu ffeil wrth gefn o'r hen ddata"
 msgid "Save backup in:"
 msgstr "Cadw'r ffeil wrth gefn yn:"
 
+#: knconvert.cpp:89
+#, fuzzy
+msgid "Browse..."
+msgstr "&Pori..."
+
 #: knconvert.cpp:98
 msgid "<b>Converting, please wait...</b>"
 msgstr "<b>Trosi, arhoswch...</b>"
@@ -2019,19 +2029,19 @@ msgstr "Tasgiau wedi'u prosesu:"
 
 #: knconvert.cpp:135
 msgid ""
-"<b>Some errors occurred during the conversion.</b>"
-"<br>You should now examine the log to find out what went wrong."
+"<b>Some errors occurred during the conversion.</b><br>You should now examine "
+"the log to find out what went wrong."
 msgstr ""
-"<b>Bu gwallau yn ystod y trosi.</b> "
-"<br>Dylech edrych yn syth ar y cofnod i ganfod beth aeth o'i le."
+"<b>Bu gwallau yn ystod y trosi.</b> <br>Dylech edrych yn syth ar y cofnod i "
+"ganfod beth aeth o'i le."
 
 #: knconvert.cpp:139
 msgid ""
-"<b>The conversion was successful.</b>"
-"<br>Have a lot of fun with this new version of KNode. ;-)"
+"<b>The conversion was successful.</b><br>Have a lot of fun with this new "
+"version of KNode. ;-)"
 msgstr ""
-"<b>Bu'r trosi'n llwyddiannus.</b> "
-"<br>Boed hwyl ar eich defnydd o'r fersiwn newydd yma o KNode. ;-)"
+"<b>Bu'r trosi'n llwyddiannus.</b> <br>Boed hwyl ar eich defnydd o'r fersiwn "
+"newydd yma o KNode. ;-)"
 
 #: knconvert.cpp:142
 msgid "Start KNode"
@@ -2045,7 +2055,8 @@ msgstr "Dewiswch lwybr dilys ar gyfer copiau wrth gefn."
 #, fuzzy
 msgid "<b>The backup failed</b>; do you want to continue anyway?"
 msgstr ""
-"<b>Methwyd cadw fersiwn wrth gefn!</b>.  Hoffech chi gario ymlaen beth bynnag?"
+"<b>Methwyd cadw fersiwn wrth gefn!</b>.  Hoffech chi gario ymlaen beth "
+"bynnag?"
 
 #: knconvert.cpp:227
 #, c-format
@@ -2659,8 +2670,8 @@ msgstr ""
 
 #: knmainwidget.cpp:166
 msgid ""
-"<b>Reset Quick Search</b>"
-"<br>Resets the quick search so that all messages are shown again."
+"<b>Reset Quick Search</b><br>Resets the quick search so that all messages "
+"are shown again."
 msgstr ""
 
 #: knmainwidget.cpp:170
@@ -3241,16 +3252,13 @@ msgstr ""
 #: knnntpclient.cpp:483
 #, fuzzy
 msgid ""
-"<br>"
-"<br>The article you requested is not available on your news server."
-"<br>You could try to get it from <a "
-"href=\"http://groups.google.com/groups?selm=%1\">groups.google.com</a>."
+"<br><br>The article you requested is not available on your news server."
+"<br>You could try to get it from <a href=\"http://groups.google.com/groups?"
+"selm=%1\">groups.google.com</a>."
 msgstr ""
-"<br>"
-"<br>Nid yw'r erthygl yr ydych ei eisiau ddim ar gael ar eich gweinydd "
-"newyddion."
-"<br>Cewch geisio ei nôl gan <a href=\"http://groups.google.com/groups? "
-"q=msgid:%1&ic=1\">groups.google.com</a>. "
+"<br><br>Nid yw'r erthygl yr ydych ei eisiau ddim ar gael ar eich gweinydd "
+"newyddion.<br>Cewch geisio ei nôl gan <a href=\"http://groups.google.com/"
+"groups? q=msgid:%1&ic=1\">groups.google.com</a>. "
 
 #: knnntpclient.cpp:575
 msgid ""
@@ -3291,6 +3299,11 @@ msgstr ""
 "Digwyddodd gwall:\n"
 " %1"
 
+#: knode_options.h:25
+#, fuzzy
+msgid "A 'news://server/group' URL"
+msgstr "URL 'news://gweinydd/grŵp'"
+
 #: knprotocolclient.cpp:192 knprotocolclient.cpp:202
 #, fuzzy
 msgid "Unable to resolve hostname"
@@ -3322,10 +3335,8 @@ msgid "The connection is broken."
 msgstr "Mae'r cysylltiad wedi torri."
 
 #: knprotocolclient.cpp:472 knprotocolclient.cpp:534 knprotocolclient.cpp:594
-msgid ""
-"Communication error:\n"
-msgstr ""
-"Gwall cyfathrebu:\n"
+msgid "Communication error:\n"
+msgstr "Gwall cyfathrebu:\n"
 
 #: knprotocolclient.cpp:504 knprotocolclient.cpp:566
 msgid "Communication error"
@@ -3352,8 +3363,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KNode can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for server '%1' in the configuration file?"
 msgstr ""
 
@@ -3411,134 +3423,144 @@ msgstr "HEB Gynnwys"
 msgid "Regular expression"
 msgstr "Mynegiad rheolaidd"
 
-#. i18n: file kncomposerui.rc line 27
-#: rc.cpp:9
+#: utilities.cpp:170
+#, fuzzy
+msgid ""
+"<qt>A file named <b>%1</b> already exists.<br>Do you want to replace it?</qt>"
+msgstr ""
+"Mae ffeil o'r enw %1 eisoes mewn bod.\n"
+" Hoffech ei ddisodli?"
+
+#: utilities.cpp:171
+msgid "&Replace"
+msgstr "D&isodli"
+
+#: utilities.cpp:459
+#, fuzzy
+msgid ""
+"Unable to load/save configuration.\n"
+"Wrong permissions on home folder?\n"
+"You should close KNode now to avoid data loss."
+msgstr ""
+"Methu llwytho/cadw y ffurfweddiad!\n"
+" Breintiau anghywir ar y cyfeiriadur cartref?\n"
+" Dylech gau KNode yn awr i osgoi colli data!"
+
+#: utilities.cpp:465
+#, fuzzy
+msgid "Unable to load/save file."
+msgstr "Methu llwytho/cadw'r ffeil!"
+
+#: utilities.cpp:471
+#, fuzzy
+msgid "Unable to save remote file."
+msgstr "Methu cadw'r ffeil pell!"
+
+#: utilities.cpp:477
+#, fuzzy
+msgid "Unable to create temporary file."
+msgstr "Methu creu'r ffeil dros dro!"
+
+#: kncomposerui.rc:5 knodeui.rc:5 knreaderui.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Hidlenni"
+
+#: kncomposerui.rc:13 knodeui.rc:15 knreaderui.rc:11
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Golygu Ffeil"
+
+#: kncomposerui.rc:27
 #, no-c-format
 msgid "&Attach"
 msgstr "&Atodi"
 
-#. i18n: file kncomposerui.rc line 33
-#: rc.cpp:12
+#: kncomposerui.rc:33
 #, no-c-format
 msgid "Optio&ns"
 msgstr "De&wisiadau"
 
-#. i18n: file kncomposerui.rc line 97
-#: rc.cpp:21
+#: kncomposerui.rc:40
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kncomposerui.rc:55 knodeui.rc:131 knreaderui.rc:38
+#, no-c-format
+msgid "Main Toolbar"
+msgstr ""
+
+#: kncomposerui.rc:97
 #, fuzzy, no-c-format
 msgid "Spell Result"
 msgstr "Canlyniad Sillafu"
 
-#. i18n: file knodeui.rc line 45
-#: rc.cpp:33
+#: knodeui.rc:24 knreaderui.rc:16
+#, fuzzy, no-c-format
+msgid "&View"
+msgstr "Gwelydd"
+
+#: knodeui.rc:45
 #, no-c-format
 msgid "&Go"
 msgstr "&Mynd"
 
-#. i18n: file knodeui.rc line 55
-#: rc.cpp:36
+#: knodeui.rc:55
 #, no-c-format
 msgid "A&ccount"
 msgstr "&Cyfrif"
 
-#. i18n: file knodeui.rc line 64
-#: rc.cpp:39
+#: knodeui.rc:64
 #, no-c-format
 msgid "G&roup"
 msgstr "G&rŵp"
 
-#. i18n: file knodeui.rc line 77
-#: rc.cpp:42
+#: knodeui.rc:77
 #, no-c-format
 msgid "Fol&der"
 msgstr "Ply&gell"
 
-#. i18n: file knodeui.rc line 91
-#: rc.cpp:45 rc.cpp:66
+#: knodeui.rc:91 knreaderui.rc:28
 #, no-c-format
 msgid "&Article"
 msgstr "&Erthygl"
 
-#. i18n: file knodeui.rc line 111
-#: rc.cpp:48
+#: knodeui.rc:111
 #, no-c-format
 msgid "Sc&oring"
 msgstr "Sg&orio"
 
-#. i18n: file smtpaccountwidget_base.ui line 24
-#: rc.cpp:72
+#: knodeui.rc:121
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Gosodiadau"
+
+#: smtpaccountwidget_base.ui:24
 #, fuzzy, no-c-format
 msgid "&Use external mailer"
 msgstr "Defnyddio r&haglen ebost allanol"
 
-#. i18n: file smtpaccountwidget_base.ui line 133
-#: rc.cpp:90
+#: smtpaccountwidget_base.ui:133
 #, no-c-format
 msgid "Encryption"
 msgstr "Cêl-ysgrifaeth"
 
-#. i18n: file smtpaccountwidget_base.ui line 144
-#: rc.cpp:93
+#: smtpaccountwidget_base.ui:144
 #, no-c-format
 msgid "None"
 msgstr "Dim"
 
-#. i18n: file smtpaccountwidget_base.ui line 155
-#: rc.cpp:96
+#: smtpaccountwidget_base.ui:155
 #, no-c-format
 msgid "SSL"
 msgstr "SSL"
 
-#. i18n: file smtpaccountwidget_base.ui line 166
-#: rc.cpp:99
+#: smtpaccountwidget_base.ui:166
 #, no-c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: utilities.cpp:170
-#, fuzzy
-msgid ""
-"<qt>A file named <b>%1</b> already exists."
-"<br>Do you want to replace it?</qt>"
-msgstr ""
-"Mae ffeil o'r enw %1 eisoes mewn bod.\n"
-" Hoffech ei ddisodli?"
-
-#: utilities.cpp:171
-msgid "&Replace"
-msgstr "D&isodli"
-
-#: utilities.cpp:459
-#, fuzzy
-msgid ""
-"Unable to load/save configuration.\n"
-"Wrong permissions on home folder?\n"
-"You should close KNode now to avoid data loss."
-msgstr ""
-"Methu llwytho/cadw y ffurfweddiad!\n"
-" Breintiau anghywir ar y cyfeiriadur cartref?\n"
-" Dylech gau KNode yn awr i osgoi colli data!"
-
-#: utilities.cpp:465
-#, fuzzy
-msgid "Unable to load/save file."
-msgstr "Methu llwytho/cadw'r ffeil!"
-
-#: utilities.cpp:471
-#, fuzzy
-msgid "Unable to save remote file."
-msgstr "Methu cadw'r ffeil pell!"
-
-#: utilities.cpp:477
-#, fuzzy
-msgid "Unable to create temporary file."
-msgstr "Methu creu'r ffeil dros dro!"
-
-#: knode_options.h:25
-#, fuzzy
-msgid "A 'news://server/group' URL"
-msgstr "URL 'news://gweinydd/grŵp'"
-
 #, fuzzy
 #~ msgid "KNode NNTP"
 #~ msgstr "KNode"
@@ -3549,7 +3571,8 @@ msgstr "URL 'news://gweinydd/grŵp'"
 
 #, fuzzy
 #~ msgid "<b><font size=+1 color=red>An error occurred.</font></b><hr><br>"
-#~ msgstr "<b><font size=+1 color=red>Mae gwall wedi digwydd!</font></b><hr><br>"
+#~ msgstr ""
+#~ "<b><font size=+1 color=red>Mae gwall wedi digwydd!</font></b><hr><br>"
 
 #~ msgid " Subject"
 #~ msgstr "Pwnc"
@@ -3603,8 +3626,12 @@ msgstr "URL 'news://gweinydd/grŵp'"
 #~ msgstr "Gwall mewnol: Clustnod camffurfiedig!"
 
 #, fuzzy
-#~ msgid "<bodyblock><b><font size=+1 color=red>An error occurred.</font></b><hr><br>"
-#~ msgstr "<bodyblock><b><font size=+1 color=red>Mae gwall wedi digwydd!</font></b><hr><br>"
+#~ msgid ""
+#~ "<bodyblock><b><font size=+1 color=red>An error occurred.</font></"
+#~ "b><hr><br>"
+#~ msgstr ""
+#~ "<bodyblock><b><font size=+1 color=red>Mae gwall wedi digwydd!</font></"
+#~ "b><hr><br>"
 
 #~ msgid "%1%2:%3"
 #~ msgstr "%1 %2:%3"
@@ -3619,8 +3646,12 @@ msgstr "URL 'news://gweinydd/grŵp'"
 #~ msgid "mime-type"
 #~ msgstr "math-mime"
 
-#~ msgid "<qt>Do you want treat the selected text as an <b>email address</b> or a <b>message-id</b>?</qt>"
-#~ msgstr "<qt>Ydych eisiau trin y testun wedi'i ddewis fel <b>cyfeiriad ebost</b> neu fel <b>clustnod neges</b>?</qt>"
+#~ msgid ""
+#~ "<qt>Do you want treat the selected text as an <b>email address</b> or a "
+#~ "<b>message-id</b>?</qt>"
+#~ msgstr ""
+#~ "<qt>Ydych eisiau trin y testun wedi'i ddewis fel <b>cyfeiriad ebost</b> "
+#~ "neu fel <b>clustnod neges</b>?</qt>"
 
 #~ msgid "Address or ID"
 #~ msgstr "Cyfeiriad neu glustnod"
@@ -3667,12 +3698,20 @@ msgstr "URL 'news://gweinydd/grŵp'"
 #~ msgid "Ch&eck signatures automatically"
 #~ msgstr "Gwir&eddu llofnodion yn ymysgogol"
 
-#~ msgid "The wallet could not be opened. This error is most probably caused by providing a wrong password."
-#~ msgstr "Ni ellid agor y waled.  Mwy na thebyg, achosir y gwall yma gan ddarparu cyfrinair anghywir."
+#~ msgid ""
+#~ "The wallet could not be opened. This error is most probably caused by "
+#~ "providing a wrong password."
+#~ msgstr ""
+#~ "Ni ellid agor y waled.  Mwy na thebyg, achosir y gwall yma gan ddarparu "
+#~ "cyfrinair anghywir."
 
 #, fuzzy
-#~ msgid "TDEWallet is not running. It is strongly recommended to use TDEWallet for managing your passwords."
-#~ msgstr "Nid yw KWaled yn rhedeg.  Argymhellir yn gryf defnyddio KWaled i reoli eich cyfrinair"
+#~ msgid ""
+#~ "TDEWallet is not running. It is strongly recommended to use TDEWallet for "
+#~ "managing your passwords."
+#~ msgstr ""
+#~ "Nid yw KWaled yn rhedeg.  Argymhellir yn gryf defnyddio KWaled i reoli "
+#~ "eich cyfrinair"
 
 #~ msgid "Active Item Background"
 #~ msgstr "Cefndir Eitem Cyfredol"