Merge translation files from master branch.

2 files changed, 62 insertions, 62 deletions

diff --git a/tde-i18n-cy/messages/tdebase/tdeio_smtp.po b/tde-i18n-cy/messages/tdebase/tdeio_smtp.po
index 802347b18c1..9789241d878 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_smtp.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_smtp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_smtp\n"
-"POT-Creation-Date: 2020-12-09 19:15+0100\n"
+"POT-Creation-Date: 2024-01-23 18:17+0000\n"
 "PO-Revision-Date: 2003-07-22 15:21+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -136,19 +136,19 @@ msgstr "Ymatebodd y gweinydd: \"%1\""
 msgid "This is a temporary failure. You may try again later."
 msgstr "Mae hyn yn fethiant dros dro. Gallwch geisio eto nes ymlaen."
 
-#: smtp.cpp:175
+#: smtp.cpp:174
 msgid "The application sent an invalid request."
 msgstr "Anfonodd y cymhwysiad gais annilys."
 
-#: smtp.cpp:237
+#: smtp.cpp:236
 msgid "The sender address is missing."
 msgstr "Mae cyfeiriad yr anfonwr ar goll."
 
-#: smtp.cpp:245
+#: smtp.cpp:244
 msgid "SMTPProtocol::smtp_open failed (%1)"
 msgstr "Methodd SMTPProtocol::smtp_open (%1)"
 
-#: smtp.cpp:253
+#: smtp.cpp:252
 msgid ""
 "Your server does not support sending of 8-bit messages.\n"
 "Please use base64 or quoted-printable encoding."
@@ -156,11 +156,11 @@ msgstr ""
 "Nid yw'ch gweinydd yn cynnal anfon negeseuon 8-did.\n"
 "Defnyddiwch base64 neu amgodiad argraffadwy dyfynnodedig."
 
-#: smtp.cpp:332
+#: smtp.cpp:331
 msgid "Invalid SMTP response (%1) received."
 msgstr "Derbynnwyd ymateb SMTP annilys (%1)."
 
-#: smtp.cpp:519
+#: smtp.cpp:518
 #, c-format
 msgid ""
 "The server did not accept the connection.\n"
@@ -169,7 +169,7 @@ msgstr ""
 "Ni dderbynnod y gwinydd y cysylltiad.\n"
 "%1"
 
-#: smtp.cpp:594
+#: smtp.cpp:593
 #, fuzzy
 msgid "Username and password for your SMTP account:"
 msgstr "Enw defnyddiwr a chyfrinair i'ch cyfrif SMTP:"
diff --git a/tde-i18n-cy/messages/tdenetwork/kopete.po b/tde-i18n-cy/messages/tdenetwork/kopete.po
index e583a9d19aa..bb34de57233 100644
--- a/tde-i18n-cy/messages/tdenetwork/kopete.po
+++ b/tde-i18n-cy/messages/tdenetwork/kopete.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kopete\n"
-"POT-Creation-Date: 2023-08-31 20:14+0000\n"
+"POT-Creation-Date: 2024-01-23 20:21+0000\n"
 "PO-Revision-Date: 2005-10-14 12:01+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -62,14 +62,14 @@ msgid "Step Two: Account Information"
 msgstr ""
 
 #: kopete/addcontactwizard/addcontactwizard.cpp:163
-#: kopete/contactlist/kopetecontactlistview.cpp:599
-#: kopete/contactlist/kopetemetacontactlvi.cpp:645
+#: kopete/contactlist/kopetecontactlistview.cpp:603
+#: kopete/contactlist/kopetemetacontactlvi.cpp:647
 msgid "New Group"
 msgstr "Grwp Newydd"
 
 #: kopete/addcontactwizard/addcontactwizard.cpp:164
-#: kopete/contactlist/kopetecontactlistview.cpp:600
-#: kopete/contactlist/kopetemetacontactlvi.cpp:645
+#: kopete/contactlist/kopetecontactlistview.cpp:604
+#: kopete/contactlist/kopetemetacontactlvi.cpp:647
 msgid "Please enter the name for the new group:"
 msgstr ""
 
@@ -750,76 +750,76 @@ msgstr ""
 msgid "Set address book fields using the selected data from Kopete"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:291
+#: kopete/contactlist/kopetecontactlistview.cpp:295
 msgid "Online contacts (%1)"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:292
+#: kopete/contactlist/kopetecontactlistview.cpp:296
 msgid "Offline contacts (%1)"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:447
+#: kopete/contactlist/kopetecontactlistview.cpp:451
 msgid "Contacts"
 msgstr "Cysylltau"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:470
