changed MandrakeSoft -> Mandrakesoft

1 files changed, 138 insertions, 147 deletions

diff --git a/po/cy.po b/po/cy.po
index 07efd2ab..b53f41ec 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-15 17:47+0200\n"
+"POT-Creation-Date: 2004-07-20 14:33+0200\n"
 "PO-Revision-Date: 2004-06-11 21:06-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -14,132 +14,132 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkapplet:62
+#: ../mdkapplet:65
 msgid "No updates available for your system"
 msgstr "Dim diweddariadau ar gael ar gyfer eich system"
 
-#: ../mdkapplet:68
+#: ../mdkapplet:71
 msgid "Config problems. Launch \"configure\" again"
 msgstr "Problem ffurfweddu. Cychwyn \"ffurfweddu\" eto"
 
-#: ../mdkapplet:74
+#: ../mdkapplet:77
 msgid "System is busy. Wait ..."
 msgstr "Mae'r system yn brysur. Arhoswch..."
 
-#: ../mdkapplet:80
+#: ../mdkapplet:83
 #, perl-format
 msgid "%s packages available for update"
 msgstr "%s pecyn ar gael i'w diweddaru"
 
-#: ../mdkapplet:86
+#: ../mdkapplet:89
 msgid "Service not available. Click on \"configuration\""
 msgstr "Nid yw'r gwasanaeth ar gael. Cliciwch \"ffurfweddiad\""
 
-#: ../mdkapplet:92
+#: ../mdkapplet:95
 msgid "Network is down. Click on \"configure Network\""
 msgstr "Nid yw'r rhwydwaith ar gael.  Cliciwch \"ffurfweddu'r Rhwydwaith\""
 
-#: ../mdkapplet:98
+#: ../mdkapplet:101
 msgid "Service deactivated. Waiting for payment..."
 msgstr "Gwasanaeth wedi ei derfynu. Disgwyl taliad..."
 
-#: ../mdkapplet:102
+#: ../mdkapplet:105
 msgid "Launch Mandrake Update"
 msgstr "Cychwyn Diweddariad Mandrake"
 
-#: ../mdkapplet:103
+#: ../mdkapplet:106
 msgid "Configuration"
 msgstr "Ffurfweddiad"
 
-#: ../mdkapplet:104
+#: ../mdkapplet:107
 msgid "Check Updates"
 msgstr "Gwirio Diweddaiad"
 
-#: ../mdkapplet:105
+#: ../mdkapplet:108
 msgid "Online WebSite"
 msgstr "Safle Gwe Ar-lein"
 
-#: ../mdkapplet:106
+#: ../mdkapplet:109
 msgid "Configure Network"
 msgstr "Ffurfweddu'r Rhwydwaith"
 
-#: ../mdkapplet:107
+#: ../mdkapplet:110
 msgid "Configure Now!"
 msgstr "Ffurfweddu!"
 
-#: ../mdkapplet:139
+#: ../mdkapplet:142
 msgid "Mandrake Updates Applet"
 msgstr "Rhaglennig Diweddaru Mandrake"
 
-#: ../mdkapplet:147
+#: ../mdkapplet:150
 msgid "Actions"
 msgstr "Gweithredoedd"
 
-#: ../mdkapplet:149
+#: ../mdkapplet:152
 msgid "Install updates"
 msgstr "Gosod diweddariadau"
 
-#: ../mdkapplet:150
+#: ../mdkapplet:153
 msgid "Configure"
 msgstr "Ffurfweddu"
 
-#: ../mdkapplet:151 ../mdkapplet:163 ../mdkapplet:364
+#: ../mdkapplet:154 ../mdkapplet:166 ../mdkapplet:359
 msgid "Available"
 msgstr "Ar Gael"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:154
 msgid "Check updates"
 msgstr "Gwirio diweddaiad"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:154
 msgid "Checking ..."
 msgstr "Gwirio..."
 
-#: ../mdkapplet:151 ../mdkapplet:163 ../mdkapplet:364
+#: ../mdkapplet:154 ../mdkapplet:166 ../mdkapplet:359
 msgid "Not Available"
 msgstr "Ddim ar Gael"
 
