Merge translation files from master branch.

1 files changed, 1556 insertions, 347 deletions

diff --git a/tde-i18n-cy/messages/tdenetwork/kopete.po b/tde-i18n-cy/messages/tdenetwork/kopete.po
index 230d6afb19e..47950a4b8f9 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: 2019-01-23 23:20+0100\n"
+"POT-Creation-Date: 2019-12-12 02:41+0100\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"
@@ -773,6 +773,7 @@ msgid "&Copy To"
 msgstr "&Copïo I"
 
 #: kopete/contactlist/kopetecontactlistview.cpp:485
+#: protocols/msn/msncontact.cpp:144
 msgid "Send Email..."
 msgstr "Anfon Ebost ..."
 
@@ -819,6 +820,7 @@ msgstr ""
 #: kopete/contactlist/kopetecontactlistview.cpp:1477 kopete/main.cpp:52
 #: protocols/irc/ui/irceditaccountwidget.cpp:275
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:535
+#: protocols/msn/msncontact.cpp:321
 #: protocols/oscar/liboscar/userdetails.cpp:323
 #, no-c-format
 msgid "Kopete"
@@ -833,6 +835,7 @@ msgstr ""
 #: kopete/contactlist/kopetecontactlistview.cpp:991
 #: kopete/contactlist/kopetecontactlistview.cpp:1007
 #: kopete/contactlist/kopetecontactlistview.cpp:1477
+#: protocols/oscar/aim/aimprotocol.cpp:193
 #: protocols/oscar/icq/icqprotocol.cpp:148
 msgid "Do Not Add"
 msgstr "Na Ychwaneger"
@@ -1102,17 +1105,18 @@ msgid "&Export Contacts..."
 msgstr "&Allforio Cyswlltau..."
 
 #: kopete/kopetewindow.cpp:240 protocols/groupwise/gwprotocol.cpp:54
-#: protocols/oscar/icq/icqpresence.cpp:75
+#: protocols/msn/msnprotocol.cpp:55 protocols/oscar/icq/icqpresence.cpp:75
 msgid "&Away"
 msgstr "&I ffwrdd"
 
 #: kopete/kopetewindow.cpp:244 protocols/gadu/ui/gaduawayui.ui:88
-#: protocols/groupwise/gwprotocol.cpp:52
+#: protocols/groupwise/gwprotocol.cpp:52 protocols/msn/msnprotocol.cpp:53
 #, no-c-format
 msgid "&Busy"
 msgstr "&Prysur"
 
 #: kopete/kopetewindow.cpp:249 protocols/gadu/ui/gaduawayui.ui:105
+#: protocols/msn/msnprotocol.cpp:59
 #, no-c-format
 msgid "&Invisible"
 msgstr ""
@@ -1481,7 +1485,8 @@ msgstr ""
 msgid "Error Creating Contact"
 msgstr ""
 
-#: libkopete/kopeteaccount.cpp:368 protocols/jabber/jabbertransport.cpp:126
+#: libkopete/kopeteaccount.cpp:368 protocols/jabber/jabbertransport.cpp:130
+#: protocols/oscar/aim/aimaccount.cpp:309
 msgid "%2 <%1>"
 msgstr ""
 
@@ -1824,6 +1829,8 @@ msgstr ""
 #: protocols/jabber/jabbercontact.cpp:156
 #: protocols/jabber/jabberprotocol.cpp:75
 #: protocols/meanwhile/meanwhileprotocol.cpp:42
+#: protocols/msn/msnprotocol.cpp:52 protocols/oscar/aim/aimaccount.cpp:311
+#: protocols/oscar/aim/aimprotocol.cpp:232
 #: protocols/oscar/icq/icqpresence.cpp:77 protocols/sms/smsprotocol.cpp:37
 #: protocols/winpopup/wpprotocol.cpp:53 protocols/yahoo/yahooprotocol.cpp:43
 msgid "Online"
@@ -1837,6 +1844,8 @@ msgstr "Ar-lein"
 #: protocols/irc/ircprotocol.cpp:143 protocols/jabber/jabbercontact.cpp:160
 #: protocols/jabber/jabberprotocol.cpp:76
 #: protocols/meanwhile/meanwhileprotocol.cpp:46
+#: protocols/oscar/aim/aimaccount.cpp:314
+#: protocols/oscar/aim/aimprotocol.cpp:234
 #: protocols/oscar/icq/icqpresence.cpp:75 protocols/winpopup/wpprotocol.cpp:54
 msgid "Away"
 msgstr "I ffwrdd"
@@ -1849,12 +1858,15 @@ msgstr "I ffwrdd"
 #: protocols/irc/ircprotocol.cpp:118 protocols/irc/ircprotocol.cpp:147
 #: protocols/jabber/jabberprotocol.cpp:79
 #: protocols/meanwhile/meanwhileprotocol.cpp:37
+#: protocols/msn/msnprotocol.cpp:58 protocols/oscar/aim/aimaccount.cpp:319
+#: protocols/oscar/aim/aimprotocol.cpp:233
 #: protocols/oscar/icq/icqpresence.cpp:71 protocols/sms/smsprotocol.cpp:39
 #: protocols/winpopup/wpprotocol.cpp:55 protocols/yahoo/yahooprotocol.cpp:42
 msgid "Offline"
 msgstr "All-lein"
 
 #: libkopete/kopetemetacontact.cpp:510 protocols/irc/ircprotocol.cpp:150
+#: protocols/msn/msnprotocol.cpp:61
 msgid "Status not available"
 msgstr ""
 
@@ -1871,14 +1883,15 @@ msgstr ""
 
 #: libkopete/kopeteonlinestatus.cpp:116 protocols/gadu/gaduprotocol.cpp:75
 #: protocols/groupwise/gwprotocol.cpp:66 protocols/irc/ircprotocol.cpp:145
-#: protocols/jabber/jabberprotocol.cpp:81 protocols/sms/smsprotocol.cpp:38
-#: protocols/yahoo/yahooprotocol.cpp:56
+#: protocols/jabber/jabberprotocol.cpp:81 protocols/msn/msnprotocol.cpp:62
+#: protocols/sms/smsprotocol.cpp:38 protocols/yahoo/yahooprotocol.cpp:56
 msgid "Connecting"
 msgstr "Cysylltu"
 
 #: libkopete/kopeteonlinestatus.cpp:119 protocols/gadu/gaduprotocol.cpp:67
 #: protocols/gadu/gaduprotocol.cpp:69 protocols/jabber/jabbercontact.cpp:166
-#: protocols/jabber/jabberprotocol.cpp:80 protocols/yahoo/yahooprotocol.cpp:53
+#: protocols/jabber/jabberprotocol.cpp:80 protocols/msn/msnprotocol.cpp:59
+#: protocols/yahoo/yahooprotocol.cpp:53
 msgid "Invisible"
 msgstr ""
 
@@ -1938,6 +1951,7 @@ msgstr "<anhysbys>"
 #: protocols/irc/ircusercontact.cpp:150 protocols/jabber/jabbercontact.cpp:1018
 #: protocols/jabber/jabbergroupcontact.cpp:299
 #: protocols/jabber/jabbergroupmembercontact.cpp:153
+#: protocols/msn/msncontact.cpp:593
 msgid "Kopete File Transfer"
 msgstr ""
 
@@ -2068,7 +2082,8 @@ msgstr ""
 msgid "Not Connected"
 msgstr "Heb gysylltu"
 
-#: libkopete/tdeabcpersistence.cpp:367 protocols/oscar/icq/icqprotocol.cpp:119
+#: libkopete/tdeabcpersistence.cpp:367 protocols/oscar/aim/aimprotocol.cpp:164
+#: protocols/oscar/icq/icqprotocol.cpp:119
 msgid "Choose Account"
 msgstr ""
 
@@ -2193,7 +2208,8 @@ msgstr ""
 msgid "&Send Single Message..."
 msgstr "&Anfon Neges Sengl..."
 
-#: libkopete/ui/kopetestdaction.cpp:83
+#: libkopete/ui/kopetestdaction.cpp:83 protocols/msn/ui/msneditaccountui.ui:515
+#, no-c-format
 msgid "User &Info"
 msgstr "Gwybo&daeth am Ddefnyddwyr"
 
@@ -2254,10 +2270,14 @@ msgid "Status:"
 msgstr "Cyflwr:"
 
 #: libkopete/ui/userinfodialog.cpp:221
+#: protocols/oscar/aim/ui/aiminfobase.ui:106
+#, no-c-format
 msgid "Warning level:"
 msgstr "Lefel rybudd :"
 
 #: libkopete/ui/userinfodialog.cpp:225
+#: protocols/oscar/aim/ui/aiminfobase.ui:148
+#, no-c-format
 msgid "Online since:"
 msgstr ""
 
@@ -2276,6 +2296,8 @@ msgid "Phone:"
 msgstr "Ffôn:"
 
 #: libkopete/ui/userinfodialog.cpp:238
+#: protocols/oscar/aim/ui/aiminfobase.ui:174
+#, no-c-format
 msgid "Away message:"
 msgstr ""
 
@@ -2585,12 +2607,12 @@ msgstr "Cadw"
 msgid "History converter"
 msgstr ""
 
-#: plugins/history/converter.cpp:97
+#: plugins/history/converter.cpp:115
 #, c-format
 msgid "Parsing old history in %1"
 msgstr ""
 
-#: plugins/history/converter.cpp:107
+#: plugins/history/converter.cpp:125
 msgid ""
 "Parsing old history in %1:\n"
 "%2"
@@ -2685,6 +2707,42 @@ msgid ""
 "right package."
 msgstr ""
 
+#: plugins/netmeeting/netmeetingguiclient.cpp:41
+msgid "Invite to Use NetMeeting"
+msgstr ""
+
+#: plugins/netmeeting/netmeetinginvitation.cpp:36
+#: plugins/netmeeting/netmeetingplugin.cpp:35
+#, fuzzy
+msgid "NetMeeting"
+msgstr "&Cadw Gosodiadau"
+
+#: plugins/netmeeting/netmeetinginvitation.cpp:67
+msgid "%1 wants to start a chat with NetMeeting; do you want to accept it? "
+msgstr ""
+
+#: plugins/netmeeting/netmeetinginvitation.cpp:68
+#: protocols/msn/msnaccount.cpp:346 protocols/msn/msnaccount.cpp:1285
+#: protocols/msn/msnaddcontactpage.cpp:76 protocols/msn/msnchatsession.cpp:356
+#: protocols/msn/msnchatsession.cpp:365 protocols/msn/msncontact.cpp:175
+#: protocols/msn/msncontact.cpp:252
+#: protocols/msn/ui/msneditaccountwidget.cpp:238
+#: protocols/msn/ui/msneditaccountwidget.cpp:278
+#: protocols/msn/ui/msneditaccountwidget.cpp:336
+#: protocols/msn/ui/msneditaccountwidget.cpp:356
+msgid "MSN Plugin"
+msgstr "Ategyn MSN"
+
+#: plugins/netmeeting/netmeetinginvitation.cpp:68 protocols/msn/webcam.cpp:91
+#: protocols/yahoo/yahooaccount.cpp:1231 protocols/yahoo/yahooaccount.cpp:1685
+#: protocols/yahoo/yahooaccount.cpp:1896
+msgid "Accept"
+msgstr "Derbyn"
+
+#: plugins/netmeeting/netmeetinginvitation.cpp:68
+msgid "Refuse"
+msgstr "Gwrthod"
+
 #: plugins/nowlistening/nowlisteningguiclient.cpp:37
 msgid "Send Media Info"
 msgstr ""
@@ -2712,19 +2770,19 @@ msgid ""
 "was listening to something on a supported media player."
 msgstr ""
 