+#: kopete/contactlist/kopetecontactlistview.cpp:474
 msgid "Create New Group..."
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:478
+#: kopete/contactlist/kopetecontactlistview.cpp:482
 msgid "&Move To"
 msgstr "&Symud I"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:480
+#: kopete/contactlist/kopetecontactlistview.cpp:484
 msgid "&Copy To"
 msgstr "&Copïo I"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:485
+#: kopete/contactlist/kopetecontactlistview.cpp:489
 #: protocols/msn/msncontact.cpp:144
 msgid "Send Email..."
 msgstr "Anfon Ebost ..."
 
-#: kopete/contactlist/kopetecontactlistview.cpp:488
-#: kopete/contactlist/kopetecontactlistview.cpp:1395
+#: kopete/contactlist/kopetecontactlistview.cpp:492
+#: kopete/contactlist/kopetecontactlistview.cpp:1399
 msgid "Rename"
 msgstr "Ail-enwi"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:493 kopete/kopetewindow.cpp:208
+#: kopete/contactlist/kopetecontactlistview.cpp:497 kopete/kopetewindow.cpp:208
 #: protocols/irc/ui/ircadd.ui:34
 #, no-c-format
 msgid "&Add Contact"
 msgstr "&Ychwanegu Cyswllt"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:495
+#: kopete/contactlist/kopetecontactlistview.cpp:499
 msgid "Select Account"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:497
+#: kopete/contactlist/kopetecontactlistview.cpp:501
 msgid "Add to Your Contact List"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:505
+#: kopete/contactlist/kopetecontactlistview.cpp:509
 #: protocols/groupwise/ui/gwchatsearchwidget.ui:79
 #, no-c-format
 msgid "&Properties"
 msgstr "&Priodweddau"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:690
+#: kopete/contactlist/kopetecontactlistview.cpp:694
 msgid ""
 "_: Translators: format: '<nickname> (<online status>)'\n"
 "%1 (%2)"
 msgstr "%1(%2)"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:715
+#: kopete/contactlist/kopetecontactlistview.cpp:719
 msgid ""
 "_: Translators: format: '<displayName> (<id>)'\n"
 "%2 <%1>"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:760
-#: kopete/contactlist/kopetecontactlistview.cpp:991
-#: kopete/contactlist/kopetecontactlistview.cpp:1007
-#: kopete/contactlist/kopetecontactlistview.cpp:1477 kopete/main.cpp:52
+#: kopete/contactlist/kopetecontactlistview.cpp:764
+#: kopete/contactlist/kopetecontactlistview.cpp:995
+#: kopete/contactlist/kopetecontactlistview.cpp:1011
+#: kopete/contactlist/kopetecontactlistview.cpp:1481 kopete/main.cpp:52
 #: protocols/irc/ui/irceditaccountwidget.cpp:275
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:535
 #: protocols/msn/msncontact.cpp:321
@@ -828,119 +828,119 @@ msgstr ""
 msgid "Kopete"
 msgstr "Kopete"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:989
+#: kopete/contactlist/kopetecontactlistview.cpp:993
 msgid ""
 "<qt>Would you like to add <b>%1</b> to your contact list as a member of <b>"
 "%2</b>?</qt>"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:991
-#: kopete/contactlist/kopetecontactlistview.cpp:1007
-#: kopete/contactlist/kopetecontactlistview.cpp:1477
+#: kopete/contactlist/kopetecontactlistview.cpp:995
+#: kopete/contactlist/kopetecontactlistview.cpp:1011
+#: kopete/contactlist/kopetecontactlistview.cpp:1481
 #: protocols/oscar/aim/aimprotocol.cpp:193
 #: protocols/oscar/icq/icqprotocol.cpp:148
 msgid "Do Not Add"
 msgstr "Na Ychwaneger"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1005
+#: kopete/contactlist/kopetecontactlistview.cpp:1009
 msgid ""
 "<qt>Would you like to add <b>%1</b> to your contact list as a child contact "
 "of <b>%2</b>?</qt>"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1056
+#: kopete/contactlist/kopetecontactlistview.cpp:1060
 msgid ""
 "<qt>This contact is already on your contact list. It is a child contact of "
 "<b>%1</b></qt>"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1374
+#: kopete/contactlist/kopetecontactlistview.cpp:1378
 msgid "Rename Contact"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1375
+#: kopete/contactlist/kopetecontactlistview.cpp:1379
 #: libkopete/kopetecontact.cpp:461
 msgid "Remove Contact"
 msgstr "Gwaredu Cyswllt"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1376
