merge new tool mdkonline_tui

1 files changed, 239 insertions, 48 deletions

diff --git a/po/cy.po b/po/cy.po
index 4740aba1..c6dab2f1 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-23 20:53-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -15,10 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Mae'r system yn gyfredol"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -27,153 +29,190 @@ msgstr ""
 "support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Mae'r system yn brysur. Arhoswch..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Mae diweddariadau newydd ar gael ar gyfer eich system"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Nid yw'r gwasanaeth wedi ei ffurfweddu. Cliciwch \"Ffurfweddu'r gwasanaeth\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Nid yw'r rhwydwaith ar gael.  Ffurfweddwch eich rhwydwaith"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Nid yw'r gwasanaeth ar gael. Cliciwch \"Gwefan Ar-lein\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Gosod diweddariadau"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Ffurfweddu'r gwasanaeth"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Gwirio Diweddariad"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Safle Gwe Ar-lein"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Ffurfweddu'r Rhwydwaith"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Ffurfweddu!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Rhaglennig Diweddaru Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Gweithredoedd"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Ffurfweddu"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Gwirio diweddariad"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Darllen cofnodion"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Statws"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Cau"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Lawr"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Cyswllt Rhwydwaith:"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Fyny"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Lawr"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Gwiriad diwethaf:"
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Diweddariadau:"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Cychwyn drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Cychwyn mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mae Mandrakeonline i'w weld wedi ei ail osod, ail lwytho'r rhaglennig..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Cyfrifo diweddariadau newydd...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Cysylltu â"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Gwirio... Mae diweddariadau ar gael\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Cyflwr anhysbys"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Mae'r gwasanaethau ar-lein wedi eu hatal. Cysylltwch â safle Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Y cyfrinair anghywir\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Gweithred, gwestai neu fewngofnod anghywir.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -182,58 +221,72 @@ msgstr ""
 "cadarn neu osodiadau dirprwy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Mae'r system yn gyfredol\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Dim gwiriad"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Gwirio'r Rhwydwaith: i weld wedi ei anablu\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Gwirio ffeil ffurfweddiad: Nid yw ar gael\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Cofnodion"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Clirio"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Ynghylch..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Cychwyn wrth gychwyn"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Nesaf"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Blaenorol"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Osgoi'r Dewin"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Blaenorol"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Croeso i Mandrakeonline "
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -243,56 +296,69 @@ msgstr ""
 "(pecynnau, ffurfweddiad caledwedd) i gronfa ddata canolog er\n"
 "mwyn eich hysbysu am ddiweddariadau diogelwch a defnyddiol.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Creu cyfrif Mandrakeonline "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Nid oes gennyf gyfrif Mandrakeonline ac mi rydw i eisiau"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Tanysgrifio"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Cadarnhau Cyfrinair:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Cyswllt E-bost"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Polisi Preifatrwydd Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Dilysu"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Rhowch eich mewngofnod Mandrakeonline, eich cyfrinair ac enw'r peiriant :"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Enw'r peiriant:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Anfon Ffurfweddiad"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -328,11 +394,18 @@ msgstr ""
 "gyda eich enw defnyddiwr@mandrakeonline.net yn cael ei ddarparu ar eich "
 "cyfer."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Gorffen"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Roedd eich llwytho i fyny'n llwyddiant!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -340,7 +413,8 @@ msgstr ""
 "O hyn ymlaen byddwch yn derbyn cyhoeddiadau\n"
 "diogelwch a diweddariadau gan Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -348,27 +422,28 @@ msgstr ""
 "Mae MandrakeOnline yn cynnig y dewis i chi ddiweddaru'n awtomatig,\n"
 "Bydd rhaglen yn rhedeg yn rheolaidd yn eich system i gasglu diweddariadau.\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Roedd eich llwytho i fyny'n llwyddiant!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Diweddariadau awtomatig"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Gwlad:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Gwall"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Rhowch fewngofnod"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -377,38 +452,48 @@ msgstr ""
 "Ceisiwch eto\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Nid yw'n gyfeiriad e-bost dilys!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Darllen ffurfweddiad\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Anfon ffurfweddiad..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problem cysylltu"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Mae problem yn digwydd wrth lwytho ffeiliau i fyny, ceisiwch eto."
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Gadael y Dewin\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Methu cysylltu â Mandrakeonline, ceisiwch eto'n nes ymlaen"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Y cyfrinair anghywir"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 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 "
@@ -424,8 +509,83 @@ msgstr ""
 "cofiwch y bydd angen darparu enw Peiriant \n"
 "(gyda dim ond llythrennau)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Croeso i Mandrakeonline "
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Croeso i Mandrakeonline "
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Y cyfrinair anghywir"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Gwlad:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -441,18 +601,49 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu'r neges cymorth hon.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - cychwyn Mandrakeupdate yn awtomatig\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - cychwyn Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Allwedd diweddaru\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Methu cysylltu â Mandrakeonline, ceisiwch eto'n nes ymlaen"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""