-#: plugins/nowlistening/nowlisteningplugin.cpp:405
+#: plugins/nowlistening/nowlisteningplugin.cpp:453
 msgid "Unknown track"
 msgstr ""
 
-#: plugins/nowlistening/nowlisteningplugin.cpp:414
+#: plugins/nowlistening/nowlisteningplugin.cpp:462
 msgid "Unknown artist"
 msgstr ""
 
-#: plugins/nowlistening/nowlisteningplugin.cpp:421
+#: plugins/nowlistening/nowlisteningplugin.cpp:469
 msgid "Unknown album"
 msgstr ""
 
-#: plugins/nowlistening/nowlisteningplugin.cpp:428
+#: plugins/nowlistening/nowlisteningplugin.cpp:476
 msgid "Unknown player"
 msgstr ""
 
@@ -2754,6 +2812,7 @@ msgstr ""
 #: kopete/config/behavior/behaviorconfig_general.ui:16
 #: kopete/config/behavior/kopeteawayconfigbase.ui:33
 #: plugins/statistics/statisticsdialog.cpp:62
+#: protocols/msn/config/msnprefs.ui:30
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
@@ -3165,7 +3224,7 @@ msgstr ""
 msgid "Your password has been changed."
 msgstr "Newidwyd eich cyfrinair."
 
-#: protocols/gadu/gaducontact.cpp:198
+#: protocols/gadu/gaducontact.cpp:198 protocols/msn/msncontact.cpp:140
 msgid "Show Profile"
 msgstr ""
 
@@ -3173,7 +3232,7 @@ msgstr ""
 msgid "Gadu contact"
 msgstr ""
 
-#: protocols/gadu/gaducontact.cpp:247
+#: protocols/gadu/gaducontact.cpp:247 protocols/msn/msncontact.cpp:252
 msgid "<qt>Please go online to remove a contact from your contact list.</qt>"
 msgstr ""
 
@@ -3269,7 +3328,7 @@ msgstr "I& ffwrdd"
 #: protocols/gadu/gaduprotocol.cpp:63 protocols/gadu/gaduprotocol.cpp:65
 #: protocols/groupwise/gwprotocol.cpp:52
 #: protocols/meanwhile/meanwhileprotocol.cpp:51
-#: protocols/yahoo/yahooprotocol.cpp:45
+#: protocols/msn/msnprotocol.cpp:53 protocols/yahoo/yahooprotocol.cpp:45
 msgid "Busy"
 msgstr "Prysur"
 
@@ -3638,19 +3697,20 @@ msgid ""
 "you while Away or Busy"
 msgstr ""
 
-#: protocols/groupwise/gwcontact.cpp:166
+#: protocols/groupwise/gwcontact.cpp:166 protocols/msn/msncontact.cpp:133
 msgid "Unblock User"
 msgstr ""
 
-#: protocols/groupwise/gwcontact.cpp:166
+#: protocols/groupwise/gwcontact.cpp:166 protocols/msn/msncontact.cpp:133
 msgid "Block User"
 msgstr ""
 
-#: protocols/groupwise/gwcontact.cpp:240
+#: protocols/groupwise/gwcontact.cpp:240 protocols/msn/msncontact.cpp:618
 msgid "%1|Blocked"
 msgstr ""
 
 #: protocols/groupwise/gwmessagemanager.cpp:65
+#: protocols/msn/msnchatsession.cpp:78
 msgid "&Invite"
 msgstr "G&wahodd"
 
@@ -3734,7 +3794,7 @@ msgstr ""
 
 #: protocols/groupwise/gwprotocol.cpp:56
 #: protocols/meanwhile/meanwhileprotocol.cpp:56
-#: protocols/yahoo/yahooprotocol.cpp:55
+#: protocols/msn/msnprotocol.cpp:60 protocols/yahoo/yahooprotocol.cpp:55
 msgid "Idle"
 msgstr "Segur"
 
@@ -3940,6 +4000,8 @@ msgstr ""
 
 #: protocols/groupwise/ui/gwaddcontactpage.cpp:63
 #: protocols/jabber/ui/jabberaddcontactpage.cpp:62
+#: protocols/oscar/aim/aimprotocol.cpp:186
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:42
 msgid "You need to be connected to be able to add contacts."
 msgstr ""
 
@@ -4838,6 +4900,7 @@ msgid "Send Raw Packet to Server..."
 msgstr ""
 
 #: protocols/jabber/jabberaccount.cpp:202
+#: protocols/oscar/aim/aimaccount.cpp:334
 msgid "Edit User Info..."
 msgstr ""
 
@@ -5248,7 +5311,7 @@ msgid "Voice call"
 msgstr "Llais"
 
 #: protocols/jabber/jabberchatsession.cpp:88
-#: protocols/yahoo/yahoochatsession.cpp:60
+#: protocols/msn/msnchatsession.cpp:95 protocols/yahoo/yahoochatsession.cpp:60
 #, fuzzy
 msgid "Send File"
 msgstr "Anfon& Ffeil..."
@@ -5408,7 +5471,7 @@ msgstr ""
 msgid "Jabber ID"
 msgstr "Dynodiad Defnyddiwr"
 
-#: protocols/jabber/jabberprotocol.cpp:99 protocols/yahoo/yahooprotocol.cpp:94
+#: protocols/jabber/jabberprotocol.cpp:99 protocols/yahoo/yahooprotocol.cpp:96
 msgid "Birthday"
 msgstr "Penblwydd"
 
@@ -5454,7 +5517,7 @@ msgstr "Cyfeiriad Gwaith"
 msgid "Work PO Box"
 msgstr "&Gwybodaeth am Ddefnyddwyr"
 
-#: protocols/jabber/jabberprotocol.cpp:109 protocols/yahoo/yahooprotocol.cpp:88
+#: protocols/jabber/jabberprotocol.cpp:109 protocols/yahoo/yahooprotocol.cpp:90
 #, fuzzy
 msgid "Work City"
 msgstr "Dinas"
@@ -5464,7 +5527,7 @@ msgstr "Dinas"
 msgid "Work Postal Code"
 msgstr "Côd post:"
 
-#: protocols/jabber/jabberprotocol.cpp:111 protocols/yahoo/yahooprotocol.cpp:91
+#: protocols/jabber/jabberprotocol.cpp:111 protocols/yahoo/yahooprotocol.cpp:93
 #, fuzzy
 msgid "Work Country"
 msgstr "Gwlad:"
@@ -5819,6 +5882,7 @@ msgid "Meanwhile Plugin: Message from server"
 msgstr ""
 
 #: protocols/meanwhile/meanwhileeditaccountwidget.cpp:151
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:65
 #: protocols/winpopup/wpeditaccount.cpp:100
 #: protocols/yahoo/yahooeditaccount.cpp:108
 msgid "<qt>You must enter a valid screen name.</qt>"
@@ -5857,19 +5921,542 @@ msgstr ""
 msgid "Meanwhile Plugin: Conference invitation"
 msgstr ""
 
-#: protocols/oscar/icq/icqaccount.cpp:130
+#: protocols/msn/incomingtransfer.cpp:112
+msgid "Cannot open file for writing"
+msgstr "Methu agor ffeil ar gyfer ysgrifennu"
+
+#: protocols/msn/incomingtransfer.cpp:300
+#: protocols/msn/outgoingtransfer.cpp:211
+#: protocols/msn/outgoingtransfer.cpp:318
 #, fuzzy