+#: kopete/contactlist/kopetecontactlistview.cpp:1380
 msgid "Send Single Message..."
 msgstr "Anfon Neges Sengl..."
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1379
+#: kopete/contactlist/kopetecontactlistview.cpp:1383
 msgid "&Add Subcontact"
 msgstr "&Ychwanegu Isgyswllt"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1384
+#: kopete/contactlist/kopetecontactlistview.cpp:1388
 msgid "Rename Group"
 msgstr "Ail-enwi'r Grŵp"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1385
+#: kopete/contactlist/kopetecontactlistview.cpp:1389
 msgid "Remove Group"
 msgstr "Gwaredu Grŵp"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1386
+#: kopete/contactlist/kopetecontactlistview.cpp:1390
 msgid "Send Message to Group"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1390
+#: kopete/contactlist/kopetecontactlistview.cpp:1394
 msgid "&Add Contact to Group"
 msgstr "&Ychwanegu Cyswllt i'r Grŵp"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1448
+#: kopete/contactlist/kopetecontactlistview.cpp:1452
 msgid "There is no email address set for this contact in the TDE address book."
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1448
+#: kopete/contactlist/kopetecontactlistview.cpp:1452
 msgid "No Email Address in Address Book"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1451
+#: kopete/contactlist/kopetecontactlistview.cpp:1455
 msgid ""
 "This contact was not found in the TDE address book. Check that a contact is "
 "selected in the properties dialog."
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1451
-#: kopete/contactlist/kopetecontactlistview.cpp:1454
+#: kopete/contactlist/kopetecontactlistview.cpp:1455
+#: kopete/contactlist/kopetecontactlistview.cpp:1458
 #: kopete/kimifaceimpl.cpp:383
 msgid "Not Found in Address Book"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1454
+#: kopete/contactlist/kopetecontactlistview.cpp:1458
 msgid ""
 "This contact is not associated with a TDE address book entry, where the "
 "email address is stored. Check that a contact is selected in the properties "
 "dialog."
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1476
+#: kopete/contactlist/kopetecontactlistview.cpp:1480
 msgid "<qt>Would you like to add this contact to your contact list?</qt>"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1556
+#: kopete/contactlist/kopetecontactlistview.cpp:1560
 msgid ""
 "<qt>Are you sure you want to remove the contact <b>%1</b> from your contact "
 "list?</qt>"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1562
+#: kopete/contactlist/kopetecontactlistview.cpp:1566
 msgid ""
 "<qt>Are you sure you want to remove the group <b>%1</b> and all contacts "
 "that are contained within it?</qt>"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1579
+#: kopete/contactlist/kopetecontactlistview.cpp:1583
 msgid "Are you sure you want to remove these contacts from your contact list?"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1581
+#: kopete/contactlist/kopetecontactlistview.cpp:1585
 msgid ""
 "Are you sure you want to remove these groups and contacts from your contact "
 "list?"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1689
+#: kopete/contactlist/kopetecontactlistview.cpp:1693
 #: kopete/kopetewindow.cpp:1060
 msgid "Add Contact"
 msgstr "Ychwanegu Cyswllt"
@@ -949,7 +949,7 @@ msgstr "Ychwanegu Cyswllt"
 msgid "Top Level"
 msgstr "Lefel Uchaf"
 
-#: kopete/contactlist/kopetegroupviewitem.cpp:169
+#: kopete/contactlist/kopetegroupviewitem.cpp:173
 msgid ""
 "_: (NUMBER OF ONLINE CONTACTS/NUMBER OF CONTACTS IN GROUP)\n"
 "(%1/%2)"
@@ -990,13 +990,13 @@ msgid ""
 "td><td align=\"right\"><nobr>%4</nobr></td></tr>"
 msgstr ""
 
-#: kopete/contactlist/kopetemetacontactlvi.cpp:384
+#: kopete/contactlist/kopetemetacontactlvi.cpp:386
 msgid "<qt><i>%1</i> is now %2.</qt>"
 msgstr ""
 
 #: kopete/config/behavior/behaviorconfig_chat.ui:16
-#: kopete/contactlist/kopetemetacontactlvi.cpp:441
-#: kopete/contactlist/kopetemetacontactlvi.cpp:445
+#: kopete/contactlist/kopetemetacontactlvi.cpp:443
+#: kopete/contactlist/kopetemetacontactlvi.cpp:447
 #, no-c-format
 msgid "Chat"
 msgstr "Sgwrsio"