-#: ../mdkapplet:152
+#: ../mdkapplet:155
 msgid "See logs"
 msgstr "Darllen cofnodion"
 
-#: ../mdkapplet:155
+#: ../mdkapplet:158
 msgid "Status"
 msgstr "Statws"
 
-#: ../mdkapplet:158
+#: ../mdkapplet:161
 msgid "Network Connection: "
 msgstr "Cyswllt Rhwydwaith:"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:162
 msgid "Down"
 msgstr "Lawr"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:162
 msgid "Up"
 msgstr "Fyny"
 
-#: ../mdkapplet:162
+#: ../mdkapplet:165
 msgid "New Updates: "
 msgstr "Diweddariadau Newydd:"
 
-#: ../mdkapplet:166
+#: ../mdkapplet:169
 msgid "Last check: "
 msgstr "Gwiriad diwethaf:"
 
-#: ../mdkapplet:172 ../mdkapplet:414
+#: ../mdkapplet:175 ../mdkapplet:409
 msgid "Close"
 msgstr "Cau"
 
-#: ../mdkapplet:194
+#: ../mdkapplet:197
 msgid "Launching drakconnect\n"
 msgstr "Cychwyn drakconnect\n"
 
-#: ../mdkapplet:198
+#: ../mdkapplet:201
 msgid "Launching mdkupdate --applet\n"
 msgstr "Cychwyn mdkupdate --applet\n"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:206
 msgid "Mdkonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
@@ -147,32 +147,32 @@ msgstr ""
 msgid "Computing new updates...\n"
 msgstr "Cyfrifo diweddariadau newydd...\n"
 
-#: ../mdkapplet:221
+#: ../mdkapplet:216
 msgid "Connecting to"
 msgstr "Cysylltu â"
 
-#: ../mdkapplet:243
+#: ../mdkapplet:238
 msgid "Checking... Updates are available\n"
 msgstr "Gwirio... Mae diweddariadau ar gael\n"
 
-#: ../mdkapplet:247
+#: ../mdkapplet:242
 msgid "Unknown state"
 msgstr "Cyflwr anhysbys"
 
-#: ../mdkapplet:248
+#: ../mdkapplet:243
 msgid "Online services disabled. Contact MandrakeOnline site\n"
 msgstr ""
 "Mae'r gwasanaethau ar-lein wedi eu hatal. Cysylltwch â safle MandrakeOnline\n"
 
-#: ../mdkapplet:249
+#: ../mdkapplet:244
 msgid "Wrong Password.\n"
 msgstr "Y cyfrinair anghywir\n"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:245
 msgid "Wrong Action or host or login.\n"
 msgstr "Gweithred, gwestai neu fewngofnod anghywir.\n"
 
-#: ../mdkapplet:251
+#: ../mdkapplet:246
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -180,51 +180,51 @@ msgstr ""
 "Mae rhywbeth o'i le ar osodiadau eich rhwydwaith (gwiriwch eich llwybr, mur "
 "cadarn neu osodiadau dirprwy)\n"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:250
 msgid "System is up to date\n"
 msgstr "Mae'r system yn gyfredol\n"
 
-#: ../mdkapplet:343
+#: ../mdkapplet:338
 msgid "No check"
 msgstr "Dim gwiriad"
 
-#: ../mdkapplet:356
+#: ../mdkapplet:351
 msgid "Checking Network: seems disabled\n"
 msgstr "Gwirio'r Rhwydwaith: i weld wedi ei anablu\n"
 
-#: ../mdkapplet:359
+#: ../mdkapplet:354
 msgid "Checking config file: Not present\n"
 msgstr "Gwirio ffeil ffurfweddiad: Nid yw ar gael\n"
 
-#: ../mdkapplet:404
+#: ../mdkapplet:399
 msgid "Logs"
 msgstr "Cofnodion"
 
-#: ../mdkapplet:420
+#: ../mdkapplet:415
 msgid "Clear"
 msgstr "Clirio"
 