-msgid "In&visible"
-msgstr "Segur"
+msgid "File transfer canceled."
+msgstr "Hidlenni"
+
+#: protocols/msn/msnaccount.cpp:83 protocols/yahoo/yahooaccount.cpp:97
+msgid "Open Inbo&x..."
+msgstr ""
+
+#: protocols/msn/msnaccount.cpp:84
+#, fuzzy
+msgid "&Change Display Name..."
+msgstr "Enw Dangos"
+
+#: protocols/msn/msnaccount.cpp:85
+#, fuzzy
+msgid "&Start Chat..."
+msgstr "Ymuno â'r Sianel..."
+
+#: protocols/msn/msnaccount.cpp:271 protocols/msn/msnchatsession.cpp:82
+#, fuzzy
+msgid "Send Raw C&ommand..."
+msgstr "Anfon Ebost ..."
+
+#: protocols/msn/msnaccount.cpp:332
+#, fuzzy
+msgid "Start Chat - MSN Plugin"
+msgstr "Ategyn MSN"
+
+#: protocols/msn/msnaccount.cpp:333
+msgid ""
+"Please enter the email address of the person with whom you want to chat:"
+msgstr ""
+
+#: protocols/msn/msnaccount.cpp:346 protocols/msn/msnaddcontactpage.cpp:76
+#: protocols/msn/msnchatsession.cpp:365
+#: protocols/msn/ui/msneditaccountwidget.cpp:278
+msgid "<qt>You must enter a valid email address.</qt>"
+msgstr ""
+
+#: protocols/msn/msnaccount.cpp:377 protocols/msn/msnaccount.cpp:388
+msgid "Change Display Name - MSN Plugin"
+msgstr ""
+
+#: protocols/msn/msnaccount.cpp:378
+msgid ""
+"Enter the new display name by which you want to be visible to your friends "
+"on MSN:"
+msgstr ""
+
+#: protocols/msn/msnaccount.cpp:386
+msgid ""
+"<qt>The display name you entered is too long. Please use a shorter name.\n"
+"Your display name has <b>not</b> been changed.</qt>"
+msgstr ""
+
+#: protocols/msn/msnaccount.cpp:434
+msgid ""
+"The connection with the MSN server was lost unexpectedly.\n"
+"If you cannot reconnect now, the server might be down. In that case, please "
+"try again later."
+msgstr ""
+
+#: protocols/msn/msnaccount.cpp:436
+#, fuzzy
+msgid "Connection Lost - MSN Plugin"
+msgstr "Ceuwyd y cysylltiad"
+
+#: protocols/msn/msnchatsession.cpp:86
+#, fuzzy
+msgid "Send Nudge"
+msgstr "Anfon& Ffeil..."
+
+#: protocols/msn/msnchatsession.cpp:89 protocols/msn/msncontact.cpp:148
+msgid "View Contact's Webcam"
+msgstr ""
+
+#: protocols/msn/msnchatsession.cpp:92 protocols/msn/msncontact.cpp:151
+#, fuzzy
+msgid "Send Webcam"
+msgstr "&Camera Gwe"
+
+#: protocols/msn/msnchatsession.cpp:98
+msgid "Request Display Picture"
+msgstr ""
+
+#: protocols/msn/msnchatsession.cpp:105
+#: protocols/msn/ui/msneditaccountwidget.cpp:330
+msgid "MSN Display Picture"
+msgstr ""
+
+#: protocols/msn/msnchatsession.cpp:247
+msgid "Connection closed"
+msgstr "Ceuwyd y cysylltiad"
+
+#: protocols/msn/msnchatsession.cpp:327
+msgid "Other..."
+msgstr "Eraill..."
+
+#: protocols/msn/msnchatsession.cpp:357
+msgid "Please enter the email address of the person you want to invite:"
+msgstr ""
+
+#: protocols/msn/msnchatsession.cpp:411
+#, c-format
+msgid ""
+"The following message has not been sent correctly:\n"
+"%1"
+msgstr ""
+
+#: protocols/msn/msnchatsession.cpp:468
+msgid ""
+"%1 has sent an unimplemented invitation, the invitation was rejected.\n"
+"The invitation was: %2"
+msgstr ""
+
+#: protocols/msn/msnchatsession.cpp:624
+msgid "%1 has started a chat with you"
+msgstr ""
+
+#: protocols/msn/msnchatsession.cpp:639
+msgid "has sent a nudge"
+msgstr ""
+
+#: protocols/msn/msnchatsession.cpp:652
+msgid "has sent you a nudge"
+msgstr ""
+
+#: protocols/msn/msnchatsession.cpp:718
+msgid ""
+"The following message has not been sent correctly  (%1): \n"
+"%2"
+msgstr ""
+
+#: protocols/msn/msnchatsession.cpp:725
+msgid "These messages have not been sent correctly (%1): <br /><ul>"
+msgstr ""
+
+#: protocols/msn/msnchatsession.cpp:760
+msgid "Impossible to establish the connection"
+msgstr ""
+
+#: protocols/msn/msncontact.cpp:174
+msgid "<qt>Please go online to block or unblock a contact.</qt>"
+msgstr ""
+
+#: protocols/msn/msncontact.cpp:315
+#, fuzzy
+msgid "Web Messenger"
+msgstr "Neges"
+
+#: protocols/msn/msncontact.cpp:317
+#, fuzzy
+msgid "Windows Mobile"
+msgstr "Ffôn Symudol :"
+
+#: protocols/msn/msncontact.cpp:319
+#, fuzzy
+msgid "MSN Mobile"
+msgstr "Ffôn Symudol :"
+
+#: protocols/msn/msndebugrawcmddlg.cpp:32
+msgid "DEBUG: Send Raw Command - MSN Plugin"
+msgstr ""
+
+#: protocols/msn/msnfiletransfersocket.cpp:44
+#, fuzzy
+msgid "File Transfer - MSN Plugin"
+msgstr "Trosglwyddo ffeiliau"
+
+#: protocols/msn/msnfiletransfersocket.cpp:158
+#: protocols/msn/msnfiletransfersocket.cpp:213
+#: protocols/msn/msnfiletransfersocket.cpp:450
+#, fuzzy
+msgid "An unknown error occurred"
+msgstr "Gwall anhysbys."
+
+#: protocols/msn/msnfiletransfersocket.cpp:225
+msgid "Connection timed out"
+msgstr "Cysylltiad wedi goramseru"
+
+#: protocols/msn/msnfiletransfersocket.cpp:413
+msgid "The remote user aborted"
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:125
+msgid "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>"
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:133
+msgid ""
+"<qt>An internal error occurred in the MSN plugin.<br>MSN Error: %1<br>please "
+"send us a detailed bug report at kopete-devel@kde.org containing the raw "
+"debug output on the console (in gzipped format, as it is probably a lot of "
+"output.)"
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:145
+msgid ""
+"Unable to change your display name.\n"
+"Please ensure your display is not too long and does not contains censored "
+"words."
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:160
+msgid "Your contact list is full; you cannot add any new contacts."
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:166
+msgid ""
+"<qt>The user '%1' already exists in this group on the MSN server;<br>if "
+"Kopete does not show the user, please send us a detailed bug report at "
+"kopete-devel@kde.org containing the raw debug output on the console (in "
+"gzipped format, as it is probably a lot of output.)</qt>"
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:183
+msgid "The user '%1' seems to already be blocked or allowed on the server."
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:189
+msgid ""
+"You have reached the maximum number of groups:\n"
+"MSN does not support more than 30 groups."
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:198
+msgid ""
+"Kopete is trying to perform an operation on a group or a contact that does "
+"not exists on the server.\n"
+"This might happen if the Kopete contact list and the MSN-server contact list "
+"are not correctly synchronized; if this is the case, you probably should "
+"send a bug report."
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:206
+msgid "The group name is too long; it has not been changed on the MSN server."
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:212
+msgid ""
+"You cannot open a Hotmail inbox because you do not have an MSN account with "
+"a valid Hotmail or MSN mailbox."
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:245
+msgid ""
+"You can not send messages when you are offline or when you are invisible."
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:251
+msgid ""
+"You are trying to perform an action you are not allowed to perform in 'kid "
+"mode'."
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:757
+#, c-format
+msgid ""
+"_n: You have one unread message in your MSN inbox.\n"
+"You have %n unread messages in your MSN inbox."
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:757 protocols/msn/msnnotifysocket.cpp:779
+#, fuzzy
+msgid "Open Inbox..."
+msgstr "&Cyfeiriad ebost:"
+
+#: protocols/msn/msnnotifysocket.cpp:778
+msgid "You have one new email from %1 in your MSN inbox."
+msgstr ""
+
+#: protocols/msn/msnnotifysocket.cpp:905
+#, fuzzy
+msgid "More Information"
+msgstr "Mwy o Wybodaeth..."
+
+#: protocols/msn/msnnotifysocket.cpp:908
+#, fuzzy
+msgid "Manage Subscription"
+msgstr "Tanysgrifiad"
+
+#: protocols/msn/msnnotifysocket.cpp:1017
+#, fuzzy
+msgid "Now Listening: ♫ %1 ♫"
+msgstr "Rwan yn Gwrando ar"
+
+#: protocols/msn/msnprotocol.cpp:42
+msgid "MSN Messenger"
+msgstr "Negesydd MSN"
+
+#: protocols/gadu/ui/gaduawayui.ui:71 protocols/msn/msnprotocol.cpp:52
+#: protocols/oscar/icq/icqpresence.cpp:77
+#, no-c-format
+msgid "O&nline"
+msgstr "A&r-lein"
+
+#: protocols/msn/msnprotocol.cpp:54
+msgid "Be Right Back"
+msgstr ""
+
+#: protocols/msn/msnprotocol.cpp:54
+msgid "Be &Right Back"
+msgstr ""
+
+#: protocols/msn/msnprotocol.cpp:55
+msgid "Away From Computer"
+msgstr ""
+
+#: protocols/msn/msnprotocol.cpp:56
+#, fuzzy
+msgid "On the Phone"
+msgstr "Ffôn:"
+
+#: protocols/msn/msnprotocol.cpp:56
+#, fuzzy
+msgid "On The &Phone"
+msgstr "Ffôn:"
+
+#: protocols/msn/msnprotocol.cpp:57
+msgid "Out to Lunch"
+msgstr ""
+
+#: protocols/msn/msnprotocol.cpp:57
+msgid "Out To &Lunch"
+msgstr ""
+
+#: protocols/msn/msnprotocol.cpp:58
+msgid "&Offline"
+msgstr "&All-lein"
+
+#: protocols/msn/msnprotocol.cpp:60
+msgid "&Idle"
+msgstr "&Segur"
+
+#: protocols/msn/msnprotocol.cpp:67
+#, fuzzy
+msgid "Remote Client"
+msgstr "Gwaredu Cyswllt"
+
+#: protocols/msn/msnprotocol.cpp:68
+#, fuzzy
+msgid "Contact GUID"
+msgstr "Cyswllt"
+
+#: protocols/msn/msnsocket.cpp:184
+msgid ""
+"There was an error while connecting to the MSN server.\n"
+"Error message:\n"
+msgstr ""
+
+#: protocols/msn/msnsocket.cpp:186
+#, c-format
+msgid "Unable to lookup %1"
+msgstr ""
+
+#: protocols/msn/msnsocket.cpp:568
+msgid "An internal server error occurred. Please try again later."
+msgstr ""
+
+#: protocols/msn/msnsocket.cpp:572
+msgid ""
+"It is no longer possible to perform this operation. The MSN server does not "
+"allow it anymore."
+msgstr ""
+
+#: protocols/msn/msnsocket.cpp:580
+msgid "The MSN server is busy. Please try again later."
+msgstr ""
+
+#: protocols/msn/msnsocket.cpp:590
+msgid "The server is not available at the moment. Please try again later."
+msgstr ""
+
+#: protocols/msn/msnsocket.cpp:596
+msgid ""
+"Unhandled MSN error code %1 \n"
+"Please fill a bug report with a detailed description and if possible the "
+"last console debug output."
+msgstr ""
+
+#: protocols/msn/msnswitchboardsocket.cpp:122
+msgid ""
+"Invalid user:\n"
+"this MSN user does not exist; please check the MSN ID."
+msgstr ""
+
+#: protocols/msn/msnswitchboardsocket.cpp:126
+#, fuzzy
+msgid "user never joined"
+msgstr "Diffinir gan y Defnyddiwr"
+
+#: protocols/msn/msnswitchboardsocket.cpp:131
+msgid "The user %1 is already in this chat."
+msgstr ""
+
+#: protocols/msn/msnswitchboardsocket.cpp:139
+msgid ""
+"The user %1 is online but has blocked you:\n"
+"you can not talk to this user."
+msgstr ""
+
+#: protocols/msn/msnswitchboardsocket.cpp:142
+#: protocols/msn/msnswitchboardsocket.cpp:159
+msgid "user blocked you"
+msgstr ""
+
+#: protocols/msn/msnswitchboardsocket.cpp:148
+msgid ""
+"The user %1 is currently not signed in.\n"
+"Messages will not be delivered."
+msgstr ""
+
+#: protocols/msn/msnswitchboardsocket.cpp:151
+#, fuzzy
+msgid "user disconnected"
+msgstr "Datgysylltwyd"
+
+#: protocols/msn/msnswitchboardsocket.cpp:156
+msgid ""
+"You are trying to invite too many contacts to this chat at the same time"
+msgstr ""
+
+#: protocols/msn/msnswitchboardsocket.cpp:164
+msgid "Kopete MSN plugin has trouble authenticating with switchboard server."
+msgstr ""
+
+#: protocols/msn/msnswitchboardsocket.cpp:218
+msgid "timeout"
+msgstr "goramser"
+
+#: protocols/msn/msnswitchboardsocket.cpp:771
+msgid ""
+"The message you are trying to send is too long; it will be split into %1 "
+"messages."
+msgstr ""
+
+#: protocols/msn/msnswitchboardsocket.cpp:772
+msgid "Message too big - MSN Plugin"
+msgstr ""
+
+#: protocols/msn/msnswitchboardsocket.cpp:843
+msgid "connection closed"
+msgstr "ceuwyd cysylltiad"
 
+#: protocols/msn/msnswitchboardsocket.cpp:923
+msgid "<img src=\"%1\" alt=\"Typewrited message\" />"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountwidget.cpp:237
+#: protocols/msn/ui/msneditaccountwidget.cpp:355
+msgid ""
+"<qt>An error occurred when trying to change the display picture.<br>Make "
+"sure that you have selected a correct image file</qt>"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountwidget.cpp:322
+msgid "Here you can see a list of contacts who added you to their contact list"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountwidget.cpp:323
+msgid "Reverse List - MSN Plugin"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountwidget.cpp:336
+msgid "Downloading of display image failed"
+msgstr ""
+
+#: protocols/msn/webcam.cpp:88
+msgid ""
+"<qt>The contact %1 wants to see <b>your</b> webcam, do you want them to see "
+"it?</qt>"
+msgstr ""
+
+#: protocols/msn/webcam.cpp:89
+msgid "The contact %1 wants to show you his/her webcam, do you want to see it?"
+msgstr ""
+
+#: protocols/msn/webcam.cpp:91
+msgid "Webcam invitation - Kopete MSN Plugin"
+msgstr ""
+
+#: protocols/msn/webcam.cpp:91
+msgid "Decline"
+msgstr "Gwrthod"
+
+#: protocols/msn/webcam/msnwebcamdialog.cpp:31
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:31
+#, c-format
+msgid "Webcam for %1"
+msgstr ""
+
+#: protocols/oscar/aim/aimaccount.cpp:211
+msgid ""
+"Visit the Kopete website at <a href=\"http://trinitydesktop.org\">http://"
+"trinitydesktop.org</a>"
+msgstr ""
+
+#: protocols/oscar/aim/aimaccount.cpp:325
+#, fuzzy
+msgid "Join Chat..."
+msgstr "Ymuno â'r Sianel..."
+
+#: protocols/oscar/aim/aimaccount.cpp:328
 #: protocols/oscar/icq/icqaccount.cpp:137
 msgid "Set Visibility..."
 msgstr ""
 
