merge changes from MNF, MDK-10-update

1 files changed, 247 insertions, 255 deletions

diff --git a/po/et.po b/po/et.po
index 019f7619..bf03f94a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-02 12:50+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Teie süsteemis pole midagi uuendada"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -30,188 +30,198 @@ msgstr ""
 "Teenuse seadistamise probleem. Palun kontrollige logisid ja saatke e-kiri "
 "aadressile support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Süsteem on tegevuses. Palun oodake..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Teie süsteemile on uuendusi"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Teenus pole seadistatud. Palun valige \"Teenuse seadistamine\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Võrk on maas. Palun seadistage võrk"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Teenus pole aktiveeritud. Palun valige \"Veebilehekülg\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Väljalase pole toetatud (liiga vana või arendusversioon)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Uuenduste paigaldamine"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Teenuse seadistamine"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Uuenduste kontrollimine"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Palun oodake"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Uuenduste kontrollimine"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Veebilehekülg"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Võrgu seadistamine"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Seadista"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinuxi uuenduste aplett"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Toimingud"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Seadistused"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Uuenduste kontrollimine"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Logide vaatamine"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Olek"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Sulge"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Võrguühendus: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Olemas"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Puudub"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Viimati kontrollitud: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Uuendused: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnecti käivitamine\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "mdkupdate --applet käivitamine\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline paistab olevat uuesti paigaldatud, aplett laaditakse uuesti..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Uuenduste kontrollimine...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Ühendumine saidiga"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Tere tulemast Mandrakeonline'i"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Kontroll... On uuendusi\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Teenus ei toeta arendusversiooni"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Teenus ei toeta liiga vanu väljalaskeid"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Tundmatu olek"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Võrguteenused ei ole lubatud. Ühendumine Mandrakeonline'i saidiga\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Vale parool.\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Vale toiming või masin või kasutajatunnus.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -220,72 +230,82 @@ msgstr ""
 "Teie võrguseadistustega on midagi valesti (palun kontrollige ruuteri, "
 "tulemüüri või vahendaja (proxy) seadistusi)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Midagi pole uuendada\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Pole kontrollitud"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Võrgu kontroll: paistab, et see on maas\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Konfiguratsioonifaili kontroll: puudub\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logid"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Puhasta"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "Info..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Käivitatakse alati käivitumisel"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Välju"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Järgmine"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
+#, c-format
+msgid "I already have an account"
+msgstr "Mul on juba konto"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Tahan konto luua"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
 #, c-format
-msgid "Cancel"
-msgstr "Loobu"
+msgid "Please wait"
+msgstr "Palun oodake"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Eelmine"
+msgid "Reading configuration\n"
+msgstr "Konfiguratsiooni tuvastamine\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Tere tulemast Mandrakeonline'i"
+msgid "Sending configuration..."
+msgstr "Konfiguratsiooni saatmine..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -296,62 +316,37 @@ msgstr ""
 "(paketid, riistvara) tsentraalsesse andmebaasi, et edaspidi\n"
 "teavitada Teid turvaparandustest ja kasulikest uuendustest.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Mandrakeonline'i konto loomine"
+msgid "Account creation or authentication"
+msgstr "Konto loomine või autentimine"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Mul ei ole veel Mandrakeonline'i kontot, aga ma tahan seda"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Sisestage oma Mandrakeonline'i kasutajatunnus, parool ja masina nimi:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Kasutajatunnus:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Parool teist korda:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "E-posti aadress:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinuxi privaatsuspoliitika"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Autentimine"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, c-format
-msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Sisestage oma Mandrakeonline'i kasutajatunnus, parool ja masina nimi:"
-
-#: ../mdkonline:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Masina nimi:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Saada konfiguratsioon"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Ühendumine Mandrakeonline'i saidiga..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -383,55 +378,56 @@ msgstr ""
 "Lisaks saate hinnaalandust www.mandrakeexpert.com tasuliste\n"
 "teenuste puhul."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Lõpeta"
+msgid "Connection problem"
+msgstr "Probleem ühendusega"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Saatmine õnnestus!"
+msgid "or"
+msgstr "või"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Nüüdsest alates saate tänu Mandrakeonline'ile \n"
-"teateid turvaparanduste ja uuenduste kohta."
+msgid "wrong password:"
+msgstr "vale parool:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, 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"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline pakub võimalust uuendamine automaatseks muuta.\n"
-"Selleks käivitatakse Teie arvutis regulaarselt rakendus, mis otsib uuendusi\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "Automaatne uuendamine"
+"Teie kasutajatunnus või parool oli vale.\n"
+" Te peate selle uuesti sisestama või siis looma endale konto "
+"Mandrakeonline'is.\n"
+" Viimasel juhul minge tagasi esimese sammu juurde, et saada ühendus "
+"Mandrakeonline'iga.\n"
+" Pange tähele, et teatada tuleb ka oma masina nimi \n"
+" (lubatud on ainult tähed)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Riik:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Mandrakeonline'i konto loomine"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Viga"
+msgid "Confirm Password:"
+msgstr "Parool teist korda:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Palun andke kasutajatunnus"
+msgid "Mail contact:"
+msgstr "E-posti aadress:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -440,162 +436,117 @@ msgstr ""
 "Paroolid ei klapi\n"
 " Palun proovige uuesti\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Palun andke kasutajatunnus"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "See ei ole korrektne e-posti aadress!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Konfiguratsiooni tuvastamine\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Mandrakeonline'i konto edukalt loodud.\n"
