merge new tool mdkonline_tui

1 files changed, 239 insertions, 84 deletions

diff --git a/po/af.po b/po/af.po
index 200a6b3f..aab0a2e4 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-af\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-02-27 21:12+0200\n"
 "Last-Translator: Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
 "Language-Team: Afrikaans\n"
@@ -17,226 +17,271 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Vir enige probleem stuur 'n e-pos na support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../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 "Installeer updaterings"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Konfigureer die Netwerk"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Kyk vir Opdaterings"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Aanlyn Webwerf"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Konfigureer die Netwerk"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Konfigureer"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Updates Applet"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Aksies"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Konfigureer"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "Kyk vir Opdaterings"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Bekyk staaflêers"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Status"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Maak toe"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Af"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Netwerk konneksie: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Op"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Af"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Laaste gemerk: "
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Nuwe Opdaterings: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Kyk vir Opdaterings"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Konneksie probleem"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../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 ""
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Verkeerde wagwoord\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
 #: ../mdkapplet:348
-#, fuzzy
+#, fuzzy, c-format
 msgid "No check"
 msgstr "Laaste gemerk: "
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Staaflêers"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Maak skoon"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Omtrent.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Eindig"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Volgende"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Vorige"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Verlaar Wysgeer"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Vorige"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Welkom by 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"
@@ -246,56 +291,68 @@ msgstr ""
 "(pakkette, hardeware konfigurasie) na 'n sentrale databasis sodat\n"
 "jy op datum gehou kan word met sekuriteit en ander waardevolle nuus.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Skep 'n Mandrakeonline Rekening"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Ek het nie 'n Mandrakeonline rekening nie en ek wil "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Inskryf"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Inteken:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Bevestig Wagwoord:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "E-pos kontak:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux se Privaatheidsbeleid"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Identifikasie"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Sleutel in jou Mandrakeonline inteken, wagwoord, en masjiennaam:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Masjiennaam:"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Konfigurasie"
 
-#: ../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"
@@ -329,11 +386,18 @@ msgstr ""
 "Laastens, jy sal 'n e-pos alias kry in die vorm\n"
 "   you-naam@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Klaar"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Die oplaai was suksesvol!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -341,7 +405,8 @@ msgstr ""
 "Van nou af sal jy sekuritiets en opgradeerings nuus kry\n"
 "vanaf 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"
@@ -349,27 +414,28 @@ msgstr ""
 "Mandrakeonline gee jou die vermoë op die opgradeerings te automatiseer.\n"
 "'n Program sal gereeld op jou stelsel loop en wag vir nuwe opgradeerings\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Die oplaai was suksesvol!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatiese Upgradëerings"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Land:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Fout"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Voorsien u aantekennaam"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -378,38 +444,48 @@ msgstr ""
 "probeer weer\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Nie-geldige e-pos adres!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Lees konfigurasie\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Stuur konfigurasie..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Konneksie probleem"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Beëndig Assistent\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeupdate kon nie die webruimte kontak nie, ons sal weer probeer"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Verkeerde wagwoord"
 
-#: ../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 "
@@ -426,8 +502,83 @@ msgstr ""
 "spesifiseer\n"
 "(net alfabetiese karakters word toegelaat)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "Anntekennaam en wagwoord moet minder as 12 karakters wees\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Spesiale karakters word nie geduld nie\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Voorsien asselbief alle velde\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "e-pos nie geldig nie\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "Rekening bestaan reeds\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Probleem om na bediener te konnekteer\n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Welkom by 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 "Welkom by Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Verkeerde wagwoord"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Land:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -443,24 +594,53 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - loods MandrakeUpdate.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - loods Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - loods Mandrakeupdate.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate kon nie die webruimte kontak nie, ons sal weer probeer"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Kon nie pakette vanaf mdkupdate media opgradeer nie.\n"
+
+#: ../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 ""
+
 #~ msgid "Launch Mandrakelinux Update"
 #~ msgstr "Loods \"Mandrakelinux Update\""
 
@@ -480,42 +660,21 @@ msgstr "  --update       - loods Mandrakeupdate.\n"
 #~ msgid "Creation"
 #~ msgstr "Skep"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "Anntekennaam en wagwoord moet minder as 12 karakters wees\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Spesiale karakters"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Spesiale karakters word nie geduld nie\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Leë velde"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Voorsien asselbief alle velde\n"
-
 #~ msgid "Email"
 #~ msgstr "e-pos"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "e-pos nie geldig nie\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "Rekening bestaan reeds\n"
-
 #~ msgid "Change account"
 #~ msgstr "Verander rekening"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Probleem om na bediener te konnekteer\n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Bediener probleem"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Kon nie pakette vanaf mdkupdate media opgradeer nie.\n"
-
 #, fuzzy
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Welkom by Mandrakeonline"
@@ -527,10 +686,6 @@ msgstr "  --update       - loods Mandrakeupdate.\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Ja ek soek automatiese nuus"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "Mandrakeupdate kon nie die webruimte kontak nie, ons sal weer probeer"
-
 #~ msgid "Register Now!"
 #~ msgstr "Registreer Nou!"