+#: protocols/oscar/aim/aimaccount.cpp:385
+msgid "Editing your user info is not possible because you are not connected."
+msgstr ""
+
+#: protocols/oscar/aim/aimaccount.cpp:387
+msgid "Unable to edit user info"
+msgstr ""
+
+#: protocols/oscar/aim/aimaccount.cpp:511
+msgid "Joining an AIM chat room is not possible because you are not connected."
+msgstr ""
+
+#: protocols/oscar/aim/aimaccount.cpp:513
+msgid "Unable to Join AIM Chat Room"
+msgstr ""
+
+#: protocols/oscar/aim/aimaccount.cpp:789
 #: protocols/oscar/icq/icqaccount.cpp:226
 msgid "You must be online to set users visibility."
 msgstr ""
 
+#: protocols/oscar/aim/aimaccount.cpp:790
 #: protocols/oscar/icq/icqaccount.cpp:227
 #: protocols/oscar/icq/ui/icqaddcontactpage.cpp:86
 #: protocols/oscar/icq/ui/icqaddcontactpage.cpp:94
@@ -5880,6 +6467,133 @@ msgstr ""
 msgid "ICQ Plugin"
 msgstr ""
 
+#: protocols/oscar/aim/aimcontact.cpp:93
+#, fuzzy
+msgid "&Warn User"
+msgstr "&Rhybuddio"
+
+#: protocols/oscar/aim/aimcontact.cpp:95 protocols/oscar/icq/icqcontact.cpp:705
+#, fuzzy
+msgid "Always &Visible To"
+msgstr "Segur"
+
+#: protocols/oscar/aim/aimcontact.cpp:97 protocols/oscar/icq/icqcontact.cpp:707
+#, fuzzy
+msgid "Always &Invisible To"
+msgstr "Segur"
+
+#: protocols/oscar/aim/aimcontact.cpp:350
+msgid ""
+"<qt>Would you like to warn %1 anonymously or with your name?<br>(Warning a "
+"user on AIM will result in a \"Warning Level\" increasing for the user you "
+"warn. Once this level has reached a certain point, they will not be able to "
+"sign on. Please do not abuse this function, it is meant for legitimate "
+"practices.)</qt>"
+msgstr ""
+
+#: protocols/oscar/aim/aimcontact.cpp:358
+#, fuzzy
+msgid "Warn User %1?"
+msgstr "&Rhybuddio"
+
+#: protocols/oscar/aim/aimcontact.cpp:359
+msgid "Warn Anonymously"
+msgstr ""
+
+#: protocols/oscar/aim/aimcontact.cpp:359
+#, fuzzy
+msgid "Warn"
+msgstr "Rhybuddio"
+
+#: protocols/oscar/aim/aimjoinchat.cpp:31
+#, fuzzy
+msgid "Join AIM Chat Room"
+msgstr "Ymuno â'r Sianel..."
+
+#: protocols/oscar/aim/aimjoinchat.cpp:32
+msgid "Join"
+msgstr "Uniad"
+
+#: protocols/oscar/aim/aimprotocol.cpp:187 protocols/oscar/oscaraccount.cpp:809
+#: protocols/yahoo/yahooprotocol.cpp:74
+msgid "AIM"
+msgstr "AIM"
+
+#: protocols/oscar/aim/aimprotocol.cpp:192
+#, fuzzy
+msgid "Do you want to add '%1' to your contact list?"
+msgstr "&Dileu y Cyswllt"
+
+#: protocols/oscar/aim/aimprotocol.cpp:214
+msgid ""
+"Unable to connect to the chat room %1 because the account for %2 is not "
+"connected."
+msgstr ""
+
+#: protocols/oscar/aim/aimprotocol.cpp:236
+#, fuzzy
+msgid "Mobile"
+msgstr "Ffôn Symudol :"
+
+#: protocols/oscar/aim/aimprotocol.cpp:239
+#, fuzzy
+msgid "Mobile Away"
+msgstr "Ffôn Symudol :"
+
+#: protocols/oscar/aim/aimprotocol.cpp:240
+#: protocols/oscar/icq/icqpresence.cpp:129
+msgid "Connecting..."
+msgstr "Yn cysylltu..."
+
+#: protocols/oscar/aim/aimprotocol.cpp:242
+#: protocols/oscar/icq/icqprotocol.cpp:183
+msgid "Client Features"
+msgstr ""
+
+#: protocols/oscar/aim/aimprotocol.cpp:243
+#, fuzzy
+msgid "User Profile"
+msgstr "Diffinir gan y Defnyddiwr"
+
+#: protocols/oscar/aim/aimprotocol.cpp:244
+#: protocols/oscar/icq/icqprotocol.cpp:184
+msgid "Buddy Icon MD5 Hash"
+msgstr ""
+
+#: protocols/oscar/aim/aimuserinfo.cpp:41
+#: protocols/oscar/aim/aimuserinfo.cpp:136
+#: protocols/oscar/aim/aimuserinfo.cpp:153
+#, fuzzy, c-format
+msgid "User Information on %1"
+msgstr "Gwybodaeth Defnyddiwr"
+
+#: protocols/oscar/aim/aimuserinfo.cpp:90
+#, fuzzy
+msgid "&Save Profile"
+msgstr "Diffinir gan y Defnyddiwr"
+
+#: protocols/oscar/aim/aimuserinfo.cpp:116
+msgid "Requesting User Profile, please wait..."
+msgstr ""
+
+#: protocols/oscar/aim/aimuserinfo.cpp:198
+msgid "<html><body><I>No user information provided</I></body></html>"
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:43
+msgid "Connect to the AIM network and try again."
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:66
+#, fuzzy
+msgid "No Screen Name"
+msgstr "Enw sgrîn:"
+
+#: protocols/oscar/icq/icqaccount.cpp:130
+#, fuzzy
+msgid "In&visible"
+msgstr "Segur"
+
 #: protocols/oscar/icq/icqcontact.cpp:253
 msgid "Request Authorization"
 msgstr ""
@@ -5907,7 +6621,7 @@ msgid ""
 "%1 %2"
 msgstr "%1 %2"
 
-#: protocols/oscar/icq/icqcontact.cpp:551 protocols/oscar/oscarcontact.cpp:182
+#: protocols/oscar/icq/icqcontact.cpp:551 protocols/oscar/oscarcontact.cpp:188
 msgid "UTF-8"
 msgstr "UTF-8"
 
@@ -5915,7 +6629,7 @@ msgstr "UTF-8"
 msgid "RTF-Messages"
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:555 protocols/oscar/oscarcontact.cpp:190
+#: protocols/oscar/icq/icqcontact.cpp:555 protocols/oscar/oscarcontact.cpp:196
 msgid "DirectIM/IMImage"
 msgstr ""
 
@@ -5946,16 +6660,6 @@ msgstr "Yn aros am awdurdodiad"
 msgid "&Ignore"
 msgstr "&Anwybyddu"
 
-#: protocols/oscar/icq/icqcontact.cpp:705
-#, fuzzy
-msgid "Always &Visible To"
-msgstr "Segur"
-
-#: protocols/oscar/icq/icqcontact.cpp:707
-#, fuzzy
-msgid "Always &Invisible To"
-msgstr "Segur"
-
 #: protocols/oscar/icq/icqcontact.cpp:719
 #, fuzzy
 msgid "Select Encoding..."
@@ -6013,20 +6717,11 @@ msgstr ""
 msgid "Free For Chat (Invisible)"
 msgstr "Segur"
 
-#: protocols/gadu/ui/gaduawayui.ui:71 protocols/oscar/icq/icqpresence.cpp:77
-#, no-c-format
-msgid "O&nline"
-msgstr "A&r-lein"
-
 #: protocols/oscar/icq/icqpresence.cpp:77
 #, fuzzy
 msgid "Online (Invisible)"
 msgstr "Segur"
 
-#: protocols/oscar/icq/icqpresence.cpp:129
-msgid "Connecting..."
-msgstr "Yn cysylltu..."
-
 #: protocols/oscar/icq/icqpresence.cpp:133
 msgid "Waiting for Authorization"
 msgstr "Yn aros am awdurdodiad"
@@ -6036,8 +6731,8 @@ msgstr "Yn aros am awdurdodiad"
 msgid "You must be online to add a contact."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:139 protocols/oscar/oscaraccount.cpp:797
-#: protocols/yahoo/yahooprotocol.cpp:74
+#: protocols/oscar/icq/icqprotocol.cpp:139 protocols/oscar/oscaraccount.cpp:809
+#: protocols/yahoo/yahooprotocol.cpp:75
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -6057,14 +6752,6 @@ msgstr ""
 msgid "IP Address"
 msgstr "Cyfeiriad IP"
 
-#: protocols/oscar/icq/icqprotocol.cpp:183
-msgid "Client Features"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:184
-msgid "Buddy Icon MD5 Hash"
-msgstr ""
-
 #: protocols/oscar/icq/icqprotocol.cpp:185
 #, fuzzy
 msgid "Contact Encoding"
@@ -6428,7 +7115,7 @@ msgstr ""
 msgid "Fitness"
 msgstr "Hidlenni"
 
-#: protocols/oscar/icq/icqprotocol.cpp:616 protocols/oscar/oscarcontact.cpp:196
+#: protocols/oscar/icq/icqprotocol.cpp:616 protocols/oscar/oscarcontact.cpp:202
 msgid "Games"
 msgstr "Gemau"
 
@@ -6734,151 +7421,163 @@ msgstr ""
 msgid "Licq"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:226 protocols/oscar/oscaraccount.cpp:605
-#: protocols/oscar/oscaraccount.cpp:611
+#: protocols/oscar/oscaraccount.cpp:237 protocols/oscar/oscaraccount.cpp:616
+#: protocols/oscar/oscaraccount.cpp:622
 msgid "Buddies"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:395
+#: protocols/oscar/oscaraccount.cpp:406
 msgid "ICQ Web Express"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:397
+#: protocols/oscar/oscaraccount.cpp:408
 #, fuzzy
 msgid "ICQ Email Express"
 msgstr "Cyfeiriad Ebost"
 
-#: protocols/oscar/oscaraccount.cpp:719 protocols/oscar/oscaraccount.cpp:736
+#: protocols/oscar/oscaraccount.cpp:730 protocols/oscar/oscaraccount.cpp:747
 msgid ""
 "_: account has been disconnected\n"
 "%1 disconnected"
 msgstr "Datgysylltwyd %1"
 
-#: protocols/oscar/oscaraccount.cpp:760
+#: protocols/oscar/oscaraccount.cpp:771
 msgid ""
 "There was an error in the protocol handling; it was not fatal, so you will "
 "not be disconnected."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:762
+#: protocols/oscar/oscaraccount.cpp:773
 msgid ""
 "There was an error in the protocol handling; automatic reconnection "
 "occurring."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:764
+#: protocols/oscar/oscaraccount.cpp:775
 #, fuzzy
 msgid "OSCAR Protocol error"
 msgstr "Gwall protocol."
 
-#: protocols/oscar/oscaraccount.cpp:798
+#: protocols/oscar/oscaraccount.cpp:810
 msgid ""
 "_: ICQ user id\n"
 "UIN"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:808
+#: protocols/oscar/oscaraccount.cpp:810
+#, fuzzy
+msgid ""
+"_: AIM user id\n"
+"screen name"
+msgstr "Enw sgrîn:"
+
+#: protocols/oscar/oscaraccount.cpp:820
 msgid ""
 "You have logged in more than once with the same %1, account %2 is now "
 "disconnected."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:814
+#: protocols/oscar/oscaraccount.cpp:826
 msgid ""
 "Sign on failed because either your %1 or password are invalid. Please check "
 "your settings for account %2."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:822