+"Palun klõpsake nupule \"Järgmine\" autentimiseks ja oma konfiguratsiooni "
+"saatmiseks\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Konfiguratsiooni saatmine..."
+msgid "Your upload was successful!"
+msgstr "Saatmine õnnestus!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Probleem ühendusega"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Nüüdsest alates saate tänu Mandrakeonline'ile \n"
+"teateid turvaparanduste ja uuenduste kohta."
+
+#: ../mdkonline:178
+#, 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"
+msgstr ""
+"Mandrakeonline pakub võimalust uuendamine automaatseks muuta.\n"
+"Selleks käivitatakse Teie arvutis regulaarselt rakendus, mis otsib uuendusi\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Tekkis viga failide saatmisel, palun proovige uuesti"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Nõustajast väljumine\n"
+msgid "Country"
+msgstr "Riik"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, c-format
-msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline'iga ei saadud ühendust, palun proovige hiljem uuesti"
+msgid "Congratulations"
+msgstr "Õnnitlused!"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Vale parool"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Teie Mandrakeonline'i konto on edukalt loodud\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Saatmine õnnestus!"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Konfiguratsiooni tuvastamine\n"
+
+#: ../mdkonline:216
 #, 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 "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Teie kasutajatunnus või parool oli vale.\n"
-" Te peate selle uuesti sisestama või siis looma endale konto "
-"Mandrakeonline'is.\n"
-" Viimasel juhul minge tagasi esimese sammu juurde, et saada ühendus "
-"Mandrakeonline'iga.\n"
-" Pange tähele, et teatada tuleb ka oma masina nimi \n"
-" (lubatud on ainult tähed)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Kasutajatunnuses ja paroolis tohib olla kuni 12 sümbolit\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Erisümbolid ei ole lubatud\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Palun täitke kõik väljad\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "E-posti aadress pole korrektne\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Konto on juba olemas\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Probleem serveriga ühendumisel \n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Mul on juba konto"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Tahan konto luua"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Palun oodake"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Konto loomine või autentimine"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Ühendumine Mandrakeonline'i saidiga..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "või"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "vale parool:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Mandrakeonline'i konto edukalt loodud.\n"
-"Palun klõpsake nupule \"Järgmine\" autentimiseks ja oma konfiguratsiooni "
-"saatmiseks\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Riik"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Õnnitlused!"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Teie Mandrakeonline'i konto on edukalt loodud\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -612,42 +563,37 @@ msgstr ""
 "\n"
 "kasutamine:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - näitab seda abiteadet.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate käivitatakse automaatselt.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - käivitatakse Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - uuendatakse võtmeid\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "%s faili ei leitud. Käivitage palun mdkonline'i nõustaja"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
 msgstr "Mandrakeupdate ei suutnud ühendust luua, palun proovige hiljem uuesti."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, c-format
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Pakettide värskendamine mdkupdate andmekandjalt ebaõnnestus.\n"
 
-#: ../mdkupdate:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
@@ -655,3 +601,49 @@ msgid ""
 msgstr ""
 "Mandrakeupdate ei suutnud võrdlusfaile laadida. Saatke palun e-kiri "
 "aadressile support@mandrakeonline.net"
+
+#~ msgid "Next"
+#~ msgstr "Järgmine"
+
+#~ msgid "Cancel"
+#~ msgstr "Loobu"
+
+#~ msgid "Previous"
+#~ msgstr "Eelmine"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Mul ei ole veel Mandrakeonline'i kontot, aga ma tahan seda"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinuxi privaatsuspoliitika"
+
+#~ msgid "Authentification"
+#~ msgstr "Autentimine"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Saada konfiguratsioon"
+
+#~ msgid "Finish"
+#~ msgstr "Lõpeta"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "Automaatne uuendamine"
+
+#~ msgid "Country:"
+#~ msgstr "Riik:"
+
+#~ msgid "Error"
+#~ msgstr "Viga"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Nõustajast väljumine\n"
+
+#~ msgid ""
+#~ "Mandrakeonline could not be contacted, please try again at a later time"
+#~ msgstr "Mandrakeonline'iga ei saadud ühendust, palun proovige hiljem uuesti"
+
+#~ msgid "Wrong password"
+#~ msgstr "Vale parool"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - uuendatakse võtmeid\n"