-#: ../mdkapplet:446
+#: ../mdkapplet:441
 msgid "About.."
 msgstr "Ynghylch..."
 
-#: ../mdkapplet:447
+#: ../mdkapplet:442
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../mdkapplet:459
+#: ../mdkapplet:454
 msgid "Attempting to connect to mandrakeonline.net\n"
 msgstr "Ceisio cysylltu â mandrakeonline.net\n"
 
-#: ../mdkonline:98
+#: ../mdkonline:86
 msgid "Skip Wizard"
 msgstr "Osgoi'r Dewin"
 
-#: ../mdkonline:117
+#: ../mdkonline:100
 msgid "Welcome to MandrakeOnline"
 msgstr "Croeso i MandrakeOnline "
 
-#: ../mdkonline:118
+#: ../mdkonline:101
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -236,61 +236,61 @@ msgstr ""
 "(pecynnau, ffurfweddiad caledwedd) i gronfa ddata ganolog er\n"
 "mwyn eich hysbysu am ddiweddariadau diogelwch a defnyddiol.\n"
 
-#: ../mdkonline:119
+#: ../mdkonline:102
 msgid "Create a MandrakeOnline Account"
 msgstr "Creu cyfrif MandrakeOnline "
 
-#: ../mdkonline:121
+#: ../mdkonline:104
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr "Nid oes gennyf gyfrif MandrakeOnline ac mi rydw i eisiau"
 
-#: ../mdkonline:121
+#: ../mdkonline:104
 msgid "Subscribe"
 msgstr "Tanysgrifio"
 
-#: ../mdkonline:125 ../mdkonline:145
+#: ../mdkonline:108 ../mdkonline:128
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../mdkonline:126 ../mdkonline:146
+#: ../mdkonline:109 ../mdkonline:129
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../mdkonline:127
+#: ../mdkonline:110
 msgid "Confirm Password:"
 msgstr "Cadarnhau Cyfrinair:"
 
-#: ../mdkonline:128
+#: ../mdkonline:111
 msgid "Mail contact:"
 msgstr "Cyswllt E-bost"
 
-#: ../mdkonline:135
+#: ../mdkonline:118
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Polisi Preifatrwydd Mandrakelinux"
 
-#: ../mdkonline:141
+#: ../mdkonline:124
 msgid "Authentification"
 msgstr "Dilysu"
 
-#: ../mdkonline:142
+#: ../mdkonline:125
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "Rhowch eich mewngofnod MandrakeOnline, eich cyfrinair ac enw'r peiriant :"
 
-#: ../mdkonline:147
+#: ../mdkonline:130
 msgid "Machine name:"
 msgstr "Enw'r peiriant:"
 
-#: ../mdkonline:152
+#: ../mdkonline:135
 msgid "Send Configuration"
 msgstr "Anfon Ffurfweddiad"
 
-#: ../mdkonline:153
+#: ../mdkonline:136
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
 "\n"
-"The Wizard will now send the following information to MandrakeSoft:\n"
+"The Wizard will now send the following information to Mandrakesoft:\n"
 "1) the list of packages you have installed on your system,\n"
 "2) your hardware configuration.\n"
 "\n"
@@ -307,7 +307,7 @@ msgstr ""
 "Er mwyn manateisio ar wasanaethau MandrakeOnline,\n"
 "rydym ar fin llwytho eich ffurfweddiad i fyny.\n"
 "\n"
-"Bydd y Dewin yn anfon y wybodaeth ganlynol at MandrakeSoft:\n"
+"Bydd y Dewin yn anfon y wybodaeth ganlynol at Mandrakesoft:\n"
 "1) rhestr y pecynnau sydd ar eich system,\n"
 "2) ffurfweddiad eich caledwedd\n"
 "\n"
@@ -321,11 +321,11 @@ msgstr ""
 "gyda eich enw defnyddiwr@mandrakeonline.net yn cael ei ddarparu ar eich "
 "cyfer."
 