+#: protocols/oscar/oscaraccount.cpp:834
 msgid "The %1 service is temporarily unavailable. Please try again later."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:827
+#: protocols/oscar/oscaraccount.cpp:839
 msgid ""
 "Could not sign on to %1 with account %2 because the password was incorrect."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:832
+#: protocols/oscar/oscaraccount.cpp:844
 msgid "Could not sign on to %1 with nonexistent account %2."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:836
+#: protocols/oscar/oscaraccount.cpp:848
 msgid "Sign on to %1 failed because your account %2 expired."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:840
+#: protocols/oscar/oscaraccount.cpp:852
 msgid "Sign on to %1 failed because your account %2 is currently suspended."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:846
+#: protocols/oscar/oscaraccount.cpp:858
 msgid ""
 "Could not sign on to %1 as there are too many clients from the same computer."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:852
+#: protocols/oscar/oscaraccount.cpp:864
 msgid ""
 "Account %1 was blocked on the %2 server for sending messages too quickly. "
 "Wait ten minutes and try again. If you continue to try, you will need to "
 "wait even longer."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:861
+#: protocols/oscar/oscaraccount.cpp:873
 msgid ""
 "Account %1 was blocked on the %2 server for reconnecting too quickly. Wait "
 "ten minutes and try again. If you continue to try, you will need to wait "
 "even longer."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:873 protocols/oscar/oscaraccount.cpp:893
+#: protocols/oscar/oscaraccount.cpp:885 protocols/oscar/oscaraccount.cpp:905
 msgid "Sign on to %1 with your account %2 failed."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:880
+#: protocols/oscar/oscaraccount.cpp:892
 msgid ""
 "The %1 server thinks the client you are using is too old. Please report this "
 "as a bug at http://bugs.trinitydesktop.org"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:886
+#: protocols/oscar/oscaraccount.cpp:898
 msgid ""
 "Account %1 was disabled on the %2 server because of your age (less than 13)."
 msgstr ""
 
-#: protocols/oscar/oscarcontact.cpp:175
+#: protocols/oscar/oscarcontact.cpp:174
+#, fuzzy
+msgid "Mobile AIM Client"
+msgstr "Gwaredu Cyswllt"
+
+#: protocols/oscar/oscarcontact.cpp:180
 #, c-format
 msgid ""
 "_: Translators: client name and version\n"
 "%1"
 msgstr "%1"
 
-#: protocols/oscar/oscarcontact.cpp:180
+#: protocols/oscar/oscarcontact.cpp:186
 msgid "Buddy icons"
 msgstr ""
 
-#: protocols/oscar/oscarcontact.cpp:184
+#: protocols/oscar/oscarcontact.cpp:190
 msgid "Rich text messages"
 msgstr ""
 
-#: protocols/oscar/oscarcontact.cpp:186
+#: protocols/oscar/oscarcontact.cpp:192
 #, fuzzy
 msgid "Group chat"
 msgstr "Gr?p"
 
-#: protocols/oscar/oscarcontact.cpp:188
+#: protocols/oscar/oscarcontact.cpp:194
 #, fuzzy
 msgid "Voice chat"
 msgstr "Llais"
 
-#: protocols/oscar/oscarcontact.cpp:192
+#: protocols/oscar/oscarcontact.cpp:198
 msgid "Send buddy list"
 msgstr ""
 
-#: protocols/oscar/oscarcontact.cpp:194
+#: protocols/oscar/oscarcontact.cpp:200
 #, fuzzy
 msgid "File transfers"
 msgstr "Hidlenni"
 
-#: protocols/oscar/oscarcontact.cpp:198
+#: protocols/oscar/oscarcontact.cpp:204
 msgid "Trillian user"
 msgstr ""
 
@@ -7244,16 +7943,11 @@ msgstr "Gwybodaeth Defnyddiwr"
 msgid "Other Yahoo Information"
 msgstr "Gwybodaeth Defnyddiwr"
 
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:207
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:211
 #, fuzzy
 msgid "Replace existing entry"
 msgstr "Amnewidiad"
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:31
-#, c-format
-msgid "Webcam for %1"
-msgstr ""
-
 #: protocols/yahoo/ui/yahoowebcamdialog.cpp:45
 msgid "No webcam image received"
 msgstr ""
@@ -7282,10 +7976,6 @@ msgstr ""
 msgid "%1 viewer(s)"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:97
-msgid "Open Inbo&x..."
-msgstr ""
-
 #: protocols/yahoo/yahooaccount.cpp:98
 #, fuzzy
 msgid "Open &Addressbook..."
@@ -7373,11 +8063,6 @@ msgid ""
 "Accept?"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1231 protocols/yahoo/yahooaccount.cpp:1685
-#: protocols/yahoo/yahooaccount.cpp:1896
-msgid "Accept"
-msgstr "Derbyn"
-
 #: protocols/yahoo/yahooaccount.cpp:1332
 msgid "%1 has declined to join the conference: \"%2\""
 msgstr ""
@@ -7574,98 +8259,102 @@ msgstr ""
 msgid "Alternative email 1"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:75
+#: protocols/yahoo/yahooprotocol.cpp:76
+msgid "MSN"
+msgstr ""
+
+#: protocols/yahoo/yahooprotocol.cpp:77
 msgid "GoogleTalk"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:76
+#: protocols/yahoo/yahooprotocol.cpp:78
 #, fuzzy
 msgid "Skype"
 msgstr "Gofodnod"
 
-#: protocols/irc/ircchatui.rc:5 protocols/yahoo/yahooprotocol.cpp:77
+#: protocols/irc/ircchatui.rc:5 protocols/yahoo/yahooprotocol.cpp:79
 #, no-c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: protocols/yahoo/yahooprotocol.cpp:78
+#: protocols/yahoo/yahooprotocol.cpp:80
 msgid "QQ"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:79
+#: protocols/yahoo/yahooprotocol.cpp:81
 #, fuzzy
 msgid "Private Address"
 msgstr "Cyfeiriad IP"
 
-#: protocols/yahoo/yahooprotocol.cpp:80
+#: protocols/yahoo/yahooprotocol.cpp:82
 #, fuzzy
 msgid "Private City"
 msgstr "Preifatwydd"
 
-#: protocols/yahoo/yahooprotocol.cpp:81
+#: protocols/yahoo/yahooprotocol.cpp:83
 msgid "Private State"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:82
+#: protocols/yahoo/yahooprotocol.cpp:84
 msgid "Private ZIP"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:83
+#: protocols/yahoo/yahooprotocol.cpp:85
 #, fuzzy
 msgid "Private Country"
 msgstr "Gwlad:"
 
-#: protocols/yahoo/yahooprotocol.cpp:85
+#: protocols/yahoo/yahooprotocol.cpp:87
 msgid "Private URL"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:86
+#: protocols/yahoo/yahooprotocol.cpp:88
 #, fuzzy
 msgid "Corporation"
 msgstr "Gwiriad"
 
-#: protocols/yahoo/yahooprotocol.cpp:87
+#: protocols/yahoo/yahooprotocol.cpp:89
 #, fuzzy
 msgid "Work Address"
 msgstr "Cyfeiriad &Gwaith"
 
-#: protocols/yahoo/yahooprotocol.cpp:89
+#: protocols/yahoo/yahooprotocol.cpp:91
 #, fuzzy
 msgid "Work State"
 msgstr "Stryd:"
 
-#: protocols/yahoo/yahooprotocol.cpp:90
+#: protocols/yahoo/yahooprotocol.cpp:92
 #, fuzzy
 msgid "Work ZIP"
 msgstr "&Gwybodaeth am Ddefnyddwyr"
 
-#: protocols/yahoo/yahooprotocol.cpp:93
+#: protocols/yahoo/yahooprotocol.cpp:95
 #, fuzzy
 msgid "Work URL"
 msgstr "Gwaith :"
 
-#: protocols/yahoo/yahooprotocol.cpp:95
+#: protocols/yahoo/yahooprotocol.cpp:97
 msgid "Anniversary"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:96
+#: protocols/yahoo/yahooprotocol.cpp:98
 #, fuzzy
 msgid "Notes"
 msgstr "&Nodiadau"
 
-#: protocols/yahoo/yahooprotocol.cpp:97
+#: protocols/yahoo/yahooprotocol.cpp:99
 msgid "Additional 1"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:98
+#: protocols/yahoo/yahooprotocol.cpp:100
 msgid "Additional 2"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:99
+#: protocols/yahoo/yahooprotocol.cpp:101
 msgid "Additional 3"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:100
+#: protocols/yahoo/yahooprotocol.cpp:102
 msgid "Additional 4"
 msgstr ""
 
@@ -7956,7 +8645,8 @@ msgstr ""
 
 #: kopete/chatwindow/kopetechatwindow.rc:5
 #: kopete/chatwindow/kopeteemailwindow.rc:5 protocols/groupwise/gwchatui.rc:5
-#: protocols/jabber/jabberchatui.rc:5 protocols/yahoo/yahooconferenceui.rc:5
+#: protocols/jabber/jabberchatui.rc:5 protocols/msn/msnchatui.rc:5
+#: protocols/yahoo/yahooconferenceui.rc:5
 #, no-c-format
 msgid "&Chat"
 msgstr "&Sgwrsio"
@@ -9599,7 +10289,7 @@ msgstr ""
 msgid "Add this contact in my contactlist"
 msgstr "Ychwanegu'r cyswllt yma i'm rhestr cysylltau"
 
-#: libkopete/ui/contactaddednotifywidget.ui:112
+#: libkopete/ui/contactaddednotifywidget.ui:112 protocols/msn/ui/msninfo.ui:86
 #, no-c-format
 msgid "Display name:"
 msgstr ""
@@ -10272,6 +10962,44 @@ msgstr ""
 msgid "&Become away after this many minutes of inactivity:"
 msgstr ""
 
+#: plugins/netmeeting/netmeetingprefs_ui.ui:25
+#, no-c-format
+msgid ""
+"The NetMeeting Plugin allows you to start a video or voice chat with your "
+"MSN Messenger contacts.\n"
+"\n"
+"This is not the same as webcam chat you can find in the newer Windows "
+"Messenger®,  but uses the older NetMeeting chat you can find in old versions."
+msgstr ""
+
+#: plugins/netmeeting/netmeetingprefs_ui.ui:60
+#, no-c-format
+msgid "Application to launch:"
+msgstr ""
+
+#: plugins/netmeeting/netmeetingprefs_ui.ui:66
+#, no-c-format
+msgid "ekiga -c callto://%1"
+msgstr ""
+
+#: plugins/netmeeting/netmeetingprefs_ui.ui:71
+#, no-c-format
+msgid "konference callto://%1"
+msgstr ""
+
+#: plugins/netmeeting/netmeetingprefs_ui.ui:99
+#, no-c-format
+msgid "<b>%1</b> will be replaced by the ip to call"
+msgstr ""
+
+#: plugins/netmeeting/netmeetingprefs_ui.ui:135
+#, no-c-format
+msgid ""
+"You can download Konference here: <a href=\"http://www.kde-apps.org/content/"
+"show.php?content=10395\">http://www.kde-apps.org/content/show.php?"
+"content=10395</a>"
+msgstr ""
+
 #: plugins/nowlistening/nowlisteningconfig.kcfg:11
 #, no-c-format
 msgid "Header of the message advertised."
@@ -10516,6 +11244,7 @@ msgstr "Lleoliad"
 #: protocols/groupwise/ui/gwaccountpreferences.ui:146
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:365
 #: protocols/meanwhile/ui/meanwhileeditaccountbase.ui:149
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:259
 #: protocols/yahoo/ui/yahooeditaccountbase.ui:267
 #, no-c-format
 msgid "Ser&ver:"
@@ -10780,43 +11509,45 @@ msgstr ""
 
 #: plugins/webpresence/webpresenceprefs.ui:203
 #, no-c-format