-#: ../mdkonline:158 ../mdkonline:269 ../mdkonline:298
+#: ../mdkonline:141 ../mdkonline:208 ../mdkonline:234
 msgid "Finish"
 msgstr "Gorffen"
 
-#: ../mdkonline:159
+#: ../mdkonline:142
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -333,7 +333,7 @@ msgstr ""
 "O hyn ymlaen byddwch yn derbyn cyhoeddiadau\n"
 "diogelwch a diweddariadau gan MandrakeOnline."
 
-#: ../mdkonline:159
+#: ../mdkonline:142
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -341,75 +341,27 @@ msgstr ""
 "Mae MandrakeOnliune yn cynnigf y dewis i chi ddiweddaru'n awtomatig,\n"
 "Bydd rhaglen yn rhedeg yn rheolaidd yn eich system i gasglu diweddariadau.\n"
 
-#: ../mdkonline:159
+#: ../mdkonline:142
 msgid "Your upload was successful!"
 msgstr "Roedd eich llwytho i fyny'n llwyddiant!"
 
-#: ../mdkonline:160
+#: ../mdkonline:143
 msgid "automated Upgrades"
 msgstr "Diweddariadau awtomatig"
 
-#: ../mdkonline:165
+#: ../mdkonline:148
 msgid "Country:"
 msgstr "Gwlad:"
 
-#: ../mdkonline:198
-msgid "Creation"
-msgstr "Crëwyd"
-
-#: ../mdkonline:198
-msgid "Login and password should be less than 12 characters\n"
-msgstr "Dylai'r mewnfofnod a'r gyfrinair fod yn llai na 12 nod\n"
-
-#: ../mdkonline:199
-msgid "Special characters"
-msgstr "Nodau arbennig"
-
-#: ../mdkonline:199
-msgid "Special characters are not allowed\n"
-msgstr "Nid oes caniatâd i nodau arbennig\n"
-
-#: ../mdkonline:200
-msgid "Empty fields"
-msgstr "Meysydd gwag"
-
-#: ../mdkonline:200
-msgid "Please fill in all fields\n"
-msgstr "Llanwch yr holl feysydd\n"
-
-#: ../mdkonline:201
-msgid "Email"
-msgstr "E-bost"
-
-#: ../mdkonline:201
-msgid "Email not valid\n"
-msgstr "Nid yw'r e-bost yn ddilys\n"
-
-#: ../mdkonline:202
-msgid "Account already exist\n"
-msgstr "Mae'r cyfri'n bod eisoes\n"
-
-#: ../mdkonline:202
-msgid "Change account"
-msgstr "Newid cyfrif"
-
-#: ../mdkonline:208
-msgid "Problem connecting to server \n"
-msgstr "Problem cysylltu â'r gweinydd \n"
-
-#: ../mdkonline:208
-msgid "Server Problem"
-msgstr "Problem Gweinydd"
-
-#: ../mdkonline:213 ../mdkonline:215 ../mdkonline:217
+#: ../mdkonline:182 ../mdkonline:184 ../mdkonline:186
 msgid "Error"
 msgstr "Gwall"
 
-#: ../mdkonline:213
+#: ../mdkonline:182
 msgid "Please provide a login"
 msgstr "Rhowch fewngofnod"
 
-#: ../mdkonline:215
+#: ../mdkonline:184
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -417,31 +369,39 @@ msgstr ""
 "Nid yw'r cyfrifneiriau'n cydweddu\n"
 "Ceisiwch eto\n"
 
-#: ../mdkonline:217
+#: ../mdkonline:186
 msgid "Not a valid mail address!\n"
 msgstr "Nid yw'n gyfeiriad e-bost dilys!\n"
 
-#: ../mdkonline:247
+#: ../mdkonline:198
+msgid "Reading configuration\n"
+msgstr "Darllen ffurfweddiad\n"
+
+#: ../mdkonline:203
 msgid "Sending configuration..."
 msgstr "Anfon ffurfweddiad..."
 
-#: ../mdkonline:273 ../mdkonline:349
+#: ../mdkonline:210 ../mdkonline:274
 msgid "Connection problem"
 msgstr "Problem cysylltu"
 