-msgid "Replaces the protocol names, such as IRC with images."
+msgid "Replaces the protocol names, such as MSN and IRC with images."
 msgstr ""
 
 #: plugins/webpresence/webpresenceprefs.ui:206
 #, no-c-format
 msgid ""
-"Replaces the protocol names, such as IRC with images.\n"
+"Replaces the protocol names, such as MSN and IRC with images.\n"
 "\n"
 "Note that you have to manually copy the PNG files into place.\n"
 "\n"
 "The following files are used by default:\n"
 "\n"
+"images/msn_protocol.png\n"
 "images/icq_protocol.png\n"
 "images/jabber_protocol.png\n"
 "images/yahoo_protocol.png\n"
+"images/aim_protocol.png\n"
 "images/irc_protocol.png\n"
 "images/sms_protocol.png\n"
 "images/gadu_protocol.png\n"
 "images/winpopup_protocol.png"
 msgstr ""
 
-#: plugins/webpresence/webpresenceprefs.ui:228
+#: plugins/webpresence/webpresenceprefs.ui:230
 #, no-c-format
 msgid "Display Name"
 msgstr "Enw Dangos"
 
-#: plugins/webpresence/webpresenceprefs.ui:245
+#: plugins/webpresence/webpresenceprefs.ui:247
 #, no-c-format
 msgid "Use one of &your IM names"
 msgstr ""
 
-#: plugins/webpresence/webpresenceprefs.ui:256
+#: plugins/webpresence/webpresenceprefs.ui:258
 #, no-c-format
 msgid "Use another &name:"
 msgstr ""
 
-#: plugins/webpresence/webpresenceprefs.ui:299
+#: plugins/webpresence/webpresenceprefs.ui:301
 #, no-c-format
 msgid "Include &IM addresses"
 msgstr ""
@@ -11007,6 +11738,8 @@ msgstr ""
 #: protocols/irc/ui/irceditaccount.ui:109
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:52
 #: protocols/meanwhile/ui/meanwhileeditaccountbase.ui:42
+#: protocols/msn/ui/msneditaccountui.ui:123
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:67
 #: protocols/sms/ui/smsactprefs.ui:71
 #: protocols/winpopup/ui/wpeditaccountbase.ui:59
 #: protocols/yahoo/ui/yahooeditaccountbase.ui:54
@@ -11033,6 +11766,8 @@ msgstr ""
 #: protocols/irc/ui/irceditaccount.ui:390
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:109
 #: protocols/meanwhile/ui/meanwhileeditaccountbase.ui:96
+#: protocols/msn/ui/msneditaccountui.ui:188
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:129
 #: protocols/oscar/icq/ui/icqeditaccountui.ui:105
 #: protocols/yahoo/ui/yahooeditaccountbase.ui:103
 #, no-c-format
@@ -11048,6 +11783,8 @@ msgstr ""
 
 #: protocols/gadu/ui/gadueditaccountui.ui:143
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:138
+#: protocols/msn/ui/msneditaccountui.ui:77
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:150
 #: protocols/oscar/icq/ui/icqeditaccountui.ui:134
 #: protocols/yahoo/ui/yahooeditaccountbase.ui:132
 #, no-c-format
@@ -11065,6 +11802,8 @@ msgstr ""
 
 #: protocols/gadu/ui/gadueditaccountui.ui:183
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:174
+#: protocols/msn/ui/msneditaccountui.ui:113
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:186
 #: protocols/oscar/icq/ui/icqeditaccountui.ui:171
 #, no-c-format
 msgid "Re&gister New Account"
@@ -11090,6 +11829,7 @@ msgstr ""
 #: protocols/irc/ui/irceditaccount.ui:371
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:271
 #: protocols/meanwhile/ui/meanwhileeditaccountbase.ui:122
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:226
 #: protocols/oscar/icq/ui/icqeditaccountui.ui:211
 #: protocols/yahoo/ui/yahooeditaccountbase.ui:234
 #, no-c-format
@@ -11253,6 +11993,7 @@ msgid "Local &IP address /"
 msgstr "Cyfeiriadau Lleol /"
 
 #: protocols/gadu/ui/gadueditaccountui.ui:728
+#: protocols/msn/ui/msneditaccountui.ui:1166
 #, no-c-format
 msgid "po&rt:"
 msgstr "po&rth:"
@@ -11503,6 +12244,7 @@ msgstr ""
 #: protocols/groupwise/ui/gwaccountpreferences.ui:191
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:410
 #: protocols/meanwhile/ui/meanwhileeditaccountbase.ui:187
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:296
 #: protocols/oscar/icq/ui/icqeditaccountui.ui:265
 #, no-c-format
 msgid "Po&rt:"
@@ -12083,6 +12825,7 @@ msgid "&Prefer SSL-based connections"
 msgstr ""
 
 #: protocols/irc/ui/irceditaccount.ui:393
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:132
 #: protocols/oscar/icq/ui/icqeditaccountui.ui:108
 #, no-c-format
 msgid ""
@@ -12516,6 +13259,8 @@ msgid "Account Preferences - Jabber"
 msgstr ""
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:41
+#: protocols/msn/ui/msneditaccountui.ui:41
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:56
 #: protocols/oscar/icq/ui/icqeditaccountui.ui:37
 #: protocols/yahoo/ui/yahooeditaccountbase.ui:43
 #, fuzzy, no-c-format
@@ -12545,6 +13290,8 @@ msgid ""
 msgstr ""
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:120
+#: protocols/msn/ui/msneditaccountui.ui:202
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:121
 #: protocols/oscar/icq/ui/icqeditaccountui.ui:116
 #, no-c-format
 msgid "Exclu&de from Global Identity"
@@ -12576,6 +13323,7 @@ msgid ""
 msgstr ""
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:260
+#: protocols/msn/ui/msneditaccountui.ui:1100
 #, no-c-format
 msgid "Co&nnection"
 msgstr "Cy&sylltiad"
@@ -12614,6 +13362,8 @@ msgid "Allow plain-te&xt password authentication"
 msgstr ""
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:335
+#: protocols/msn/ui/msneditaccountui.ui:1122
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:237
 #: protocols/oscar/icq/ui/icqeditaccountui.ui:302
 #, no-c-format
 msgid "&Override default server information"
@@ -12712,6 +13462,7 @@ msgid ""
 msgstr ""
 
 #: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:780
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:381
 #, fuzzy, no-c-format
 msgid "Pri&vacy"
 msgstr "Preifatwydd"
@@ -12946,7 +13697,7 @@ msgstr ""
 msgid "Full name:"
 msgstr "Enw llawn:"
 
-#: protocols/jabber/ui/dlgvcard.ui:269
+#: protocols/jabber/ui/dlgvcard.ui:269 protocols/oscar/aim/ui/aiminfobase.ui:51
 #, no-c-format
 msgid "Nickname:"
 msgstr "Ffugenw:"
@@ -13037,12 +13788,12 @@ msgstr "Ffacs:"
 msgid "Cell:"
 msgstr "Cell:"
 
-#: protocols/jabber/ui/dlgvcard.ui:982
+#: protocols/jabber/ui/dlgvcard.ui:982 protocols/msn/ui/msninfo.ui:149
 #, no-c-format
 msgid "Work:"
 msgstr "Gwaith :"
 
-#: protocols/jabber/ui/dlgvcard.ui:990
+#: protocols/jabber/ui/dlgvcard.ui:990 protocols/msn/ui/msninfo.ui:141
 #, no-c-format
 msgid "Home:"
 msgstr "Cartref :"
@@ -13158,6 +13909,658 @@ msgstr ""
 msgid "Restore the server and port values to their defaults."
 msgstr ""
 
+#: protocols/msn/config/msnprefs.ui:57
+#, no-c-format
+msgid "&Automatically open a chat window when someone starts a conversation"
+msgstr ""
+
+#: protocols/msn/config/msnprefs.ui:65
+#, no-c-format
+msgid "&Automatically download the display picture if possible"
+msgstr ""
+
+#: protocols/msn/config/msnprefs.ui:76
+#, no-c-format
+msgid "Download and show custom emoticons (experimental)"
+msgstr ""
+
+#: protocols/msn/config/msnprefs.ui:97
+#, no-c-format
+msgid "Away Messages"
+msgstr "Negeseuon Allan"
+
+#: protocols/msn/config/msnprefs.ui:132
+#, fuzzy, no-c-format
+msgid "Send &away messages"
+msgstr "Negeseuon Allan"
+
+#: protocols/msn/config/msnprefs.ui:151
+#, no-c-format
+msgid "Do not send more than one away message every"
+msgstr ""
+
+#: protocols/msn/config/msnprefs.ui:170
+#, no-c-format
+msgid "seconds"
+msgstr "eiliad"
+
+#: protocols/msn/msnchatui.rc:13
+#, no-c-format
+msgid "&Debug"
+msgstr ""
+
+#: protocols/msn/ui/msnadd.ui:38 protocols/msn/ui/msneditaccountui.ui:150
+#, no-c-format
+msgid "&MSN Passport ID:"
+msgstr ""
+
+#: protocols/msn/ui/msnadd.ui:47 protocols/msn/ui/msnadd.ui:58
+#, no-c-format
+msgid "The user ID of the MSN contact you would like to add."
+msgstr ""
+
+#: protocols/msn/ui/msnadd.ui:50 protocols/msn/ui/msnadd.ui:61
+#, no-c-format
+msgid ""
+"The user ID of the MSN contact you would like to add.  This should be in the "
+"form of a valid E-mail address."
+msgstr ""
+
+#: protocols/msn/ui/msnadd.ui:71
+#, no-c-format
+msgid "<i>(for example: joe@hotmail.com)</i>"
+msgstr ""
+
+#: protocols/msn/ui/msndebugrawcommand_base.ui:30
+#, no-c-format
+msgid "&Parameters:"
+msgstr "&Paramedrau:"
+
+#: protocols/msn/ui/msndebugrawcommand_base.ui:46
+#, no-c-format
+msgid "Co&mmand:"
+msgstr "Gorchy&myn:"
+
+#: protocols/msn/ui/msndebugrawcommand_base.ui:62
+#, fuzzy, no-c-format
+msgid "Add &ID"
+msgstr "&Ychwanegu"
+
+#: protocols/msn/ui/msndebugrawcommand_base.ui:73
+#, fuzzy, no-c-format
+msgid "Add &new line"
+msgstr "&Danlinellu"
+
+#: protocols/msn/ui/msndebugrawcommand_base.ui:92
+#, no-c-format
+msgid "Message:"
+msgstr "Neges:"
+
+#: protocols/msn/ui/msneditaccountui.ui:17
+#, fuzzy, no-c-format
+msgid "Account Preferences - MSN"
+msgstr "Gwall protocol."
+
+#: protocols/msn/ui/msneditaccountui.ui:102
+#, no-c-format
+msgid ""
+"To connect to the Microsoft network, you will need a Microsoft Passport."
+"<br><br>If you do not currently have a Passport, please click the button to "
+"create one."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:156
+#: protocols/msn/ui/msneditaccountui.ui:170
+#, no-c-format
+msgid "The user ID of the MSN contact you would like to use."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:159
+#: protocols/msn/ui/msneditaccountui.ui:173
+#, no-c-format
+msgid ""
+"The user ID of the MSN contact you would like to use.  This should be in the "
+"form of a valid E-mail address."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:194
+#, no-c-format
+msgid ""
+"If you check this checkbox, the account will not be connected when you press "
+"the \"Connect All\" button, or at startup when automatic connection at "
+"startup is enabled."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:214
+#, fuzzy, no-c-format
+msgid "MSN &Settings"
+msgstr "&Cadw Gosodiadau"
+
+#: protocols/msn/ui/msneditaccountui.ui:230
+#, no-c-format
+msgid "<qt><b>Note:</b> These settings are applicable to all MSN accounts"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:241
+#, fuzzy, no-c-format
+msgid "Global MSN Options"
+msgstr "Ffoto Ymhobman"
+
+#: protocols/msn/ui/msneditaccountui.ui:260
+#, no-c-format
+msgid "Au&tomatically open a chat window when someone starts a conversation"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:263
+#, no-c-format
+msgid ""
+"This option will notify you when a contact starts typing their message, "
+"before the message is sent or finished."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:279
+#, no-c-format
+msgid "Download the msn picture:"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:282
+#, no-c-format
+msgid ""
+"<qt><p>Indicate when Kopete will download the display pictures of contacts</"
+"p>\n"
+"<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. "
+"It is only downloaded when the user requests it</dd>\n"
+"<dt>When a chat is open</dt><dd>The picture is downloaded when a "
+"conversation socket is opened, i.e. when you open a chat window</dd>\n"
+"<dt>Automatically</dt><dd>Always try to download the picture if the contact "
+"has one.  <b>Note:</b> this will open a socket, and let the user know you "
+"are downloading their picture.</dd></dl>"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:291
+#, no-c-format
+msgid "Only Manually"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:296
+#, no-c-format
+msgid "When a Chat is Open"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:301
+#, fuzzy, no-c-format
+msgid "Automatically"
+msgstr "Awtomatig"
+
+#: protocols/msn/ui/msneditaccountui.ui:319
+#, no-c-format
+msgid ""
+"<qt><p>Indicate when Kopete will download the pictures of contacts</p>\n"
+"<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. "
+"It is only downloaded when the user requests it</dd>\n"
+"<dt>When a chat is open</dt><dd>The picture is downloaded when a "
+"conversation socket is opened, i.e. when you open a chat window</dd>\n"
+"<dt>Automatically</dt><dd>Always try to download the picture if the contact "
+"has one.  <b>Note:</b> this will open a socket, and let the user know you "
+"are downloading their picture.</dd></dl>"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:332
+#, no-c-format
+msgid "&Download and show custom emoticons"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:338
+#, no-c-format
+msgid ""
+"MSN Messenger allows users to download and use custom emoticons. If this "
+"option is enabled, Kopete will download these emoticons and show them."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:346
+#, fuzzy, no-c-format
+msgid "E&xport the current emoticon theme to users"
+msgstr "&Dileu y Cyswllt"
+
+#: protocols/msn/ui/msneditaccountui.ui:349
+#, no-c-format
+msgid "Only work with emoticons in the PNG format"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:352
+#, no-c-format
+msgid ""
+"Export all the emoticon themes as custom emoticons.\n"
+"Only works for emoticons in the PNG format."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:363
+#, no-c-format
+msgid "Privacy"
+msgstr "Preifatwydd"
+
+#: protocols/msn/ui/msneditaccountui.ui:377
+#, fuzzy, no-c-format
+msgid "Send client information"
+msgstr "Gwybodaeth Cyffredinol"
+
+#: protocols/msn/ui/msneditaccountui.ui:386
+#, no-c-format
+msgid ""
+"<qt>Make it possible for your contacts to detect if you are using Kopete."
+"<br>We recommend leaving this checked.</qt>"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:389
+#, no-c-format
+msgid ""
+"Third party MSN clients, such as Kopete, give users the ability to let other "
+"third party clients guess which client they are using. We recommend leaving "
+"this checkbox checked."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:400
+#, fuzzy, no-c-format
+msgid "Send &typing notifications"
+msgstr "Hysbysiad"
+
+#: protocols/msn/ui/msneditaccountui.ui:406
+#, no-c-format
+msgid ""
+"<qt>Check this box to send <b>Typing notifications</b> to your contacts. "
+"When you are composing a message, you might want your contact to know that "
+"you are typing so that he knows you are answering.</qt>"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:422
+#, no-c-format
+msgid "Expose my Jabber account to Jabber users"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:428
+#: protocols/msn/ui/msneditaccountui.ui:439
+#, no-c-format
+msgid ""
+"If you have a Jabber account, you may let Jabber users on an MSN gateway "
+"know that you are also using Jabber."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:483
+#, no-c-format
+msgid "There are also privacy options in the \"Contacts\" tab"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:548
+#: protocols/oscar/icq/ui/icqgeneralinfo.ui:376
+#: protocols/oscar/icq/ui/icqsearchbase.ui:233
+#: protocols/yahoo/ui/yahoogeneralinfowidget.ui:92
+#, no-c-format
+msgid "&Nickname:"
+msgstr "Ffuge&nw:"
+
+#: protocols/msn/ui/msneditaccountui.ui:554
+#: protocols/msn/ui/msneditaccountui.ui:565
+#, no-c-format
+msgid ""
+"The alias you would like to use on MSN.  You may change this at any time you "
+"wish."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:575
+#, no-c-format
+msgid "Phone Numbers"
+msgstr "Rhifau ffôn"
+
+#: protocols/msn/ui/msneditaccountui.ui:586
+#, no-c-format
+msgid "Hom&e:"
+msgstr "Car&tref :"
+
+#: protocols/msn/ui/msneditaccountui.ui:597
+#, no-c-format
+msgid "&Work:"
+msgstr "&Gwaith :"
+
+#: protocols/msn/ui/msneditaccountui.ui:618
+#, fuzzy, no-c-format
+msgid "&Mobile:"
+msgstr "Ffôn Symudol :"
+
+#: protocols/msn/ui/msneditaccountui.ui:636
+#, fuzzy, no-c-format
+msgid "Display Picture"
+msgstr "Enw Dangos"
+
+#: protocols/msn/ui/msneditaccountui.ui:655
+#, no-c-format
+msgid "E&xport a display picture"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:674
+#, no-c-format
+msgid "Please select a square image. The image will be scaled to 96x96."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:696
+#, fuzzy, no-c-format
+msgid "&Select Image..."
+msgstr "Dewis..."
+
+#: protocols/msn/ui/msneditaccountui.ui:837
+#, no-c-format
+msgid "WARNING: You need to be connected to modify this page."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:850
+#, no-c-format
+msgid "Con&tacts"
+msgstr "Cys&ylltau"
+
+#: protocols/msn/ui/msneditaccountui.ui:861
+#, no-c-format
+msgid ""
+"<i>Italics</i> contacts are not on your contact list.<br>\n"
+"<br>\n"
+"<b>Bold</b> contacts are in your contact list but you are not in their "
+"contact list."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:879
+#, fuzzy, no-c-format
+msgid "Bloc&ked contacts:"
+msgstr "&Atal Cyswllt"
+
+#: protocols/msn/ui/msneditaccountui.ui:903
+#, no-c-format
+msgid "&>"
+msgstr "&>"
+
+#: protocols/msn/ui/msneditaccountui.ui:911
+#, no-c-format
+msgid "&<"
+msgstr "&<"
+
+#: protocols/msn/ui/msneditaccountui.ui:938
+#, fuzzy, no-c-format
+msgid "Allo&wed contacts:"
+msgstr "Cyswllt"
+
+#: protocols/msn/ui/msneditaccountui.ui:981
+#, no-c-format
+msgid "Block all users not in 'Allowed' &list"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:984
+#, no-c-format
+msgid ""
+"Checking this box will block all users not explicitly shown in the allowed "
+"list here, including any contacts not on your contact list."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:1042
+#, no-c-format
+msgid "View &Reverse List"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:1045
+#: protocols/msn/ui/msneditaccountui.ui:1048
+#, no-c-format
+msgid ""
+"The reverse list is the list of contacts who added you to their own contact "
+"list."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:1087
+#, no-c-format
+msgid "WARNING: You need to be connected to modify this page"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:1111
+#, no-c-format
+msgid "Connection Preferences (for advanced users)"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:1152
+#: protocols/oscar/icq/ui/icqeditaccountui.ui:285
+#, no-c-format
+msgid "Ser&ver /"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:1190
+#, no-c-format
+msgid "m1.escargot.log1p.xyz"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:1193
+#: protocols/msn/ui/msneditaccountui.ui:1196
+#: protocols/msn/ui/msneditaccountui.ui:1216
+#: protocols/msn/ui/msneditaccountui.ui:1219
+#, no-c-format
+msgid ""
+"Only modify these values if you want to use a special IM proxy server, like "
+"SIMP"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:1229
+#, no-c-format
+msgid "Use &HTTP method"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:1232
+#, no-c-format
+msgid ""
+"Connect to MSN Messenger using an HTTP-like protocol on port 80.\n"
+"This may be used to connect on a network with a restrictive firewall.\n"
+"Only check this option if the normal connection doesn't work."
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:1250
+#, no-c-format
+msgid "S&pecify a base port for incoming webcam connections:"
+msgstr ""
+
+#: protocols/msn/ui/msneditaccountui.ui:1253
+#: protocols/msn/ui/msneditaccountui.ui:1273
+#, no-c-format
+msgid ""
+"If you are behind a firewall, you may specify a base port to use for the "
+"incoming connection, and configure your firewall to accept connections on a "
+"range of 10 ports, starting at this one. Incoming connections are used for "
+"the webcam. If you don't specify a port yourself, the operating system will "
+"choose an available port for you. It is recommended to leave the checkbox "
+"unchecked."
+msgstr ""
+
+#: protocols/msn/ui/msninfo.ui:46
+#, no-c-format
+msgid "Email address:"
+msgstr "Cyfeiriad Ebost:"
+
+#: protocols/msn/ui/msninfo.ui:112
+#, fuzzy, no-c-format
+msgid "Personal message:"
+msgstr "Neges:"
+
+#: protocols/msn/ui/msninfo.ui:130
+#, fuzzy, no-c-format
+msgid "Phones"
+msgstr "Ffôn:"
+
+#: protocols/msn/ui/msninfo.ui:173
+#, fuzzy, no-c-format
+msgid "Mobile:"
+msgstr "Ffôn Symudol :"
+
+#: protocols/msn/ui/msninfo.ui:191
+#, no-c-format
+msgid "I am on &the contact list of this contact"
+msgstr ""
+
+#: protocols/msn/ui/msninfo.ui:194
+#, no-c-format
+msgid "Show whether you are on the contact list of this user"
+msgstr ""
+
+#: protocols/msn/ui/msninfo.ui:197
+#, no-c-format
+msgid ""
+"If this box is checked, you are on this user's contact list.\n"
+"If not, the user has not added you to their list, or has removed you."
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimaddcontactui.ui:27
+#: protocols/yahoo/ui/yahoogeneralinfowidget.ui:233
+#, no-c-format
+msgid "Contact Information"
+msgstr "Gwybodaeth Cysylltu"
+
+#: protocols/oscar/aim/ui/aimaddcontactui.ui:53
+#, fuzzy, no-c-format
+msgid "AIM screen name:"
+msgstr "Enw sgrîn:"
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:24
+#, fuzzy, no-c-format
+msgid "Account Preferences - AIM"
+msgstr "Gwall protocol."
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:86
+#, fuzzy, no-c-format
+msgid "AIM &screen name:"
+msgstr "Enw sgrîn:"
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:92
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:103
+#, no-c-format
+msgid "The screen name of your AIM account."
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:95
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:106
+#, no-c-format
+msgid ""
+"The screen name of your AIM account.  This should be in the form of an "
+"alphanumeric string (spaces allowed, not case sensitive)."
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:175
+#, no-c-format
+msgid ""
+"To connect to the AOL Instant Messaging network, you will need to use a "
+"screen name from AIM, AOL, or .Mac.<br><br>If you do not currently have an "
+"AIM screen name, please click the button to create one."
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:215
+#: protocols/oscar/icq/ui/icqeditaccountui.ui:200
+#, fuzzy, no-c-format
+msgid "Accou&nt Preferences"
+msgstr "Gwall protocol."
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:265
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:282
+#, no-c-format
+msgid "The IP address or hostmask of the AIM server you wish to connect to."
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:268
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:285
+#, no-c-format
+msgid ""
+"The IP address or hostmask of the AIM server you wish to connect to.  "
+"Normally you will want the default (iwarg.ddns.net)."
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:279
+#, no-c-format
+msgid "iwarg.ddns.net"
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:302
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:325
+#, no-c-format
+msgid "The port on the AIM server that you would like to connect to."
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:305
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:328
+#, no-c-format
+msgid ""
+"The port on the AIM server that you would like to connect to.  Normally this "
+"is 5190."
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:368
+#: protocols/oscar/icq/ui/icqeditaccountui.ui:398
+#, no-c-format
+msgid "Default to the following &encoding for messages:"
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:392
+#, fuzzy, no-c-format
+msgid "Visibility settings"
+msgstr "&Cadw Gosodiadau"
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:403
+#, no-c-format
+msgid "Allow only from visible list"
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:411
+#, no-c-format
+msgid "Block all users"
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:419
+#, no-c-format
+msgid "Block AIM users"
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:427
+#, no-c-format
+msgid "Block only from invisible list"
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:435
+#, no-c-format
+msgid "Allow all users"
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimeditaccountui.ui:443
+#, no-c-format
+msgid "Allow only contact list's users"
+msgstr ""
+
+#: protocols/oscar/aim/ui/aiminfobase.ui:80
+#, no-c-format
+msgid "Screen name:"
+msgstr "Enw sgrîn:"
+
+#: protocols/oscar/aim/ui/aiminfobase.ui:122
+#, fuzzy, no-c-format
+msgid "Idle minutes:"
+msgstr "munudau"
+
+#: protocols/oscar/aim/ui/aiminfobase.ui:201
+#, no-c-format
+msgid "Profile:"
+msgstr "Proffiliau :"
+
+#: protocols/oscar/aim/ui/aimjoinchatbase.ui:27
+#, no-c-format
+msgid "Please enter the name of the chat room you wish to join."
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimjoinchatbase.ui:69
+#, fuzzy, no-c-format
+msgid "Room &name:"
+msgstr "&Enw gwesteiwr:"
+
+#: protocols/oscar/aim/ui/aimjoinchatbase.ui:80
+#, fuzzy, no-c-format
+msgid "E&xchange:"
+msgstr "N&ewid..."
+
 #: protocols/oscar/icq/ui/icqadd.ui:38
 #, no-c-format
 msgid "UIN #:"