-#: ../mdkonline:273 ../mdkonline:349
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "Methu cysylltu â MandrakeOnline, ceisiwch eto'n nes ymlaen"
+#: ../mdkonline:210
+msgid "Problem occurs when uploading files, please try again"
+msgstr ""
 
-#: ../mdkonline:315
+#: ../mdkonline:251
 msgid "Quitting Wizard\n"
 msgstr "Gadael y Dewin\n"
 
-#: ../mdkonline:361
+#: ../mdkonline:274
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "Methu cysylltu â MandrakeOnline, ceisiwch eto'n nes ymlaen"
+
+#: ../mdkonline:286
 msgid "Wrong password"
 msgstr "Y cyfrinair anghywir"
 
-#: ../mdkonline:361
+#: ../mdkonline:286
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -457,43 +417,74 @@ msgstr ""
 "cofiwch y bydd angen darparu enw Peiriant \n"
 "(gyda dim ond llythrennau)"
 
-#: ../mdkonline:368
-msgid "Reading configuration\n"
-msgstr "Darllen ffurfweddiad\n"
-
-#: ../mdkupdate:58
+#: ../mdkupdate:53
 #, perl-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s MandrakeSoft.\n"
+"Copyright (C) %s Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "fersiwn %s mdkupdate  \n"
-"Hawlfraint (H) %s MandrakeSoft.\n"
+"Hawlfraint (H) %s Mandrakesoft.\n"
 "Mae hwn yn feddalwedd rhydd ac mae modd ei ail ddosbarthu o dan amodau GNU "
 "GPL.\n"
 "\n"
 "defnydd:\n"
 
-#: ../mdkupdate:63
+#: ../mdkupdate:58
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu'r neges cymorth hwn.\n"
 
-#: ../mdkupdate:64
+#: ../mdkupdate:59
 msgid "  --auto         - Mdkupdate launched automatically.\n"
 msgstr "  --auto         - cychwyn Mdkupdate yn awtomatig\n"
 
-#: ../mdkupdate:65
+#: ../mdkupdate:60
 msgid "  --applet       - launch MandrakeUpdate.\n"
 msgstr "  --applet       - cychwyn MandrakeUpdate.\n"
 
-#: ../mdkupdate:66
+#: ../mdkupdate:61
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Allwedd diweddaru\n"
 
-#: ../mdkupdate:276
-msgid "Unable to update packages from mdkupdate medium.\n"
-msgstr "Methu diweddaru pecynnau o gyfrwng mdkupdate\n"
+#~ msgid "Creation"
+#~ msgstr "Crëwyd"
+
+#~ msgid "Login and password should be less than 12 characters\n"
+#~ msgstr "Dylai'r mewnfofnod a'r gyfrinair fod yn llai na 12 nod\n"
+
+#~ msgid "Special characters"
+#~ msgstr "Nodau arbennig"
+
+#~ msgid "Special characters are not allowed\n"
+#~ msgstr "Nid oes caniatâd i nodau arbennig\n"
+
+#~ msgid "Empty fields"
+#~ msgstr "Meysydd gwag"
+
+#~ msgid "Please fill in all fields\n"
+#~ msgstr "Llanwch yr holl feysydd\n"
+
+#~ msgid "Email"
+#~ msgstr "E-bost"
+
+#~ msgid "Email not valid\n"
+#~ msgstr "Nid yw'r e-bost yn ddilys\n"
+
+#~ msgid "Account already exist\n"
+#~ msgstr "Mae'r cyfri'n bod eisoes\n"
+
+#~ msgid "Change account"
+#~ msgstr "Newid cyfrif"
+
+#~ msgid "Problem connecting to server \n"
+#~ msgstr "Problem cysylltu â'r gweinydd \n"
+
+#~ msgid "Server Problem"
+#~ msgstr "Problem Gweinydd"
+
+#~ msgid "Unable to update packages from mdkupdate medium.\n"
+#~ msgstr "Methu diweddaru pecynnau o gyfrwng mdkupdate\n"