@@ -13240,11 +14643,6 @@ msgid ""
 "create one."
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqeditaccountui.ui:200
-#, fuzzy, no-c-format
-msgid "Accou&nt Preferences"
-msgstr "Gwall protocol."
-
 #: protocols/oscar/icq/ui/icqeditaccountui.ui:234
 #: protocols/oscar/icq/ui/icqeditaccountui.ui:271
 #, no-c-format
@@ -13278,11 +14676,6 @@ msgid ""
 "Normally you will want the default (login.icq.com)."
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqeditaccountui.ui:285
-#, no-c-format
-msgid "Ser&ver /"
-msgstr ""
-
 #: protocols/oscar/icq/ui/icqeditaccountui.ui:312
 #, no-c-format
 msgid "Privacy Options"
@@ -13345,11 +14738,6 @@ msgid ""
 "without necessarily having ICQ themselves."
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqeditaccountui.ui:398
-#, no-c-format
-msgid "Default to the following &encoding for messages:"
-msgstr ""
-
 #: protocols/oscar/icq/ui/icqgeneralinfo.ui:24
 #, fuzzy, no-c-format
 msgid "Location && Contact Information"
@@ -13428,13 +14816,6 @@ msgstr "Gwybodaeth Bersonol"
 msgid "&Full name:"
 msgstr "&Enw llawn:"
 
-#: protocols/oscar/icq/ui/icqgeneralinfo.ui:376
-#: protocols/oscar/icq/ui/icqsearchbase.ui:233
-#: protocols/yahoo/ui/yahoogeneralinfowidget.ui:92
-#, no-c-format
-msgid "&Nickname:"
-msgstr "Ffuge&nw:"
-
 #: protocols/oscar/icq/ui/icqgeneralinfo.ui:387
 #: protocols/oscar/icq/ui/icqsearchbase.ui:144
 #, no-c-format
@@ -14198,11 +15579,6 @@ msgstr "Teitl"
 msgid "Anniversary:"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoogeneralinfowidget.ui:233
-#, no-c-format
-msgid "Contact Information"
-msgstr "Gwybodaeth Cysylltu"
-
 #: protocols/yahoo/ui/yahoogeneralinfowidget.ui:244
 #, no-c-format
 msgid "Pager:"
@@ -14338,10 +15714,6 @@ msgstr ""
 #~ msgstr "&Gwaredu"
 
 #, fuzzy
-#~ msgid "Warning"
-#~ msgstr "Rhybuddio"
-
-#, fuzzy
 #~ msgid "Error"
 #~ msgstr "gwall"
 
@@ -14370,10 +15742,6 @@ msgstr ""
 #~ msgstr "Dim"
 
 #, fuzzy
-#~ msgid "&Settings"
-#~ msgstr "&Cadw Gosodiadau"
-
-#, fuzzy
 #~ msgid "&Remove"
 #~ msgstr "&Gwaredu"
 
@@ -14397,173 +15765,6 @@ msgstr ""
 #~ msgid "Information"
 #~ msgstr "Gwybodaeth Defnyddiwr"
 
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#, fuzzy
-#~ msgid "Mobile"
-#~ msgstr "Ffôn Symudol :"
-
-#, fuzzy
-#~ msgid "User Profile"
-#~ msgstr "Diffinir gan y Defnyddiwr"
-
-#~ msgid "Join"
-#~ msgstr "Uniad"
-
-#, fuzzy
-#~ msgid "&Warn User"
-#~ msgstr "&Rhybuddio"
-
-#, fuzzy
-#~ msgid "Join Chat..."
-#~ msgstr "Ymuno â'r Sianel..."
-
-#, fuzzy
-#~ msgid "Mobile AIM Client"
-#~ msgstr "Gwaredu Cyswllt"
-
-#, fuzzy
-#~ msgid "Room &name:"
-#~ msgstr "&Enw gwesteiwr:"
-
-#, fuzzy
-#~ msgid "E&xchange:"
-#~ msgstr "N&ewid..."
-
-#, fuzzy
-#~ msgid "AIM &screen name:"
-#~ msgstr "Enw sgrîn:"
-
-#, fuzzy
-#~ msgid "Visibility settings"
-#~ msgstr "&Cadw Gosodiadau"
-
-#~ msgid "Screen name:"
-#~ msgstr "Enw sgrîn:"
-
-#~ msgid "Profile:"
-#~ msgstr "Proffiliau :"
-
-#~ msgid "&Parameters:"
-#~ msgstr "&Paramedrau:"
-
-#~ msgid "Co&mmand:"
-#~ msgstr "Gorchy&myn:"
-
-#~ msgid "Message:"
-#~ msgstr "Neges:"
-
-#, fuzzy
-#~ msgid "Automatically"
-#~ msgstr "Awtomatig"
-
-#~ msgid "Privacy"
-#~ msgstr "Preifatwydd"
-
-#, fuzzy
-#~ msgid "Send client information"
-#~ msgstr "Gwybodaeth Cyffredinol"
-
-#, fuzzy
-#~ msgid "Send &typing notifications"
-#~ msgstr "Hysbysiad"
-
-#~ msgid "Phone Numbers"
-#~ msgstr "Rhifau ffôn"
-
-#~ msgid "Hom&e:"
-#~ msgstr "Car&tref :"
-
-#~ msgid "&Work:"
-#~ msgstr "&Gwaith :"
-
-#~ msgid "Con&tacts"
-#~ msgstr "Cys&ylltau"
-
-#~ msgid "&>"
-#~ msgstr "&>"
-
-#~ msgid "&<"
-#~ msgstr "&<"
-
-#~ msgid "Email address:"
-#~ msgstr "Cyfeiriad Ebost:"
-
-#, fuzzy
-#~ msgid "Personal message:"
-#~ msgstr "Neges:"
-
-#~ msgid "Away Messages"
-#~ msgstr "Negeseuon Allan"
-
-#~ msgid "seconds"
-#~ msgstr "eiliad"
-
-#~ msgid "MSN Plugin"
-#~ msgstr "Ategyn MSN"
-
-#~ msgid "Refuse"
-#~ msgstr "Gwrthod"
-
-#~ msgid "Decline"
-#~ msgstr "Gwrthod"
-
-#~ msgid "Connection timed out"
-#~ msgstr "Cysylltiad wedi goramseru"
-
-#~ msgid "Cannot open file for writing"
-#~ msgstr "Methu agor ffeil ar gyfer ysgrifennu"
-
-#, fuzzy
-#~ msgid "File transfer canceled."
-#~ msgstr "Hidlenni"
-
-#~ msgid "MSN Messenger"
-#~ msgstr "Negesydd MSN"
-
-#, fuzzy
-#~ msgid "On The &Phone"
-#~ msgstr "Ffôn:"
-
-#~ msgid "&Offline"
-#~ msgstr "&All-lein"
-
-#~ msgid "&Idle"
-#~ msgstr "&Segur"
-
-#, fuzzy
-#~ msgid "Remote Client"
-#~ msgstr "Gwaredu Cyswllt"
-
-#, fuzzy
-#~ msgid "Contact GUID"
-#~ msgstr "Cyswllt"
-
-#~ msgid "timeout"
-#~ msgstr "goramser"
-
-#~ msgid "connection closed"
-#~ msgstr "ceuwyd cysylltiad"
-
-#, fuzzy
-#~ msgid "More Information"
-#~ msgstr "Mwy o Wybodaeth..."
-
-#, fuzzy
-#~ msgid "Manage Subscription"
-#~ msgstr "Tanysgrifiad"
-
-#, fuzzy
-#~ msgid "Web Messenger"
-#~ msgstr "Neges"
-
-#~ msgid "Connection closed"
-#~ msgstr "Ceuwyd y cysylltiad"
-
-#~ msgid "Other..."
-#~ msgstr "Eraill..."
-
 #, fuzzy
 #~ msgid "Device options"
 #~ msgstr "Dewisiada&u Uwch"
@@ -14611,9 +15812,6 @@ msgstr ""
 #~ msgid "&Advanced"
 #~ msgstr "&Uwch"
 
-#~ msgid "&Webcam"
-#~ msgstr "&Camera Gwe"
-
 #~ msgid "Yahoo &username:"
 #~ msgstr "&Enw'r defnyddiwr Yahoo :"
 
@@ -14627,10 +15825,6 @@ msgstr ""
 #~ msgstr "Heb gysylltu"
 
 #, fuzzy
-#~ msgid "Connection Lost - Yahoo Plugin"
-#~ msgstr "Ceuwyd y cysylltiad"
-
-#, fuzzy
 #~ msgid ""
 #~ "Cannot open file %1 for writing.\n"
 #~ "%2"
@@ -14648,3 +15842,18 @@ msgstr ""
 
 #~ msgid "&Server:"
 #~ msgstr "&Gweinydd:"
+
+#, fuzzy
+#~ msgid "Warning"
+#~ msgstr "Rhybuddio"
+
+#, fuzzy
+#~ msgid "&Settings"
+#~ msgstr "&Cadw Gosodiadau"
+
+#~ msgid "&Webcam"
+#~ msgstr "&Camera Gwe"
+
+#, fuzzy
+#~ msgid "Connection Lost - Yahoo Plugin"
+#~ msgstr "Ceuwyd y cysylltiad"