updated pot file

61 files changed, 13951 insertions, 14100 deletions

diff --git a/mdkonline b/mdkonline
index e54ff66e..51805c2c 100755
--- a/mdkonline
+++ b/mdkonline
@@ -131,13 +131,13 @@ gtkappend_page($o->{nb},
 	      );
 gtkappend_page($o->{nb},
 	       gtkpack_(Gtk2::VBox->new(0, 3),
-			0,  set_darea(N(""), 'sendingconf'),
+			0,  set_darea("", 'sendingconf'),
 			1, Gtk2::Label->new(N("In order to benefit from MandrakeOnline services,\nwe are about to upload your configuration.\n\nThe Wizard will now send the following information to MandrakeSoft:\n1) the list of packages you have installed on your system,\n2) your hardware configuration.\n\nIf you feel uncomfortable by that idea, or do not want to benefit from this service,\nplease press 'Cancel'. By pressing 'Next', you allow us to keep you informed\nabout security updates and useful upgrades via personalized email alerts.\nFurthermore, you benefit from discounted paid support services on\nwww.mandrakeexpert.com.\nFinally, an email alias with your username\@mandrakeonline.net will be provided to you.")) 
 		       )
 	      );
 gtkappend_page($o->{nb},
 	       gtkpack_(Gtk2::VBox->new(0, 3),
-			0, set_darea(N(""), 'end'),
+			0, set_darea("", 'end'),
 			1, new Gtk2::Label->new("\n\n" . N("Your upload was successful!") . "\n" . N("From now you will receive on security and updates \nannouncements thanks to MandrakeOnline.") . "\n\n" . N("MandrakeOnline offers you the ability to automate the updates.\nA program will run regulary in your system waiting for new updates\n")),
 			0, gtkadd(Gtk2::Frame->new(N("automated Upgrades")),
 				  gtkpack_(Gtk2::VBox->new(0, 3),
diff --git a/po/af.po b/po/af.po
index 6423bacf..53e1b644 100644
--- a/po/af.po
+++ b/po/af.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-22 02:28+0200\n"
 "Last-Translator: Jean-Pierre van der Poel <sage@af.org.za>\n"
 "Language-Team: Afrikaans <lia@af.org.za>\n"
@@ -15,118 +15,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asie"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Noord-Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Suid-Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Volgende"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Klaar"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Eindig"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Terug"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Ek het nie 'n MandrakeOnline rekening nie en ek wil "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Inskryf"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Ja ek soek automatiese nuus"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Beëndig Assistent\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Waarskuwing: Geen blaaier aangewys nie"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Konneksie probleem"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Konneksie probleem"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-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:294
-msgid "Wrong password"
-msgstr "Verkeerde wagwoord"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"You inteken of wagwoord was verkeerd.\n"
-"Of jy moet dit weer intik, of jy moet 'n rekening skep by MandrakeOnline.\n"
-"Indien laasgenoemde, gaan terug na die eerste stap om te konnekteer na\n"
-"MandrakeOnline. Hou ingedagte dat jy ook 'n Masjiennaam sal moet "
-"spesifiseer\n"
-"(net alfabetiese karakters word toegelaat)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Welkom by MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -138,35 +35,53 @@ msgstr ""
 "(pakkette, hardeware konfigurasie) na 'n sentrale databasis sodat\n"
 "jy op datum gehou kan word met sekuriteit en ander waardevolle nuus.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Welkom by MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Ek het nie 'n MandrakeOnline rekening nie en ek wil "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Inskryf"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Inteken:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Wagwoord:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Wagwoord:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake Privaatheid Polisie"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Identifikasie"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Sleutel in jou MandrakeOnline inteken, wagwoord, en masjiennaam:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Inteken:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Masjiennaam:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Wagwoord:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Verstuur jou konfigurasie"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -200,25 +115,7 @@ msgstr ""
 "Laastens, jy sal 'n e-pos alias kry in die vorm\n"
 "   you-naam@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Fout tydens informasie stuur"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Daar was 'n fout tydens die verstuur van jou persoonlike inligting.\n"
-"\n"
-"Kliek 'Volgende' om weer te probeer."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Klaar"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -226,7 +123,7 @@ msgstr ""
 "Van nou af sal jy sekuritiets en opgradeerings nuus kry\n"
 "vanaf MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -234,111 +131,138 @@ 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:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Die oplaai was suksesvol!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automatiese Upgradëerings"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Kies jou geografiese posisie"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Ja ek soek automatiese nuus"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Lees konfigurasie\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "Reg"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Kanselleer"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
-"Wil jy rerig MandrakeOnline staak?\n"
-"Om terug te keer na die Assistent, kliek 'Kanselleer',\n"
-"om rerig te staak, kliek 'Eindig'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Rerig staak? - MandrakeOnline"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Klaar"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Beëndig Assistent\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Konneksie probleem"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Konneksie probleem"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+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:273
+msgid "Wrong password"
+msgstr "Verkeerde wagwoord"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"You inteken of wagwoord was verkeerd.\n"
+"Of jy moet dit weer intik, of jy moet 'n rekening skep by MandrakeOnline.\n"
+"Indien laasgenoemde, gaan terug na die eerste stap om te konnekteer na\n"
+"MandrakeOnline. Hou ingedagte dat jy ook 'n Masjiennaam sal moet "
+"spesifiseer\n"
+"(net alfabetiese karakters word toegelaat)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Maak toe"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Lees konfigurasie\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -398,3 +322,75 @@ msgstr "Kon nie mdkupdate media maak nie.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Kon nie pakette vanaf mdkupdate media opgradeer nie.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Asie"
+
+#~ msgid "Australia"
+#~ msgstr "Australia"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "Noord-Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Suid-Amerika"
+
+#~ msgid "Next"
+#~ msgstr "Volgende"
+
+#~ msgid "Quit"
+#~ msgstr "Eindig"
+
+#~ msgid "Back"
+#~ msgstr "Terug"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Waarskuwing: Geen blaaier aangewys nie"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Verstuur jou konfigurasie"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Fout tydens informasie stuur"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Daar was 'n fout tydens die verstuur van jou persoonlike inligting.\n"
+#~ "\n"
+#~ "Kliek 'Volgende' om weer te probeer."
+
+#~ msgid "Finished"
+#~ msgstr "Klaar"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Kies jou geografiese posisie"
+
+#~ msgid "OK"
+#~ msgstr "Reg"
+
+#~ msgid "Cancel"
+#~ msgstr "Kanselleer"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Wil jy rerig MandrakeOnline staak?\n"
+#~ "Om terug te keer na die Assistent, kliek 'Kanselleer',\n"
+#~ "om rerig te staak, kliek 'Eindig'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Rerig staak? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Maak toe"
diff --git a/po/ar.po b/po/ar.po
index f1bb4a63..e93794a6 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-13 19:30+0100\n"
 "Last-Translator: Youcef Rabah Rahal <rahal@arabeyes.org>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -17,115 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "أفريقيا"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "آسيا"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "أوستراليا"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "أوروبا"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "أمريكا الشمالية"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "أمريكا الجنوبية"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "التالي"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "انهاء"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "خروج"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "السابق"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "ليس لدي حساب في Mandrake Online و أريد أن"
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "اشتراك"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "نعم أريد تحديثات آلية"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "جاري الخروج من المعالج\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "موقع مرآة فارغ"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "موقع مرآة فارغ. إختر موقعا من فضلك."
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "تحذير: لم يتم تحديد المتصفح"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "جاري الإتّصال...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "مشكلة في الإتصال"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "تعذّر الإتّصال بـ MandrakeOnline، يرجى تجديد المحاولة فيما بعد"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "كلمة مرور خاطئة"
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"إن إسم دخولك أو كلمة المرور خاطئة\n"
-" إما أن تدخلهما من جديد أو أن تنشأ رصيدا عند MandrakeOnline.\n"
-" في الحالة الأخيرة  أعد الإتصال ب MandrakeOnline.\n"
-" عليك أن تكتب إسم الماكنة أيضا \n"
-" (تقبل فقط الحروف الأبجدية)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "يجري بعث الإعداد..."
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "أهلا بكم في MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -137,35 +37,53 @@ msgstr ""
 "(حزم البرامج, اعدادات العتاد) الى قاعدة بيانات مركزية كي يتسني\n"
 "لك أن تعلم بالتحديثات الأمنية و الترقيات المفيدة.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "أهلا بكم في MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "ليس لدي حساب في Mandrake Online و أريد أن"
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "اشتراك"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "اسم الدخول:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "كلمة المرور:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "كلمة المرور:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "سيساسة الخصوصية في ماندريك"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "التّحقّق من الأصالة"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "كلمة المرور و إسم الماكنة  Mandrake Online أعط إسم  دخولك ل  "
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "اسم الدخول:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "إسم الماكنة:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "كلمة المرور:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "جاري ارسال اعداداتك"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -196,25 +114,7 @@ msgstr ""
 "كما أن هذا يعطينا الفرصة لكي ننبهك الى التحديثات الأمنية\n"
 "و الترقيات المفيدة."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "ظهر خطأ أثناء ارسال المعلومات"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"لقد ظهر خطأ أثناء ارسالك لمعلوماتك الشخصية.\n"
-"\n"
-"اضغط التالي لمحاولة ارسال اعداداتك من جديد."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "انتهى"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -222,7 +122,7 @@ msgstr ""
 "من الآن ستستلم اشعارات بالترقيات\n"
 "و التحديثات الأمنية بفضل MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -230,111 +130,135 @@ msgstr ""
 "يعرض MandrakeOnline القدرة على التحديث على شكل آلي\n"
 "سيعمل برنامج بانتظام على نظامك منتظرا تحديثات جديدة\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "تم التحميل بنجاحك!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "تحديثات آلية"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "اختر موقعك الجغرافي"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "نعم أريد تحديثات آلية"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "جاري قراءة اعداداتك\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "موافق"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "الغاء"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
-"أمتأكد أنت أنك تريد الخروج من MandrakeOnline؟\n"
-"للرجوع الى المعالج اضغط 'الغاء',\n"
-"للخروج فعلا اضغط 'خروج'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "متأكد أنك تريد الإنهاء؟ - MandrakeOnline"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "انهاء"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "جاري الخروج من المعالج\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "جاري الإتّصال...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "مشكلة في الإتصال"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "تعذّر الإتّصال بـ MandrakeOnline، يرجى تجديد المحاولة فيما بعد"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "كلمة مرور خاطئة"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"إن إسم دخولك أو كلمة المرور خاطئة\n"
+" إما أن تدخلهما من جديد أو أن تنشأ رصيدا عند MandrakeOnline.\n"
+" في الحالة الأخيرة  أعد الإتصال ب MandrakeOnline.\n"
+" عليك أن تكتب إسم الماكنة أيضا \n"
+" (تقبل فقط الحروف الأبجدية)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "يجري بعث الإعداد..."
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "اغلاق"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "جاري قراءة اعداداتك\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -392,3 +316,84 @@ msgstr "تعذر انشاء وسيط mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "تعذر تحديث الحزم من وسيط mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "أفريقيا"
+
+#~ msgid "Asia"
+#~ msgstr "آسيا"
+
+#~ msgid "Australia"
+#~ msgstr "أوستراليا"
+
+#~ msgid "Europe"
+#~ msgstr "أوروبا"
+
+#~ msgid "North America"
+#~ msgstr "أمريكا الشمالية"
+
+#~ msgid "South America"
+#~ msgstr "أمريكا الجنوبية"
+
+#~ msgid "Next"
+#~ msgstr "التالي"
+
+#~ msgid "Quit"
+#~ msgstr "خروج"
+
+#~ msgid "Back"
+#~ msgstr "السابق"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "موقع مرآة فارغ"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "موقع مرآة فارغ. إختر موقعا من فضلك."
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "تحذير: لم يتم تحديد المتصفح"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "جاري ارسال اعداداتك"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "ظهر خطأ أثناء ارسال المعلومات"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "لقد ظهر خطأ أثناء ارسالك لمعلوماتك الشخصية.\n"
+#~ "\n"
+#~ "اضغط التالي لمحاولة ارسال اعداداتك من جديد."
+
+#~ msgid "Finished"
+#~ msgstr "انتهى"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "اختر موقعك الجغرافي"
+
+#~ msgid "OK"
+#~ msgstr "موافق"
+
+#~ msgid "Cancel"
+#~ msgstr "الغاء"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "أمتأكد أنت أنك تريد الخروج من MandrakeOnline؟\n"
+#~ "للرجوع الى المعالج اضغط 'الغاء',\n"
+#~ "للخروج فعلا اضغط 'خروج'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "متأكد أنك تريد الإنهاء؟ - MandrakeOnline"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "اغلاق"
diff --git a/po/az.po b/po/az.po
index b6195a26..c5dd983d 100644
--- a/po/az.po
+++ b/po/az.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-08-30 15:06+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azərbaycan <gnome@azitt.com>\n"
@@ -17,118 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asiya"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Avstraliya"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Avropa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Şimali Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Cənubi Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Sonrakı"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Qurtar"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Çıx"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Arxaya"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "MandrakeOnline hesabım yoxdur və olmasını istəyirəm "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Qeyd Ol"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Bəli, avtomatik güncəlləmələri istəyirəm"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Sehirbazdan Çıxılır\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Xəbərdarlıq: Heç səyyah bildirilməyib"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Bağlantı problemi"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Bağlantı problemi"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate sayt ilə bağlantı qura bilmədi, yenidən sınayacaq."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Səhv parol"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Sizin giriş adınız və ya parolunuz səhvdir.\n"
-" Ya yenidən yazmalısınız, ya da MandrakOnline xitmətlərində yeni  hesab "
-"açın.\n"
-" Son halda MandrakeOnline xitmətinə bağlanmaq üçün dala gedin.\n"
-" Yaddan çıxartmayın ki, ayrıca KOMPÜTER adını \n"
-" girməlisiniz (təkcə hərflərə icazə verilir)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "MandrakeOnline-a Xoş Gəldiniz"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -141,35 +38,53 @@ msgstr ""
 "sərfəli güncəlləmələri xəbər vermək üçün\n"
 "mərkəzi verilənlər bazasına göndərəcəkdir.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "MandrakeOnline-a Xoş Gəldiniz"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "MandrakeOnline hesabım yoxdur və olmasını istəyirəm "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Qeyd Ol"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Giriş Adı:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Parol:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Parol:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake Mülkiyyət Siyasəti"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "MandrakeOnline giriş adı, parolunuzu və kompüter adını girin:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Giriş Adı:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Kompüter adı:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Parol:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Qurğularınız Göndərilir"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -203,25 +118,7 @@ msgstr ""
 "endirimli, yəni daha ucuz faydalana bilərsiniz.\n"
 "Axırda sizə istifadəçi-adı@mandrakeonləne.net kimi poçt ünvanı veriləcəkdir."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Məlumatlarınız göndərilirkən xəta baş verdi"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Şəxsi məlumatlarınız göndərilirkən xəta baş verdi.\n"
-"\n"
-"Qurğularınızın yenidən göndərilməsi üçün Sonrakı düyməsinə basın."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Qurtardı"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -229,7 +126,7 @@ msgstr ""
 "İndidən etibarən MandrakeOnline vasitəsilə güncəlləmə və\n"
 "təhlükəsizlik elanları alacaqsınız."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -238,111 +135,138 @@ msgstr ""
 "Proqram sürəkli olaraq sisteminizdə yeni göncəlləmələri gözləyəcək şəkildə "
 "işləyəcəkdir\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Sizin yollamanız müvəffəqiyyətli oldu"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "avtomatik Yüksəltmələr"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Coğrafı yerinizi seçin"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Bəli, avtomatik güncəlləmələri istəyirəm"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Qurğularınız oxunur\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "Oldu"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Ləğv Et"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
-"MandrakeOnline-ı həqiqətən də ləğv etmək istəyirsiniz?\n"
-"Sehirbaza geri dönmək üçün 'Ləğv Et'ə basın,\n"
-"tamamilə çıxmaq üçün 'Çıx'a basın."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Həqiqətən təxirə salaq? - MandrakeOnline"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Qurtar"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Sehirbazdan Çıxılır\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Bağlantı problemi"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Bağlantı problemi"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate sayt ilə bağlantı qura bilmədi, yenidən sınayacaq."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Səhv parol"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Sizin giriş adınız və ya parolunuz səhvdir.\n"
+" Ya yenidən yazmalısınız, ya da MandrakOnline xitmətlərində yeni  hesab "
+"açın.\n"
+" Son halda MandrakeOnline xitmətinə bağlanmaq üçün dala gedin.\n"
+" Yaddan çıxartmayın ki, ayrıca KOMPÜTER adını \n"
+" girməlisiniz (təkcə hərflərə icazə verilir)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Qapat"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Qurğularınız oxunur\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -403,3 +327,75 @@ msgstr "mdkupdate mediyumu yaradıla bilmədi.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "mdkupdate mediyumundan paketlər yenilənə bilmədi.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Asiya"
+
+#~ msgid "Australia"
+#~ msgstr "Avstraliya"
+
+#~ msgid "Europe"
+#~ msgstr "Avropa"
+
+#~ msgid "North America"
+#~ msgstr "Şimali Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Cənubi Amerika"
+
+#~ msgid "Next"
+#~ msgstr "Sonrakı"
+
+#~ msgid "Quit"
+#~ msgstr "Çıx"
+
+#~ msgid "Back"
+#~ msgstr "Arxaya"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Xəbərdarlıq: Heç səyyah bildirilməyib"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Qurğularınız Göndərilir"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Məlumatlarınız göndərilirkən xəta baş verdi"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Şəxsi məlumatlarınız göndərilirkən xəta baş verdi.\n"
+#~ "\n"
+#~ "Qurğularınızın yenidən göndərilməsi üçün Sonrakı düyməsinə basın."
+
+#~ msgid "Finished"
+#~ msgstr "Qurtardı"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Coğrafı yerinizi seçin"
+
+#~ msgid "OK"
+#~ msgstr "Oldu"
+
+#~ msgid "Cancel"
+#~ msgstr "Ləğv Et"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "MandrakeOnline-ı həqiqətən də ləğv etmək istəyirsiniz?\n"
+#~ "Sehirbaza geri dönmək üçün 'Ləğv Et'ə basın,\n"
+#~ "tamamilə çıxmaq üçün 'Çıx'a basın."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Həqiqətən təxirə salaq? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Qapat"
diff --git a/po/bg.po b/po/bg.po
index 6fef50f4..a9a24bb4 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-14 21:48+0200\n"
 "Last-Translator: Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -15,118 +15,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Африка"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Азия"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Австралия"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Европа"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Северна Америка"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Южна Америка"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Нататък"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Край"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Изход"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Назад"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Не съм член на MandrakeOnline,а искам да стана"
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Абонирай"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Да,искам автоматично обновяване"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Излизам\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Внимание: няма избран четец на страници"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Проблем с връзката"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Проблем с връзката"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "Не можах да се свържа с MandrakeOnline,моля опитайте по-късно."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Грешна парола"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Вашето име или парола са грешни.\n"
-"Или го напишете отново,или ще ви трябва нова сметка за MandrakeOnline.\n"
-"Във втория случай се върнете на стъпка номер 1 за да се свържете с "
-"Mandrakeonline.\n"
-"Знайте,че ще трябва също да зададете име на Машината \n"
-" (само букви се признават)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Добре дошли в MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -138,35 +35,53 @@ msgstr ""
 "(пакети и хардуерни настройки) в централизираната база данни,за да\n"
 "ви държим в течение относно необходими обновявания и полезни новости.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Добре дошли в MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Не съм член на MandrakeOnline,а искам да стана"
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Абонирай"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Име:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Парола:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Парола:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Политика на Мандраке относно сигурността"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Проверка"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Въведете вашите MandrakeOnline име,парола и псевдоним на машината:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Име:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Име на Машината:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Парола:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Изпращам вашата конфигурация"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -201,25 +116,7 @@ msgstr ""
 "mandrakeexpert.com.\n"
 "И още - ще Ви запазим е-адрес с Вашето потребителско име@mandrakeonline.net"
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Грешка при изпращането на информация"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Получи се грешка при изпращане на личната ви информация.\n"
-"\n"
-"Натиснете \"Нататък\" за да пробвате да пратите конфигурацията си отново."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Край"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -227,7 +124,7 @@ msgstr ""
 "От сега нататък,Вие ще получавате информация\n"
 "относно сигурността и новостите,благодарение на MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -235,111 +132,138 @@ msgstr ""
 "MandrakeOnline ви предлага автоматизиране на обновлението.\n"
 "Програмата ще се пуска регулярно на системата Ви и ще следи за обновявания\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Изпращането бе успешно!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "автоматизирани обновявания"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Изберете Вашето местоположение"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Да,искам автоматично обновяване"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Прочитам вашата конфигурация\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "Добре"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Отказ"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
-"Сигурни ли сте,че искате да спрете MandrakeOnline?\n"
-"За да се върнете към Магьосника,натиснете 'Отказ',\n"
-"за да излезете от него - 'Изход'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "100 % ли сте сигурни"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Край"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Излизам\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Проблем с връзката"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Проблем с връзката"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "Не можах да се свържа с MandrakeOnline,моля опитайте по-късно."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Грешна парола"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Вашето име или парола са грешни.\n"
+"Или го напишете отново,или ще ви трябва нова сметка за MandrakeOnline.\n"
+"Във втория случай се върнете на стъпка номер 1 за да се свържете с "
+"Mandrakeonline.\n"
+"Знайте,че ще трябва също да зададете име на Машината \n"
+" (само букви се признават)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Затвори"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Прочитам вашата конфигурация\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -400,3 +324,75 @@ msgstr "Не мога да създам източник mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Не мога да обновя пакети от източник mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Африка"
+
+#~ msgid "Asia"
+#~ msgstr "Азия"
+
+#~ msgid "Australia"
+#~ msgstr "Австралия"
+
+#~ msgid "Europe"
+#~ msgstr "Европа"
+
+#~ msgid "North America"
+#~ msgstr "Северна Америка"
+
+#~ msgid "South America"
+#~ msgstr "Южна Америка"
+
+#~ msgid "Next"
+#~ msgstr "Нататък"
+
+#~ msgid "Quit"
+#~ msgstr "Изход"
+
+#~ msgid "Back"
+#~ msgstr "Назад"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Внимание: няма избран четец на страници"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Изпращам вашата конфигурация"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Грешка при изпращането на информация"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Получи се грешка при изпращане на личната ви информация.\n"
+#~ "\n"
+#~ "Натиснете \"Нататък\" за да пробвате да пратите конфигурацията си отново."
+
+#~ msgid "Finished"
+#~ msgstr "Край"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Изберете Вашето местоположение"
+
+#~ msgid "OK"
+#~ msgstr "Добре"
+
+#~ msgid "Cancel"
+#~ msgstr "Отказ"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Сигурни ли сте,че искате да спрете MandrakeOnline?\n"
+#~ "За да се върнете към Магьосника,натиснете 'Отказ',\n"
+#~ "за да излезете от него - 'Изход'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "100 % ли сте сигурни"
+
+#~ msgid "Close"
+#~ msgstr "Затвори"
diff --git a/po/bn.po b/po/bn.po
index f15038e7..d3e7e894 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-04-20 16:00+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <gnome-tran@bengalinux.org>\n"
@@ -15,296 +15,224 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:65
-msgid "Asia"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
 msgstr ""
 
-#: ../mdkonline:66
-msgid "Australia"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:67
-msgid "Europe"
+#: ../mdkonline:101
+msgid "Create a MandrakeOnline Account"
 msgstr ""
 
-#: ../mdkonline:68
-msgid "North America"
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
 msgstr ""
 
-#: ../mdkonline:69
-msgid "South America"
+#: ../mdkonline:103
+msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:88
-msgid "Finish"
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
 msgstr ""
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
+#: ../mdkonline:109
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
+#: ../mdkonline:117
+msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:93
-msgid "Subscribe"
+#: ../mdkonline:123
+msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
+#: ../mdkonline:124
+msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
+#: ../mdkonline:129
+msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:135
+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"
+"1) the list of packages you have installed on your system,\n"
+"2) your hardware configuration.\n"
+"\n"
+"If you feel uncomfortable by that idea, or do not want to benefit from this "
+"service,\n"
+"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+"informed\n"
+"about security updates and useful upgrades via personalized email alerts.\n"
+"Furthermore, you benefit from discounted paid support services on\n"
+"www.mandrakeexpert.com.\n"
+"Finally, an email alias with your username@mandrakeonline.net will be "
+"provided to you."
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
+#: ../mdkonline:141
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
+#: ../mdkonline:141
+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 ""
 
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "সংযোগ সমস্যা"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "সংযোগ সমস্যা"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
+#: ../mdkonline:141
+msgid "Your upload was successful!"
 msgstr ""
-"MandrakeUpdate সাইট এর সাথে যোগাযোগ করতে পারছে না, আমরা আবার চেষ্টা করবো।"
 
-#: ../mdkonline:294
-msgid "Wrong password"
+#: ../mdkonline:142
+msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:147
+msgid "Country:"
 msgstr ""
 
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
+#: ../mdkonline:172
+msgid "Creation"
 msgstr ""
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
 msgstr ""
 
-#: ../mdkonline:374
-msgid "Mandrake Privacy Policy"
+#: ../mdkonline:173
+msgid "Special Characters"
 msgstr ""
 
-#: ../mdkonline:379
-msgid "Authentification"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline:380
-msgid "Enter your MandrakeOnline login, password and machine name:"
+#: ../mdkonline:174
+msgid "Empty Fields"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Login:"
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Machine name:"
+#: ../mdkonline:175
+msgid "Email"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
+#: ../mdkonline:175
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline:387
-msgid "Sending your Configuration"
+#: ../mdkonline:176
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline:388
-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"
-"1) the list of packages you have installed on your system,\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrakeexpert.com.\n"
-"Finally, an email alias with your username@mandrakeonline.net will be "
-"provided to you."
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
 
-#: ../mdkonline:403
-msgid "Finished"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
 msgstr ""
 
-#: ../mdkonline:404
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to MandrakeOnline."
+#: ../mdkonline:186
+msgid "Please provide a login"
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:188
 msgid ""
-"MandrakeOnline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:404
-msgid "Your upload was successful!"
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:409
-msgid "automated Upgrades"
-msgstr ""
-
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr ""
-
-#: ../mdkonline:435
-msgid "Reading configuration\n"
+#: ../mdkonline:210
+msgid "Finish"
 msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
 msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr ""
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "সংযোগ সমস্যা"
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
-msgstr ""
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "সংযোগ সমস্যা"
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
 msgstr ""
+"MandrakeUpdate সাইট এর সাথে যোগাযোগ করতে পারছে না, আমরা আবার চেষ্টা করবো।"
 
-#: ../mdkonline:567
-msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+#: ../mdkonline:273
+msgid "Wrong password"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkupdate:43
diff --git a/po/bs.po b/po/bs.po
index 802a415b..6f04fa41 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 16.03.2003. 22:28\n"
 "Last-Translator: Amila Akagić <bono@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -15,119 +15,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Azija"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australija"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Sjeverna Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Južna Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Sljedeći"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Kraj"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Završi"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Nazad"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Nemam MandrakeOnline account i želim "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Upiši se"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Da, želim automatizovani update"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Izlazim iz čarobnjaka\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Upozorenje: Preglednik nije određen"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Problem sa konekcijom"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problem sa konekcijom"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"MandrakeOnline nije mogao stupiti u kontakt sa stranicom, molim pokušajte "
-"ponovo kasnije."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Pogrešna šifra"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Vaše korisničko ime ili šifra nije ispravna.\n"
-"Ili je ukucajte ponovo ili ponovo kreirajte account na MandrakeOnline.\n"
-"Drugi put se vratite nazad na prvi korak kako bi se konektovali na\n"
-"MandrakeOnline.  Upamtite da morate unijeti i naziv mašine \n"
-" (unesite samo alfabetske znakove)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Dobro došli na MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -139,35 +35,53 @@ msgstr ""
 "(pakete, hardware-ska podešavanja) u centraliziranu bazu podataka kako\n"
 "bi vas mogli informisali o sigurnosnim update-ima i korisnim nadogradnjama.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Dobro došli na MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Nemam MandrakeOnline account i želim "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Upiši se"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Korisničko ime:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Šifra:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Šifra:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake Privacy Policy"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Autentifikacija"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Upišite svoje MandrakeOnline korisničko ime, šifru i naziv mašine:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Korisničko ime:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Naziv mašine:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Šifra:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Šaljem vaša podešavanja"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -202,24 +116,7 @@ msgstr ""
 "www.mandrakeexpert.com.\n"
 "I napokon, imat ćete email alias vaše korisničko_ime@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Greška prilikom slanja informacija"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Javila se greška prilikom slanja vaših osobnih informacija. \n"
-"Pritisnite Sljedeći da ponovo pokušate i pošalje svoja podešavanja ponovo."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Završeno"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -227,7 +124,7 @@ msgstr ""
 "Od sada ćete primati obavještenja o\n"
 "sigurnosti i nadogradnjama zahvaljujući MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -235,111 +132,139 @@ msgstr ""
 "MandrakeOnline daje vam priliku da automatizirate update.\n"
 "Program će se regularno pokrenuti na vašem sistemu i čekati nove update-e\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Vaš upload bio je uspješan!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automatizovna nadogradnja"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Izaberite vašu geografsku lokaciju"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Da, želim automatizovani update"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Čitam konfiguraciju\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "U redu"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Odustani"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
-"Zaista želite prekinuti MandrakeOnline?\n"
-"Da se vratite na Čarobnjaka pritisnite 'Odustani',\n"
-"da prekinete pritisnite 'Završi'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Zaista prekini? - MandrakeOnline"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Kraj"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Izlazim iz čarobnjaka\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Problem sa konekcijom"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problem sa konekcijom"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
 msgstr ""
+"MandrakeOnline nije mogao stupiti u kontakt sa stranicom, molim pokušajte "
+"ponovo kasnije."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Pogrešna šifra"
 
-#: ../mdkonline:576
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Vaše korisničko ime ili šifra nije ispravna.\n"
+"Ili je ukucajte ponovo ili ponovo kreirajte account na MandrakeOnline.\n"
+"Drugi put se vratite nazad na prvi korak kako bi se konektovali na\n"
+"MandrakeOnline.  Upamtite da morate unijeti i naziv mašine \n"
+" (unesite samo alfabetske znakove)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Zatvori"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Čitam konfiguraciju\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -399,3 +324,74 @@ msgstr "Ne mogu napraviti mdkupdate medij.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Nisam u mogućnosti da uradim update paketa sa mdkupdate medija.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Azija"
+
+#~ msgid "Australia"
+#~ msgstr "Australija"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "Sjeverna Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Južna Amerika"
+
+#~ msgid "Next"
+#~ msgstr "Sljedeći"
+
+#~ msgid "Quit"
+#~ msgstr "Završi"
+
+#~ msgid "Back"
+#~ msgstr "Nazad"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Upozorenje: Preglednik nije određen"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Šaljem vaša podešavanja"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Greška prilikom slanja informacija"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Javila se greška prilikom slanja vaših osobnih informacija. \n"
+#~ "Pritisnite Sljedeći da ponovo pokušate i pošalje svoja podešavanja ponovo."
+
+#~ msgid "Finished"
+#~ msgstr "Završeno"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Izaberite vašu geografsku lokaciju"
+
+#~ msgid "OK"
+#~ msgstr "U redu"
+
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Zaista želite prekinuti MandrakeOnline?\n"
+#~ "Da se vratite na Čarobnjaka pritisnite 'Odustani',\n"
+#~ "da prekinete pritisnite 'Završi'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Zaista prekini? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Zatvori"
diff --git a/po/ca.po b/po/ca.po
index b8270d9c..713fa16d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-15 14:15+0100\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -17,117 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Àfrica"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Àsia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Austràlia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Amèrica del nord"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Amèrica del sud"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Següent"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Finalitza"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Surt"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Enrere"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "No tinc cap compte de MandrakeOnline i en vull un "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Subscriu-te"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Sí, vull actualitzacions automàtiques"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "S'està sortint de l'auxiliar\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Rèplica buida"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "Rèplica buida. Si us plau escolliu un lloc."
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Avís: no s'ha indicat cap navegador"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "S'està connectant ...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problema de connexió"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"No s'ha pogut contactar amb MandrakeOnline, si us plau, provi-ho més tard"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Contrasenya incorrecta"
 
-#: ../mdkonline:294
-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)"
-msgstr ""
-"El nom d'usuari o la contrasenya són incorrectes.\n"
-" Us caldrà tornar-los a escriure, o bé crear un compte a MandrakeOnline.\n"
-" En aquest darrer cas, torneu al primer pas per connectar amb "
-"MandrakeOnline.\n"
-" Estigueu avisat de que també cal proporcionar un nom de màquina \n"
-" (només s'admeten caràcters de l'alfabet)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "S'està enviant la configuració..."
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Benvingut a MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -140,37 +38,55 @@ msgstr ""
 "per tal de mantenir-vos informat sobre les actualitzacions de seguretat i "
 "altres millores.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Benvingut a MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "No tinc cap compte de MandrakeOnline i en vull un "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Subscriu-te"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Nom d'usuari:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Contrasenya:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Contrasenya:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Normes de privacitat de Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Autenticació"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "Introduïu el vostre nom d'usuari, contrasenya i nom de màquina de "
 "MandrakeOnline:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Nom d'usuari:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Nom de màquina:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Contrasenya:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "S'està enviant la vostra configuració"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -206,25 +122,7 @@ msgstr ""
 "Per últim, us facilitarem un àlies de correu electrònic amb el vostre nom "
 "d'usuari@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "S'ha produït un error en enviar la informació"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"S'ha produït un error en enviar la vostra informació personal.\n"
-"\n"
-"Feu clic a Següent per tornar-ho a provar."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Finalitzat"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -232,7 +130,7 @@ msgstr ""
 "A partir d'ara, gràcies a MandrakeOnline, rebreu\n"
 "avisos d'actualitzacions i millores de seguretat."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -242,121 +140,137 @@ msgstr ""
 "S'executarà regularment un programa per comprovar si hi ha noves "
 "actualitzacions\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "actualitzacions automàtiques"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Escolliu la vostra ubicació geogràfica"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Sí, vull actualitzacions automàtiques"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "S'està llegint la configuració\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "D'acord"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Cancel·la"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
 msgstr ""
-"Segur que voleu avortar MandrakeOnline?\n"
-"Per tornar a l'auxiliar, feu clic a 'Cancel·la';\n"
-"per sortir feu clic a 'Surt'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Segur que voleu avortat? - MandrakeOnline"
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
-msgstr ""
-" Esteu iniciant la edició de descarrega gratuïta de Mandrake Linux per "
-"primera vegada.\n"
-"\n"
-"Hi ha més de tres milions d'usuaris de Mandrake Linux al món!\n"
-"\n"
-"Si us plau pren-te uns segons per omplir un petit qüestionari. Les dades "
-"del\n"
-"qüestionari es faran servir per estudis interns de mercat.\n"
-"El text de sota és la política de privacitat de MandrakeSoft en quant a les "
-"vostres dades personals."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Finalitza"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "S'està sortint de l'auxiliar\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "S'està connectant ...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problema de connexió"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"No s'ha pogut contactar amb MandrakeOnline, si us plau, provi-ho més tard"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Contrasenya incorrecta"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"El nom d'usuari o la contrasenya són incorrectes.\n"
+" Us caldrà tornar-los a escriure, o bé crear un compte a MandrakeOnline.\n"
+" En aquest darrer cas, torneu al primer pas per connectar amb "
+"MandrakeOnline.\n"
+" Estigueu avisat de que també cal proporcionar un nom de màquina \n"
+" (només s'admeten caràcters de l'alfabet)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "S'està enviant la configuració..."
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Tanca"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "S'està llegint la configuració\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -418,3 +332,108 @@ msgstr "No es pot crear el suport mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "No es poden actualitzar els paquets des del suport mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Àfrica"
+
+#~ msgid "Asia"
+#~ msgstr "Àsia"
+
+#~ msgid "Australia"
+#~ msgstr "Austràlia"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "Amèrica del nord"
+
+#~ msgid "South America"
+#~ msgstr "Amèrica del sud"
+
+#~ msgid "Next"
+#~ msgstr "Següent"
+
+#~ msgid "Quit"
+#~ msgstr "Surt"
+
+#~ msgid "Back"
+#~ msgstr "Enrere"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Rèplica buida"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "Rèplica buida. Si us plau escolliu un lloc."
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Avís: no s'ha indicat cap navegador"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "S'està enviant la vostra configuració"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "S'ha produït un error en enviar la informació"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "S'ha produït un error en enviar la vostra informació personal.\n"
+#~ "\n"
+#~ "Feu clic a Següent per tornar-ho a provar."
+
+#~ msgid "Finished"
+#~ msgstr "Finalitzat"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Escolliu la vostra ubicació geogràfica"
+
+#~ msgid "OK"
+#~ msgstr "D'acord"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel·la"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Segur que voleu avortar MandrakeOnline?\n"
+#~ "Per tornar a l'auxiliar, feu clic a 'Cancel·la';\n"
+#~ "per sortir feu clic a 'Surt'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Segur que voleu avortat? - MandrakeOnline"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ " Esteu iniciant la edició de descarrega gratuïta de Mandrake Linux per "
+#~ "primera vegada.\n"
+#~ "\n"
+#~ "Hi ha més de tres milions d'usuaris de Mandrake Linux al món!\n"
+#~ "\n"
+#~ "Si us plau pren-te uns segons per omplir un petit qüestionari. Les dades "
+#~ "del\n"
+#~ "qüestionari es faran servir per estudis interns de mercat.\n"
+#~ "El text de sota és la política de privacitat de MandrakeSoft en quant a "
+#~ "les vostres dades personals."
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Tanca"
diff --git a/po/cs.po b/po/cs.po
index ca74c5d1..1862d438 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-10 11:30+0100\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -21,119 +21,15 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asie"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Austrálie"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Evropa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Severní Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Jižní Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Další"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Hotovo"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Konec"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Zpět"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Nemám účet na MandrakeOnline a chci se "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Přihlásit"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Ano, chci automatické aktualizace"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Ukončuji průvodce\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Prázdné zrcadlo"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "Prázdné zrcadlo: Vyberte prosím umístění."
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Varování: Není zvolen prohlížeč"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Připojuji se...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problémy při spojení"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"Službě MandrakeOnline se nepodařilo připojit k serveru, zkuste to prosím "
-"znovu později."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Špatné heslo"
 
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Přihlašovací jméno nebo heslo je špatné.\n"
-"Buď je zkusíte znova zadat nebo potřebujete vytvořit účet služby "
-"MandrakeOnline.\n"
-" V opačném případě se vraťte na první krok pro opětovné připojení k "
-"MandrakeOnline.\n"
-" Uvědomte si, že musíte také zadat jméno počítače \n"
-" (jsou povoleny pouze znaky abecedy bez diakritiky)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "Posílám konfiguraci..."
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Vítá vás MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -146,35 +42,53 @@ msgstr ""
 "kdy budete ihned informováni o všech bezpečnostních a dalších\n"
 "potřebných aktualizacích.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Vítá vás MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Nemám účet na MandrakeOnline a chci se "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Přihlásit"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Jméno:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Heslo:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Heslo:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Ochrana soukromí společnosti MandrakeSoft"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Ověřování"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Zadejte jméno, heslo a název počítače pro MandrakeOnline:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Jméno:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Název počítače:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Heslo:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Poslat Vaši konfiguraci"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -209,25 +123,7 @@ msgstr ""
 "www.mandrakeexpert.com.\n"
 "Také vám bude poskytnuta emailová adresa: jmeno@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Chyba při zasílání informací"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Při zasílání osobních informací se vyskytla chyba.\n"
-"\n"
-"Stiskněte tlačítko Další pro další pokus o zaslání informací"
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Hotovo"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -235,7 +131,7 @@ msgstr ""
 "Od této chvíle budete díky službě MandrakeOnline\n"
 "informováni o bezpečnostních a dalších aktualizacích."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -243,180 +139,139 @@ msgstr ""
 "MandrakeOnline nabízí možnost automatizovat aktualizace.\n"
 "Program, který bude běžet v systému a čekat na aktualizace\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Zaslání informací proběhlo úspěšně!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automatické aktualizace"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Vyberte si svoji geografickou polohu"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Ano, chci automatické aktualizace"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Načíst konfiguraci\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Zrušit"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
 msgstr ""
-"Chcete opravdu ukončit MandrakeOnline?\n"
-"Pro návrat do průvodce stiskněte 'Zrušit',\n"
-"pokud chcete skončit, stiskněte 'Konec'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Skutečně skončit? - MandrakeOnline"
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
-"Právě spouštíte poprvé distribuci Mandrake Linux Download Edition.\n"
-"\n"
-"Tuto distribuci už používá přes tři milióny uživatelů po celém světě!\n"
-"\n"
-"Věnujte nám prosím několik sekund a vyplňte krátký dotazník. Data získaná\n"
-"pomocí tohoto dotazníku budou použita pouze za účelem sestavení souhrnných\n"
-"dat při výzkumu trhu. Níže lze nalézt kompletní znění politiky na ochranu "
-"osobních\n"
-"údajů společnosti MandrakeSoft."
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Hotovo"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Ukončuji průvodce\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Připojuji se...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problémy při spojení"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"Službě MandrakeOnline se nepodařilo připojit k serveru, zkuste to prosím "
+"znovu později."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Špatné heslo"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
-"Jaké osobní údaje uchováváme?\n"
-"\n"
-"Na různých místech v našich webových stránkách sbíráme různé informace;\n"
-"níže se můžete dočíst, jak je s těmito informacemi nakládáno:\n"
-"\n"
-"Za prvé ukládáme vaši emailovou adresu, jméno a poštovní adresu.\n"
-"Poté dostanete přiděleno unikátní zákaznické ID. Toto ID se bude používat,\n"
-"pokud bude nutné získat od vás další informace týkající se vašeho účtu, "
-"např.:\n"
-"    - vaše zapsání do elektronických konferencí\n"
-"    - při registraci komerčního produktu od vás požadujeme některé další "
-"osobní\n"
-"údaje a podrobnosti o vašem hardware a software, abychom vám mohli "
-"poskytnout\n"
-"služby podpory co nejlépe odpovídající vašim potřebám.\n"
-"    - Na naši stránce věnované dobrovolným příspěvkům a v našem online "
-"obchodě\n"
-"(MandrakeStore) uchováváme údaje potřebné pro účetnictví (neukládáme žádné "
-"údaje\n"
-"o platebních kartách).\n"
-"\n"
-"Jak s těmito údaji nakládáme?\n"
-"\n"
-"Osobní údaje nikdy nesdílíme s jinými osobami nebo společnostmi. Osobní "
-"údaje\n"
-"požíváme výhradně za těmito účely:\n"
-"    - pokud jste se zapsali do elektronické konference, uchováváme v naší "
-"databázi\n"
-"vaši emailovou adresu, abychom vám mohli poskytnout na míru upravené "
-"informace\n"
-"a abychom vám umožnili podílet se v diskusích na různých elektronických "
-"konferencích.\n"
-"Pokud do takové konference pošlete příspěvek, uvidí vaši adresu ostatní "
-"členové\n"
-"konference, do naší databáze přispěvatelů však nemají přístup žádné externí "
-"subjekty.\n"
-"Pomocí příslušného formuláře se můžete z konference kdykoli odhlásit.\n"
-"    - Pokud poskytnete informace při registraci zakoupeného produktu, "
-"potřebné pro\n"
-"podporu tohoto produktu, jsou tyto informace považované za důvěrné, vyjma "
-"případů,\n"
-"kdy je nutné tyto informace poskytnout našim partnerům za účelem poskytnutí\n"
-"požadované podpory.\n"
-"    - Pokud využijete obchod MandrakeStore, používáme vaše zákaznické ID\n"
-"ke sledování vaší objednávky a za účelem doručení této objednávky.\n"
-"    - Pokud nám poskytnete marketingové informace, uchováváme tyto pouze "
-"pro\n"
-"interní použití, abychom mohli zlepšit své produkty a tyto vám více "
-"vyhovovaly, ať\n"
-"už jste produkt zakoupili nebo ne.\n"
-"\n"
-"Jak změnit nebo upravit vaše osobní údaje?\n"
-"\n"
-"Francouzský zákon dává jednotlivcům právo na přístup, úpravu či odstranění\n"
-"osobních údajů, které o nich uchováváme. My toto právo nabízíme celosvětově\n"
-"jako výhodu. Toto právo můžete kdykoli využít, pokud se přihlásíte ke svému "
-"účtu\n"
-"pomocí vašeho zákaznického ID a vaše osobní údaje upravíte. Přihlásit se lze "
-"na této\n"
-"stránce: http://www.mandrakeonline.net"
-
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
-
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Zavřít"
+"Přihlašovací jméno nebo heslo je špatné.\n"
+"Buď je zkusíte znova zadat nebo potřebujete vytvořit účet služby "
+"MandrakeOnline.\n"
+" V opačném případě se vraťte na první krok pro opětovné připojení k "
+"MandrakeOnline.\n"
+" Uvědomte si, že musíte také zadat jméno počítače \n"
+" (jsou povoleny pouze znaky abecedy bez diakritiky)"
+
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Posílám konfiguraci..."
+
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Načíst konfiguraci\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -479,3 +334,218 @@ msgstr "Nelze vytvořit zdroj mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Nelze aktualizovat balíčky ze zdroje mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Asie"
+
+#~ msgid "Australia"
+#~ msgstr "Austrálie"
+
+#~ msgid "Europe"
+#~ msgstr "Evropa"
+
+#~ msgid "North America"
+#~ msgstr "Severní Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Jižní Amerika"
+
+#~ msgid "Next"
+#~ msgstr "Další"
+
+#~ msgid "Quit"
+#~ msgstr "Konec"
+
+#~ msgid "Back"
+#~ msgstr "Zpět"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Prázdné zrcadlo"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "Prázdné zrcadlo: Vyberte prosím umístění."
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Varování: Není zvolen prohlížeč"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Poslat Vaši konfiguraci"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Chyba při zasílání informací"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Při zasílání osobních informací se vyskytla chyba.\n"
+#~ "\n"
+#~ "Stiskněte tlačítko Další pro další pokus o zaslání informací"
+
+#~ msgid "Finished"
+#~ msgstr "Hotovo"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Vyberte si svoji geografickou polohu"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Zrušit"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Chcete opravdu ukončit MandrakeOnline?\n"
+#~ "Pro návrat do průvodce stiskněte 'Zrušit',\n"
+#~ "pokud chcete skončit, stiskněte 'Konec'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Skutečně skončit? - MandrakeOnline"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ "Právě spouštíte poprvé distribuci Mandrake Linux Download Edition.\n"
+#~ "\n"
+#~ "Tuto distribuci už používá přes tři milióny uživatelů po celém světě!\n"
+#~ "\n"
+#~ "Věnujte nám prosím několik sekund a vyplňte krátký dotazník. Data "
+#~ "získaná\n"
+#~ "pomocí tohoto dotazníku budou použita pouze za účelem sestavení "
+#~ "souhrnných\n"
+#~ "dat při výzkumu trhu. Níže lze nalézt kompletní znění politiky na ochranu "
+#~ "osobních\n"
+#~ "údajů společnosti MandrakeSoft."
+
+#~ msgid ""
+#~ "What personal data do we collect ?         \n"
+#~ "                               \n"
+#~ "Various information is collected in different areas of the website;\n"
+#~ "what follows is an overview of the data we keep:\n"
+#~ "\n"
+#~ "Firstly, we record your email address, name and postal address.\n"
+#~ "Secondly we give you a unique customer ID. This ID will be used to \n"
+#~ "add additional information related to your Mandrake account such as:\n"
+#~ "    - Your subscription to mailling lists.\n"
+#~ "    - When registering a purchased product, we ask for personal\n"
+#~ "information as well as system/hardware details so that we may deliver\n"
+#~ "the best support services customized to your needs.\n"
+#~ "    - On our donation page and on our online store (MandrakeStore), we\n"
+#~ "record data for billing purpose (we do not store any credit card data).\n"
+#~ "    \n"
+#~ "What do we do with this information?\n"
+#~ "\n"
+#~ "We never share personal information with other persons or companies -\n"
+#~ "we use this data strictly for the following purposes:\n"
+#~ "    - If you have subscribed to a mailing list, we keep this email\n"
+#~ "address in our database to provide you with customized information\n"
+#~ "and/or to enable you to participate in discussions in various mailing\n"
+#~ "lists. If you send a message to such a list, other people will see\n"
+#~ "your email address but no external parties have access to our database\n"
+#~ "of subscribers. At any time you may unsubscribe to any list by using\n"
+#~ "the appropriate form.\n"
+#~ "    - If you provide information when registering a purchased product\n"
+#~ "to receive support, we keep this information private unless the\n"
+#~ "information is required by one of our partners to deliver the support\n"
+#~ "you require.\n"
+#~ "    - If you use MandrakeStore, we also use your Customer ID to track\n"
+#~ "your order and deliver your products.\n"
+#~ "    - If you provide us with marketing information, we keep it for \n"
+#~ "internal use only in order to improve our products so that they can \n"
+#~ "better fit your needs whether you have purchased a product or not.), How "
+#~ "to change / correct your personal data?\n"
+#~ "\n"
+#~ "French law gives individuals the right to access, correct, modify or \n"
+#~ "remove their own personal data that we have on record. We offer this \n"
+#~ "as a worldwide privilege. You may execute this right at any time by \n"
+#~ "logging to your account with your customer ID and editing your\n"
+#~ "personnal data. You can log on to this page: http://www.mandrakeonline.net"
+#~ msgstr ""
+#~ "Jaké osobní údaje uchováváme?\n"
+#~ "\n"
+#~ "Na různých místech v našich webových stránkách sbíráme různé informace;\n"
+#~ "níže se můžete dočíst, jak je s těmito informacemi nakládáno:\n"
+#~ "\n"
+#~ "Za prvé ukládáme vaši emailovou adresu, jméno a poštovní adresu.\n"
+#~ "Poté dostanete přiděleno unikátní zákaznické ID. Toto ID se bude "
+#~ "používat,\n"
+#~ "pokud bude nutné získat od vás další informace týkající se vašeho účtu, "
+#~ "např.:\n"
+#~ "    - vaše zapsání do elektronických konferencí\n"
+#~ "    - při registraci komerčního produktu od vás požadujeme některé další "
+#~ "osobní\n"
+#~ "údaje a podrobnosti o vašem hardware a software, abychom vám mohli "
+#~ "poskytnout\n"
+#~ "služby podpory co nejlépe odpovídající vašim potřebám.\n"
+#~ "    - Na naši stránce věnované dobrovolným příspěvkům a v našem online "
+#~ "obchodě\n"
+#~ "(MandrakeStore) uchováváme údaje potřebné pro účetnictví (neukládáme "
+#~ "žádné údaje\n"
+#~ "o platebních kartách).\n"
+#~ "\n"
+#~ "Jak s těmito údaji nakládáme?\n"
+#~ "\n"
+#~ "Osobní údaje nikdy nesdílíme s jinými osobami nebo společnostmi. Osobní "
+#~ "údaje\n"
+#~ "požíváme výhradně za těmito účely:\n"
+#~ "    - pokud jste se zapsali do elektronické konference, uchováváme v naší "
+#~ "databázi\n"
+#~ "vaši emailovou adresu, abychom vám mohli poskytnout na míru upravené "
+#~ "informace\n"
+#~ "a abychom vám umožnili podílet se v diskusích na různých elektronických "
+#~ "konferencích.\n"
+#~ "Pokud do takové konference pošlete příspěvek, uvidí vaši adresu ostatní "
+#~ "členové\n"
+#~ "konference, do naší databáze přispěvatelů však nemají přístup žádné "
+#~ "externí subjekty.\n"
+#~ "Pomocí příslušného formuláře se můžete z konference kdykoli odhlásit.\n"
+#~ "    - Pokud poskytnete informace při registraci zakoupeného produktu, "
+#~ "potřebné pro\n"
+#~ "podporu tohoto produktu, jsou tyto informace považované za důvěrné, vyjma "
+#~ "případů,\n"
+#~ "kdy je nutné tyto informace poskytnout našim partnerům za účelem "
+#~ "poskytnutí\n"
+#~ "požadované podpory.\n"
+#~ "    - Pokud využijete obchod MandrakeStore, používáme vaše zákaznické ID\n"
+#~ "ke sledování vaší objednávky a za účelem doručení této objednávky.\n"
+#~ "    - Pokud nám poskytnete marketingové informace, uchováváme tyto pouze "
+#~ "pro\n"
+#~ "interní použití, abychom mohli zlepšit své produkty a tyto vám více "
+#~ "vyhovovaly, ať\n"
+#~ "už jste produkt zakoupili nebo ne.\n"
+#~ "\n"
+#~ "Jak změnit nebo upravit vaše osobní údaje?\n"
+#~ "\n"
+#~ "Francouzský zákon dává jednotlivcům právo na přístup, úpravu či "
+#~ "odstranění\n"
+#~ "osobních údajů, které o nich uchováváme. My toto právo nabízíme "
+#~ "celosvětově\n"
+#~ "jako výhodu. Toto právo můžete kdykoli využít, pokud se přihlásíte ke "
+#~ "svému účtu\n"
+#~ "pomocí vašeho zákaznického ID a vaše osobní údaje upravíte. Přihlásit se "
+#~ "lze na této\n"
+#~ "stránce: http://www.mandrakeonline.net"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Zavřít"
diff --git a/po/cy.po b/po/cy.po
index 3cc17edc..cca74e64 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-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-11 20:24-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -14,115 +14,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Affrica"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Awstralia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Ewrop"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Gogledd America"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "De America"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Nesaf"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Gorffen"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Gadael"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Nôl"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Nid oes gennyf gyfrif MandrakeOnline ac mi rydw i eisiau"
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Tanysgrifio"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Ydw, rwyf eisiau diweddariadau awtomatig"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Gadael y Dewin\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Drych Gwag"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "Drych gwag. Dewiswch le."
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Rhybudd: Dim porwr wedi ei enwi"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Cysylltu â... \n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problem cysylltu"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "Methu cysylltu â MandrakeOnline, ceisiwch eto'n nes ymlaen"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Y cyfrinair anghywir"
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"Mae eich mewngofnod neu gyfriniar yn anghywir\n"
-"Un ai rhaid i chi ei ail deipio neu greu cyfrif MandrakeOnline newydd.\n"
-"Os yr olaf, ewch yn ôl i'r cam cyntaf â chysylltu â MandrakeOnline.\n"
-"cofiwch y bydd angen darparu enw Peiriant \n"
-"(gyda dim ond llythrennau)"
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "Anfon ffurfweddiad..."
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Croeso i MandrakeOnline "
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -134,36 +34,54 @@ msgstr ""
 "(pecynnau, ffurfweddiad caledwedd) i gronfa ddata ganolog er\n"
 "mwyn eich hysbysu am ddiweddariadau diogelwch a defnyddiol.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Croeso i MandrakeOnline "
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Nid oes gennyf gyfrif MandrakeOnline ac mi rydw i eisiau"
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Tanysgrifio"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Mewngofnod:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Cyfrinair:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Cyfrinair:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Polisi Preifatrwydd Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Dilysu"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "Rhowch eich mewngofnod MandrakeOnline, eich cyfrinair ac enw'r peiriant :"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Mewngofnod:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Enw'r peiriant:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Cyfrinair:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Anfon eich Ffurfweddiad"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -199,25 +117,7 @@ msgstr ""
 "gyda eich enw defnyddiwr@mandrakeonline.net yn cael ei ddarparu ar eich "
 "cyfer."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Gwall wrth anfon gwybodaeth"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Digwyddodd gwall wrth anfon eich manylion personol.\n"
-"\n"
-"Cliciwch Nesaf i anfon eich ffurfweddiad eto."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Gorffennwyd"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -225,7 +125,7 @@ msgstr ""
 "O hyn ymlaen byddwch yn derbyn cyhoeddiadau\n"
 "diogelwch a diweddariadau gan MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -233,168 +133,135 @@ 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:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Roedd eich llwytho i fyny'n llwyddiant"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "Diweddariadau awtomatig"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Dewiswch eich lleoliad daearyddol"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Ydw, rwyf eisiau diweddariadau awtomatig"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Darllen ffurfweddiad\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "Iawn"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Dileu"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:174
+msgid "Empty Fields"
 msgstr ""
-"Ydych chi wir eisiau atal MandrakeOnline?I ddychwelyd at y Dewin cliciwch "
-"'Diddymu',\n"
-"neu i adael cliciwch 'Gorffen'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Parod i orffen? - MandrakeOnline"
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
-" Rydych yn cychwyn Mandrake Linux Fersiwn Rhydd Llwytho i Lawr am y tro "
-"cyntaf. \n"
-"\n"
-"Erbyn hyn mae yna dair miliwn o ddefnyddwyr Mandrake Linux ar draws y byd!\n"
-"\n"
-"Os gwelwch yn dda cymrwch ychydig o amser i lanw'r holiadur byr. Bydd y "
-"wybodaeth\n"
-"yn cael ei ddefnyddio i grynhoi gwybodaeth fasnachol.\n"
-"Mae polisi preifatrwydd MandrakeSoft  islaw ynghylch eich gwybodaeth "
-"bersonol."
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Gorffen"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Gadael y Dewin\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Cysylltu â... \n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problem cysylltu"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "Methu cysylltu â MandrakeOnline, ceisiwch eto'n nes ymlaen"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Y cyfrinair anghywir"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
-"Pa wybodaeth bersonol fyddwn yn ei gasglu?\n"
-"\n"
-"Mae gwybodaeth amrywiol yn cael ei gasglu mewn rhannau gwahanol\n"
-" o'r safle gwe; dyma trosolwg o'r wybodaeth fyddwn yn ei gadw;\n"
-"\n"
-"Yn gyntaf byddwn yn cofnodi eich cyfeiriad e-bost, enw a chyfeiriad.\n"
-"Yn ail, byddwn yn rhoi dynodiad cwsmer arbennig. Bydd y dynodiad\n"
-"yn cael ei ddefnyddio i ychwanegu gwybodaeth â'ch cyfrif Mandrake:\n"
-"     -Tanysgrifiad i restrau e-bostio.\n"
-"     -Wrth gofrestri cynnyrch wedi ei brynu byddwn yn gofyn am fanylion\n"
-"personol yn ogystal â manylion system/caledwedd, fel ein bod yn gallu\n"
-"cynnig y gefnogaeth cwsmer gorau posibl.\n"
-"    -Ar ein tudalen rhoddion â'n tudalen siop ar-lein (MandrakeStore), "
-"rydym\n"
-"yn cofnodi gwybodaeth ar gyfer anfonebu (nid ydym yn cadw data cardiau\n"
-"credyd.\n"
-"\n"
-"Beth wnawn ni gyda'r wybodaeth?\n"
-"\n"
-" Fyddwn ni byth yn rhannu gwybodaeth bersonol gydag unigolion a chwmnïau,\n"
-"byddwn yn defnyddio'r wybodaeth ar gyfer y canlynol, yn unig:\n"
-"   - Os ydych wedi tanysgrifio i restr e-bostio, byddwn yn cadw'r cyfeiriad "
-"e-bost yn\n"
-"eich cronfa ddata i ddarparu gwybodaeth bersonol ac/ neu i alluogi chi i "
-"gyfrannu\n"
-"mewn trafodaethau grwpiau trafod amrywiol. Os fyddwch yn anfon neges i restr "
-"o'r\n"
-"fath, bydd pobl yn gweld eich cyfeiriad e-bost ond does gan bartion eraill "
-"ddim modd\n"
-"i gysylltu â'n cronfa ddata o danysgrifwyr. Mae modd dad-tanysgrifio ar "
-"unrhyw adeg\n"
-"drwy ddefnyddio ffurflen berthnasol.\n"
-"    - Os ydych yn defnyddio MandrakeStore, rydym yn defnyddio eich dynodiad "
-"cwsmer\n"
-"i ddilyn eich archeb a darparu ein cynnyrch.       - Os ydych yn darparu "
-"gwybodaeth masnachu i ni byddwn yn ei gadw ar gyfer\n"
-"defnydd mewnol yn unig er mwyn gwella ein cynnyrch fel eu bod yn fwy addas "
-"ar\n"
-"eich cyfer p'un ai ydych wedi prynu cynnyrch neu beidio. Sut mae newid/"
-"cywiro eich gwybodaeth bersonol?\n"
-"\n"
-"Mae cyfraith Ffrainc yn rhoi hawl i unigolion gael mynediad at, cywiro, "
-"newid\n"
-"neu dynnu eu gwybodaeth bersonol sydd gennym  ar ein cofnodion. Rydym\n"
-"yn cynnig hyn fel braint fyd-eang. Cewch wireddu'r hawl yma ar unrhyw adeg\n"
-"drwy fewngofnodi i'ch cyfrif gyda eich dynodiad cwsmer a golygu eich\n"
-"gwybodaeth bersonol. Cewch fewngofnodi yn: http://www.mandrakeonline.net"
+"Mae eich mewngofnod neu gyfriniar yn anghywir\n"
+"Un ai rhaid i chi ei ail deipio neu greu cyfrif MandrakeOnline newydd.\n"
+"Os yr olaf, ewch yn ôl i'r cam cyntaf â chysylltu â MandrakeOnline.\n"
+"cofiwch y bydd angen darparu enw Peiriant \n"
+"(gyda dim ond llythrennau)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italig 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Anfon ffurfweddiad..."
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Cau"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Darllen ffurfweddiad\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -454,3 +321,203 @@ msgstr "Methu creu cyfrwng mdkupdate\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Methu diweddaru pecynnau o gyfrwng mdkupdate\n"
+
+#~ msgid "Africa"
+#~ msgstr "Affrica"
+
+#~ msgid "Asia"
+#~ msgstr "Asia"
+
+#~ msgid "Australia"
+#~ msgstr "Awstralia"
+
+#~ msgid "Europe"
+#~ msgstr "Ewrop"
+
+#~ msgid "North America"
+#~ msgstr "Gogledd America"
+
+#~ msgid "South America"
+#~ msgstr "De America"
+
+#~ msgid "Next"
+#~ msgstr "Nesaf"
+
+#~ msgid "Quit"
+#~ msgstr "Gadael"
+
+#~ msgid "Back"
+#~ msgstr "Nôl"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Drych Gwag"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "Drych gwag. Dewiswch le."
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Rhybudd: Dim porwr wedi ei enwi"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Anfon eich Ffurfweddiad"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Gwall wrth anfon gwybodaeth"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Digwyddodd gwall wrth anfon eich manylion personol.\n"
+#~ "\n"
+#~ "Cliciwch Nesaf i anfon eich ffurfweddiad eto."
+
+#~ msgid "Finished"
+#~ msgstr "Gorffennwyd"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Dewiswch eich lleoliad daearyddol"
+
+#~ msgid "OK"
+#~ msgstr "Iawn"
+
+#~ msgid "Cancel"
+#~ msgstr "Dileu"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Ydych chi wir eisiau atal MandrakeOnline?I ddychwelyd at y Dewin cliciwch "
+#~ "'Diddymu',\n"
+#~ "neu i adael cliciwch 'Gorffen'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Parod i orffen? - MandrakeOnline"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ " Rydych yn cychwyn Mandrake Linux Fersiwn Rhydd Llwytho i Lawr am y tro "
+#~ "cyntaf. \n"
+#~ "\n"
+#~ "Erbyn hyn mae yna dair miliwn o ddefnyddwyr Mandrake Linux ar draws y "
+#~ "byd!\n"
+#~ "\n"
+#~ "Os gwelwch yn dda cymrwch ychydig o amser i lanw'r holiadur byr. Bydd y "
+#~ "wybodaeth\n"
+#~ "yn cael ei ddefnyddio i grynhoi gwybodaeth fasnachol.\n"
+#~ "Mae polisi preifatrwydd MandrakeSoft  islaw ynghylch eich gwybodaeth "
+#~ "bersonol."
+
+#~ msgid ""
+#~ "What personal data do we collect ?         \n"
+#~ "                               \n"
+#~ "Various information is collected in different areas of the website;\n"
+#~ "what follows is an overview of the data we keep:\n"
+#~ "\n"
+#~ "Firstly, we record your email address, name and postal address.\n"
+#~ "Secondly we give you a unique customer ID. This ID will be used to \n"
+#~ "add additional information related to your Mandrake account such as:\n"
+#~ "    - Your subscription to mailling lists.\n"
+#~ "    - When registering a purchased product, we ask for personal\n"
+#~ "information as well as system/hardware details so that we may deliver\n"
+#~ "the best support services customized to your needs.\n"
+#~ "    - On our donation page and on our online store (MandrakeStore), we\n"
+#~ "record data for billing purpose (we do not store any credit card data).\n"
+#~ "    \n"
+#~ "What do we do with this information?\n"
+#~ "\n"
+#~ "We never share personal information with other persons or companies -\n"
+#~ "we use this data strictly for the following purposes:\n"
+#~ "    - If you have subscribed to a mailing list, we keep this email\n"
+#~ "address in our database to provide you with customized information\n"
+#~ "and/or to enable you to participate in discussions in various mailing\n"
+#~ "lists. If you send a message to such a list, other people will see\n"
+#~ "your email address but no external parties have access to our database\n"
+#~ "of subscribers. At any time you may unsubscribe to any list by using\n"
+#~ "the appropriate form.\n"
+#~ "    - If you provide information when registering a purchased product\n"
+#~ "to receive support, we keep this information private unless the\n"
+#~ "information is required by one of our partners to deliver the support\n"
+#~ "you require.\n"
+#~ "    - If you use MandrakeStore, we also use your Customer ID to track\n"
+#~ "your order and deliver your products.\n"
+#~ "    - If you provide us with marketing information, we keep it for \n"
+#~ "internal use only in order to improve our products so that they can \n"
+#~ "better fit your needs whether you have purchased a product or not.), How "
+#~ "to change / correct your personal data?\n"
+#~ "\n"
+#~ "French law gives individuals the right to access, correct, modify or \n"
+#~ "remove their own personal data that we have on record. We offer this \n"
+#~ "as a worldwide privilege. You may execute this right at any time by \n"
+#~ "logging to your account with your customer ID and editing your\n"
+#~ "personnal data. You can log on to this page: http://www.mandrakeonline.net"
+#~ msgstr ""
+#~ "Pa wybodaeth bersonol fyddwn yn ei gasglu?\n"
+#~ "\n"
+#~ "Mae gwybodaeth amrywiol yn cael ei gasglu mewn rhannau gwahanol\n"
+#~ " o'r safle gwe; dyma trosolwg o'r wybodaeth fyddwn yn ei gadw;\n"
+#~ "\n"
+#~ "Yn gyntaf byddwn yn cofnodi eich cyfeiriad e-bost, enw a chyfeiriad.\n"
+#~ "Yn ail, byddwn yn rhoi dynodiad cwsmer arbennig. Bydd y dynodiad\n"
+#~ "yn cael ei ddefnyddio i ychwanegu gwybodaeth â'ch cyfrif Mandrake:\n"
+#~ "     -Tanysgrifiad i restrau e-bostio.\n"
+#~ "     -Wrth gofrestri cynnyrch wedi ei brynu byddwn yn gofyn am fanylion\n"
+#~ "personol yn ogystal â manylion system/caledwedd, fel ein bod yn gallu\n"
+#~ "cynnig y gefnogaeth cwsmer gorau posibl.\n"
+#~ "    -Ar ein tudalen rhoddion â'n tudalen siop ar-lein (MandrakeStore), "
+#~ "rydym\n"
+#~ "yn cofnodi gwybodaeth ar gyfer anfonebu (nid ydym yn cadw data cardiau\n"
+#~ "credyd.\n"
+#~ "\n"
+#~ "Beth wnawn ni gyda'r wybodaeth?\n"
+#~ "\n"
+#~ " Fyddwn ni byth yn rhannu gwybodaeth bersonol gydag unigolion a "
+#~ "chwmnïau,\n"
+#~ "byddwn yn defnyddio'r wybodaeth ar gyfer y canlynol, yn unig:\n"
+#~ "   - Os ydych wedi tanysgrifio i restr e-bostio, byddwn yn cadw'r "
+#~ "cyfeiriad e-bost yn\n"
+#~ "eich cronfa ddata i ddarparu gwybodaeth bersonol ac/ neu i alluogi chi i "
+#~ "gyfrannu\n"
+#~ "mewn trafodaethau grwpiau trafod amrywiol. Os fyddwch yn anfon neges i "
+#~ "restr o'r\n"
+#~ "fath, bydd pobl yn gweld eich cyfeiriad e-bost ond does gan bartion "
+#~ "eraill ddim modd\n"
+#~ "i gysylltu â'n cronfa ddata o danysgrifwyr. Mae modd dad-tanysgrifio ar "
+#~ "unrhyw adeg\n"
+#~ "drwy ddefnyddio ffurflen berthnasol.\n"
+#~ "    - Os ydych yn defnyddio MandrakeStore, rydym yn defnyddio eich "
+#~ "dynodiad cwsmer\n"
+#~ "i ddilyn eich archeb a darparu ein cynnyrch.       - Os ydych yn darparu "
+#~ "gwybodaeth masnachu i ni byddwn yn ei gadw ar gyfer\n"
+#~ "defnydd mewnol yn unig er mwyn gwella ein cynnyrch fel eu bod yn fwy "
+#~ "addas ar\n"
+#~ "eich cyfer p'un ai ydych wedi prynu cynnyrch neu beidio. Sut mae newid/"
+#~ "cywiro eich gwybodaeth bersonol?\n"
+#~ "\n"
+#~ "Mae cyfraith Ffrainc yn rhoi hawl i unigolion gael mynediad at, cywiro, "
+#~ "newid\n"
+#~ "neu dynnu eu gwybodaeth bersonol sydd gennym  ar ein cofnodion. Rydym\n"
+#~ "yn cynnig hyn fel braint fyd-eang. Cewch wireddu'r hawl yma ar unrhyw "
+#~ "adeg\n"
+#~ "drwy fewngofnodi i'ch cyfrif gyda eich dynodiad cwsmer a golygu eich\n"
+#~ "gwybodaeth bersonol. Cewch fewngofnodi yn: http://www.mandrakeonline.net"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italig 17"
+
+#~ msgid "Close"
+#~ msgstr "Cau"
diff --git a/po/da.po b/po/da.po
index 5e3e2f17..5ec1e66a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-14 04:34+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <<dansk@klid.dk>>\n"
@@ -16,117 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asien"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australien"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Nordamerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Sydamerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Næste"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Afslut"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Afslut"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Tilbage"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Jeg har ikke en MandrakeOnline-konto, og jeg vil gerne "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "abonnere"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Ja, jeg ønsker automatiserede opdateringer"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Afslutter guiden\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Tomt spejl"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "Tomt spejl. Vælg venligst et sted."
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Advarsel: Ingen netlæser angivet"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Kobler op ...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problem med forbindelse"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeOnline kunne ikke kontaktes, prøv igen senere"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Forkert adgangskode"
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"Dit brugernavn eller adgangskode var forkert.\n"
-"Enten skal du indtaste det igen, eller også skal du oprette en konto hos "
-"MandrakeOnline.\n"
-" I sidste tilfælde skal du gå tilbage til det første trin for forbindelse "
-"til MandrakeOnline.\n"
-"Vær opmærksom på at du også skal angive et maskinnavn \n"
-"(Kun bogstaver er tilladt)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "Sender konfiguration..."
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Velkommen til MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -139,35 +37,53 @@ msgstr ""
 "holde dig orienteret omkring sikkerhedsopdateringer og nyttige "
 "opdateringer.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Velkommen til MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Jeg har ikke en MandrakeOnline-konto, og jeg vil gerne "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "abonnere"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Brugernavn:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Adgangskode:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Adgangskode:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake privatbeskyttelsespolitik"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Autentifikation"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Angiv dit MandrakeOnline brugernavn, adgangskode og maskinnavn:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Brugernavn:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Maskinnavn:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Adgangskode:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Sender din konfiguration"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -198,25 +114,7 @@ msgstr ""
 "Der vil også blive lavet et epost-alias med dit brugernavn@mandrakeonline."
 "net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Fejl ved sending af oplysninger"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Der var en fejl ved sendingen af dine personlige oplysninger\n"
-"\n"
-"Tryk Næste for at prøve at sende din konfiguration igen."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Afsluttet"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -224,7 +122,7 @@ msgstr ""
 "Fra nu af vil du modtage annonceringer om sikkerhed\n"
 "og opdateringer takket være MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -232,171 +130,137 @@ msgstr ""
 "MandrakeOnline tilbyder dig at kunne automatisere opdateringerne.\n"
 "Et program vil køre jævnligt på dit system der venter på nye opdateringer\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Din oplægning lykkedes!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automatiserede upgraderinger"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Vælg din geografiske placering"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Ja, jeg ønsker automatiserede opdateringer"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Læser konfiguration\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "O.k."
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Annullér"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
 msgstr ""
-"Vil du virkelig afbryde MandrakeOnline?\n"
-"Tryk 'Annullér' for at vende tilbage til guiden.\n"
-"Tryk 'Afslut' for at endeligt afslutte."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Virkelig afslut? - MandrakeOnline"
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
-" Du er ved at starte vores Gratis Mandrake Linux Nedhentnings Version for "
-"første gang. \n"
-"\n"
-"Der er nu over tre millioner Mandrake Linux brugere over hele verden!\n"
-"\n"
-"Brug venligst et øjeblik til at svare på et kort spørgeskema. Data fra "
-"dette \n"
-"spørgeskema vil kun blive brugt til overordnende markedsundersøgelser.\n"
-"Nedenstående tekst er MandrakeSofts fortrolighedspolitik omkring dine "
-"personlige oplysninger."
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Afslut"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Afslutter guiden\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Kobler op ...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problem med forbindelse"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeOnline kunne ikke kontaktes, prøv igen senere"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Forkert adgangskode"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
-"Hvilke personlige data indsamler vi?         \n"
-"                               \n"
-"Forskellig information indsamles i forskellige områder på webstedet;\n"
-"hvad der følger er en oversigt over de data vi opbevarer:\n"
-"\n"
-"For det første noterer vi din epost-adresse, dit navn og din postadresse.\n"
-"For det andet giver vi dig en unik kundeidentitet. Denne ID vil blive brugt "
-"til \n"
-"at tilføje yderligere information relateret til din Mandrake-konto, såsom:\n"
-"    - Dit abonnement på postlister.\n"
-"    - Ved registrering af et købt produkt spørger vi om personlige\n"
-"oplysninger samtidigt med system- og udstyrsdetaljer så vi kan give\n"
-"den bedste understøttelsesservice tilpasset dine behov.\n"
-"    - På vores bidragsside og på vores netbutik (MandrakeStore) gemmer\n"
-"vi data omkring betaling (vi gemmer ikke nogen kreditkortsdata).\n"
-"    \n"
-"Hvad gør vi med denne information?\n"
-"\n"
-"Vi deler aldrig personlig information med andre personer eller firmaer -\n"
-"vi bruger udelukkende disse data til de følgende formål:\n"
-"    - Hvis du har abonneret på en postliste, opbevarer vi denne "
-"epostadresse\n"
-"i vores database for at give dig tilpasset information\n"
-"og for at give dig mulighed for at deltage i diskussioner på forskellige "
-"postlister.\n"
-"Hvis du sender en besked til en sådan liste, vil andre folk se din\n"
-"epostadresse, men ingen udenforstående parter vil have adgang til vores "
-"database\n"
-"med abonnenter. Til enhver tid kan du afmelde dig fra enhver liste ved at "
-"bruge\n"
-"den tilsvarende formular.\n"
-"    - Hvis du giver oplysninger ved registrering af et købt produkt\n"
-"for at få support, holder vi denne information fortroligt med mindre \n"
-"oplysningerne er krævet af en af vores partnere for at levere den\n"
-"support du har brug for.\n"
-"    - Hvis du bruger MandrakeStore, bruger vi også din kunde-ID til at holde "
-"styr\n"
-"på din ordre og levere dine varer.\n"
-"    - Hvis du giver os marketingsoplysninger, opbevarer vi disse kun til \n"
-"intern brug for at kunne forbedre vores produkter så vi bedre kan \n"
-"opfylde dine behov (enten du har købt et produkt eller ej).\n"
-"\n"
-"Hvordan kan du rette eller ændre dine personlige data?\n"
-"\n"
-"Fransk lov giver personer ret til at få adgang til, rette, ændre eller \n"
-"fjerne deres egne personlige data som vi har liggende. Vi tilbyder dette \n"
-"også på verdensplan. Du kan benytte denne rettighed til enhver tid ved at \n"
-"logge på din konto med din kunde-id og redigere dine\n"
-"personlige data. Du kan logge på via denne side: http://www.mandrakeonline."
-"net"
+"Dit brugernavn eller adgangskode var forkert.\n"
+"Enten skal du indtaste det igen, eller også skal du oprette en konto hos "
+"MandrakeOnline.\n"
+" I sidste tilfælde skal du gå tilbage til det første trin for forbindelse "
+"til MandrakeOnline.\n"
+"Vær opmærksom på at du også skal angive et maskinnavn \n"
+"(Kun bogstaver er tilladt)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Sender konfiguration..."
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Luk"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Læser konfiguration\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -455,3 +319,208 @@ msgstr "Kan ikke oprette mdkupdate-medium.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Kan ikke opdatere pakker fra mdkupdate-medium.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Asien"
+
+#~ msgid "Australia"
+#~ msgstr "Australien"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "Nordamerika"
+
+#~ msgid "South America"
+#~ msgstr "Sydamerika"
+
+#~ msgid "Next"
+#~ msgstr "Næste"
+
+#~ msgid "Quit"
+#~ msgstr "Afslut"
+
+#~ msgid "Back"
+#~ msgstr "Tilbage"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Tomt spejl"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "Tomt spejl. Vælg venligst et sted."
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Advarsel: Ingen netlæser angivet"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Sender din konfiguration"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Fejl ved sending af oplysninger"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Der var en fejl ved sendingen af dine personlige oplysninger\n"
+#~ "\n"
+#~ "Tryk Næste for at prøve at sende din konfiguration igen."
+
+#~ msgid "Finished"
+#~ msgstr "Afsluttet"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Vælg din geografiske placering"
+
+#~ msgid "OK"
+#~ msgstr "O.k."
+
+#~ msgid "Cancel"
+#~ msgstr "Annullér"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Vil du virkelig afbryde MandrakeOnline?\n"
+#~ "Tryk 'Annullér' for at vende tilbage til guiden.\n"
+#~ "Tryk 'Afslut' for at endeligt afslutte."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Virkelig afslut? - MandrakeOnline"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ " Du er ved at starte vores Gratis Mandrake Linux Nedhentnings Version for "
+#~ "første gang. \n"
+#~ "\n"
+#~ "Der er nu over tre millioner Mandrake Linux brugere over hele verden!\n"
+#~ "\n"
+#~ "Brug venligst et øjeblik til at svare på et kort spørgeskema. Data fra "
+#~ "dette \n"
+#~ "spørgeskema vil kun blive brugt til overordnende markedsundersøgelser.\n"
+#~ "Nedenstående tekst er MandrakeSofts fortrolighedspolitik omkring dine "
+#~ "personlige oplysninger."
+
+#~ msgid ""
+#~ "What personal data do we collect ?         \n"
+#~ "                               \n"
+#~ "Various information is collected in different areas of the website;\n"
+#~ "what follows is an overview of the data we keep:\n"
+#~ "\n"
+#~ "Firstly, we record your email address, name and postal address.\n"
+#~ "Secondly we give you a unique customer ID. This ID will be used to \n"
+#~ "add additional information related to your Mandrake account such as:\n"
+#~ "    - Your subscription to mailling lists.\n"
+#~ "    - When registering a purchased product, we ask for personal\n"
+#~ "information as well as system/hardware details so that we may deliver\n"
+#~ "the best support services customized to your needs.\n"
+#~ "    - On our donation page and on our online store (MandrakeStore), we\n"
+#~ "record data for billing purpose (we do not store any credit card data).\n"
+#~ "    \n"
+#~ "What do we do with this information?\n"
+#~ "\n"
+#~ "We never share personal information with other persons or companies -\n"
+#~ "we use this data strictly for the following purposes:\n"
+#~ "    - If you have subscribed to a mailing list, we keep this email\n"
+#~ "address in our database to provide you with customized information\n"
+#~ "and/or to enable you to participate in discussions in various mailing\n"
+#~ "lists. If you send a message to such a list, other people will see\n"
+#~ "your email address but no external parties have access to our database\n"
+#~ "of subscribers. At any time you may unsubscribe to any list by using\n"
+#~ "the appropriate form.\n"
+#~ "    - If you provide information when registering a purchased product\n"
+#~ "to receive support, we keep this information private unless the\n"
+#~ "information is required by one of our partners to deliver the support\n"
+#~ "you require.\n"
+#~ "    - If you use MandrakeStore, we also use your Customer ID to track\n"
+#~ "your order and deliver your products.\n"
+#~ "    - If you provide us with marketing information, we keep it for \n"
+#~ "internal use only in order to improve our products so that they can \n"
+#~ "better fit your needs whether you have purchased a product or not.), How "
+#~ "to change / correct your personal data?\n"
+#~ "\n"
+#~ "French law gives individuals the right to access, correct, modify or \n"
+#~ "remove their own personal data that we have on record. We offer this \n"
+#~ "as a worldwide privilege. You may execute this right at any time by \n"
+#~ "logging to your account with your customer ID and editing your\n"
+#~ "personnal data. You can log on to this page: http://www.mandrakeonline.net"
+#~ msgstr ""
+#~ "Hvilke personlige data indsamler vi?         \n"
+#~ "                               \n"
+#~ "Forskellig information indsamles i forskellige områder på webstedet;\n"
+#~ "hvad der følger er en oversigt over de data vi opbevarer:\n"
+#~ "\n"
+#~ "For det første noterer vi din epost-adresse, dit navn og din "
+#~ "postadresse.\n"
+#~ "For det andet giver vi dig en unik kundeidentitet. Denne ID vil blive "
+#~ "brugt til \n"
+#~ "at tilføje yderligere information relateret til din Mandrake-konto, "
+#~ "såsom:\n"
+#~ "    - Dit abonnement på postlister.\n"
+#~ "    - Ved registrering af et købt produkt spørger vi om personlige\n"
+#~ "oplysninger samtidigt med system- og udstyrsdetaljer så vi kan give\n"
+#~ "den bedste understøttelsesservice tilpasset dine behov.\n"
+#~ "    - På vores bidragsside og på vores netbutik (MandrakeStore) gemmer\n"
+#~ "vi data omkring betaling (vi gemmer ikke nogen kreditkortsdata).\n"
+#~ "    \n"
+#~ "Hvad gør vi med denne information?\n"
+#~ "\n"
+#~ "Vi deler aldrig personlig information med andre personer eller firmaer -\n"
+#~ "vi bruger udelukkende disse data til de følgende formål:\n"
+#~ "    - Hvis du har abonneret på en postliste, opbevarer vi denne "
+#~ "epostadresse\n"
+#~ "i vores database for at give dig tilpasset information\n"
+#~ "og for at give dig mulighed for at deltage i diskussioner på forskellige "
+#~ "postlister.\n"
+#~ "Hvis du sender en besked til en sådan liste, vil andre folk se din\n"
+#~ "epostadresse, men ingen udenforstående parter vil have adgang til vores "
+#~ "database\n"
+#~ "med abonnenter. Til enhver tid kan du afmelde dig fra enhver liste ved at "
+#~ "bruge\n"
+#~ "den tilsvarende formular.\n"
+#~ "    - Hvis du giver oplysninger ved registrering af et købt produkt\n"
+#~ "for at få support, holder vi denne information fortroligt med mindre \n"
+#~ "oplysningerne er krævet af en af vores partnere for at levere den\n"
+#~ "support du har brug for.\n"
+#~ "    - Hvis du bruger MandrakeStore, bruger vi også din kunde-ID til at "
+#~ "holde styr\n"
+#~ "på din ordre og levere dine varer.\n"
+#~ "    - Hvis du giver os marketingsoplysninger, opbevarer vi disse kun "
+#~ "til \n"
+#~ "intern brug for at kunne forbedre vores produkter så vi bedre kan \n"
+#~ "opfylde dine behov (enten du har købt et produkt eller ej).\n"
+#~ "\n"
+#~ "Hvordan kan du rette eller ændre dine personlige data?\n"
+#~ "\n"
+#~ "Fransk lov giver personer ret til at få adgang til, rette, ændre eller \n"
+#~ "fjerne deres egne personlige data som vi har liggende. Vi tilbyder "
+#~ "dette \n"
+#~ "også på verdensplan. Du kan benytte denne rettighed til enhver tid ved "
+#~ "at \n"
+#~ "logge på din konto med din kunde-id og redigere dine\n"
+#~ "personlige data. Du kan logge på via denne side: http://www."
+#~ "mandrakeonline.net"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Luk"
diff --git a/po/de.po b/po/de.po
index e256c956..99f1f2d6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-09-18 23:13+0200\n"
 "Last-Translator: Sebastian Deutscher <sebastian_deutscher@web.de>\n"
 "Language-Team: german <cooker-i18n@linux-mandrake.com>\n"
@@ -17,148 +17,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkonline:64
-msgid "Africa"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:65
-msgid "Asia"
-msgstr ""
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr ""
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr ""
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr ""
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr ""
-
-#: ../mdkonline:88
-msgid "Finish"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
 msgstr ""
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
+#: ../mdkonline:101
+msgid "Create a MandrakeOnline Account"
 msgstr ""
 
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr ""
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr ""
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr ""
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Verbindungsproblem"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Verbindungsproblem"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate kann die Web-Seite nicht erreichen, erneuter Versuch."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr ""
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
 msgstr ""
 
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
+#: ../mdkonline:109
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr ""
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr ""
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr ""
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -178,134 +97,143 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr ""
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr ""
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 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 ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
+#: ../mdkonline:147
+msgid "Country:"
 msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
+#: ../mdkonline:172
+msgid "Creation"
 msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
 msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr ""
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr ""
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Verbindungsproblem"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Verbindungsproblem"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate kann die Web-Seite nicht erreichen, erneuter Versuch."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr ""
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkupdate:43
diff --git a/po/el.po b/po/el.po
index 3c35cb04..6a757c90 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-18 23:24+0000\n"
 "Last-Translator: Νίκος Νύκταρης (Nick Niktaris) <niktarin@yahoo.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -15,121 +15,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Αφρική"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Ασία"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Αυστραλία"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Ευρώπη"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Βόρια Αμερική"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Νότια Αμερική"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Επόμενο"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Τέλος"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Έξοδος"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Πίσω"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Δεν έχω λογαριασμό στο MandrakeOnline και θέλω να αποκτήσω "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Εγγραφή"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Ναι θέλω να αυτοματοποιήσω τις αναβαθμίσεις"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Τερματίζεται ο Οδηγός\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Προειδοποίηση: Δεν έχει επιλεγεί περιηγητής"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Πρόβλημα σύνδεσης"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Πρόβλημα σύνδεσης"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"Το MandrakeUpdate δεν μπόρεσε να συνδεθεί με την ιστοσελίδα, θα "
-"ξαναδοκιμάσουμε."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Λάθος κωδικός πρόσβασης"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Το όνομα ή ο κωδικός πρόσβασης ήταν λάθος.\n"
-"Θα πρέπει να το ξαναπληκτρολογήσετε ή θα πρέπει να δημιουργήσετε έναν "
-"λογαριασμό στο MandrakeOnline.\n"
-" Στην δεύτερη περίπτωση επιστρέψτε στο πρώτο βήμα για να συνδεθείτε με το "
-"MandrakeOnline.\n"
-"Σημειώστε ότι θα πρέπει να εισάγετε και το Όνομα μηχανήματος\n"
-" (δεκτοί είναι μόνο οι αλφαβητικοί χαρακτήρες)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Καλώς ήρθατε στο MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -141,37 +35,55 @@ msgstr ""
 "(πακέτα, υλικό του υπολογιστή σας) σε μια κεντρική βάση για να μπορείτε\n"
 "να ενημερώνεστε για αναβαθμίσεις ασφαλείας και χρήσιμες αναβαθμίσεις.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Καλώς ήρθατε στο MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Δεν έχω λογαριασμό στο MandrakeOnline και θέλω να αποκτήσω "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Εγγραφή"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Όνομα χρήστη:          "
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Κωδικός πρόσβασης:               "
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Κωδικός πρόσβασης:               "
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Πολιτική Προσωπικού Απορρήτου της Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Πιστοποίηση"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "Εισάγετε το όνομα χρήστη ,κωδικό πρόσβασης και το Όνομα μηχανήματος για το "
 "MandrakeOnline:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Όνομα χρήστη:          "
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Όνομα μηχανήματος:          "
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Κωδικός πρόσβασης:               "
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Γίνεται η αποστολή των στοιχείων σας"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -207,25 +119,7 @@ msgstr ""
 "Και τέλος θα σας προμηθεύσουμε με μια διεύθυνση με το δικό σας "
 "ΌνομαΧρήστη@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Σφάλμα κατά την αποστολή των στοιχείων"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Υπήρξε ένα λάθος κατά την αποστολή των προσωπικών σας στοιχείων.\n"
-"\n"
-"Επιλέξτε Επόμενο για να επαναλάβετε την αποστολή."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Τέλος"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -233,7 +127,7 @@ msgstr ""
 "Από εδώ και πέρα θα παραλαμβάνετε ανακοινώσεις\n"
 "σχετικά με ενημερώσεις ασφαλείας και αναβαθμίσεις χάρη στο MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -242,111 +136,141 @@ msgstr ""
 "Ένα πρόγραμμα θα εκτελείται τακτικά στο σύστημά σας αναμένοντας νέες "
 "αναβαθμίσεις\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Η αποστολή ήταν επιτυχής!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "αυτοματοποιημένες Αναβαθμίσεις"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Επιλέξτε τη γεωγραφική σας θέση"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Ναι θέλω να αυτοματοποιήσω τις αναβαθμίσεις"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Ανάγνωση Ρυθμίσεων\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "ΟΚ"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Άκυρο"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
-"Θέλετε πραγματικά να εγκαταλείψετε το MandrakeOnline;\n"
-"Για να επιστρέψετε στο Βοηθό επιλέξτε 'Άκυρο',\n"
-"για τερματισμό επιλέξτε  'Έξοδος'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Να γίνει οπωσδήποτε τερματισμός; - MandrakeOnline"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Τέλος"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Τερματίζεται ο Οδηγός\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Πρόβλημα σύνδεσης"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Πρόβλημα σύνδεσης"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"Το MandrakeUpdate δεν μπόρεσε να συνδεθεί με την ιστοσελίδα, θα "
+"ξαναδοκιμάσουμε."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Λάθος κωδικός πρόσβασης"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Το όνομα ή ο κωδικός πρόσβασης ήταν λάθος.\n"
+"Θα πρέπει να το ξαναπληκτρολογήσετε ή θα πρέπει να δημιουργήσετε έναν "
+"λογαριασμό στο MandrakeOnline.\n"
+" Στην δεύτερη περίπτωση επιστρέψτε στο πρώτο βήμα για να συνδεθείτε με το "
+"MandrakeOnline.\n"
+"Σημειώστε ότι θα πρέπει να εισάγετε και το Όνομα μηχανήματος\n"
+" (δεκτοί είναι μόνο οι αλφαβητικοί χαρακτήρες)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Κλείσιμο"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Ανάγνωση Ρυθμίσεων\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -409,3 +333,75 @@ msgstr "Αδύνατη η δημιουργία του μέσου mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Αδύνατη η αναβάθμιση των πακέτων από το μέσο mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Αφρική"
+
+#~ msgid "Asia"
+#~ msgstr "Ασία"
+
+#~ msgid "Australia"
+#~ msgstr "Αυστραλία"
+
+#~ msgid "Europe"
+#~ msgstr "Ευρώπη"
+
+#~ msgid "North America"
+#~ msgstr "Βόρια Αμερική"
+
+#~ msgid "South America"
+#~ msgstr "Νότια Αμερική"
+
+#~ msgid "Next"
+#~ msgstr "Επόμενο"
+
+#~ msgid "Quit"
+#~ msgstr "Έξοδος"
+
+#~ msgid "Back"
+#~ msgstr "Πίσω"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Προειδοποίηση: Δεν έχει επιλεγεί περιηγητής"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Γίνεται η αποστολή των στοιχείων σας"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Σφάλμα κατά την αποστολή των στοιχείων"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Υπήρξε ένα λάθος κατά την αποστολή των προσωπικών σας στοιχείων.\n"
+#~ "\n"
+#~ "Επιλέξτε Επόμενο για να επαναλάβετε την αποστολή."
+
+#~ msgid "Finished"
+#~ msgstr "Τέλος"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Επιλέξτε τη γεωγραφική σας θέση"
+
+#~ msgid "OK"
+#~ msgstr "ΟΚ"
+
+#~ msgid "Cancel"
+#~ msgstr "Άκυρο"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Θέλετε πραγματικά να εγκαταλείψετε το MandrakeOnline;\n"
+#~ "Για να επιστρέψετε στο Βοηθό επιλέξτε 'Άκυρο',\n"
+#~ "για τερματισμό επιλέξτε  'Έξοδος'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Να γίνει οπωσδήποτε τερματισμός; - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Κλείσιμο"
diff --git a/po/eo.po b/po/eo.po
index 1ab35124..942ba77b 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-03-14 14:56-0400\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: esperanto <eo@li.org>\n"
@@ -15,149 +15,70 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:65
-msgid "Asia"
-msgstr ""
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr ""
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr ""
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr ""
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
+msgstr "Bonvenon al MandrakeOnline"
 
-#: ../mdkonline:69
-msgid "South America"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Sekva"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Finu"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Eliru"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Reen"
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Bonvenon al MandrakeOnline"
 
-#: ../mdkonline:92
+#: ../mdkonline:103
 #, fuzzy
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr "Mi ne havas Mandrake Online konton kaj mi deziras ĝin "
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr "Abonu"
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr ""
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Eliras Sorĉilon\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Averto: Neniu foliumilo specifita"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Konektproblemo"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Salutnomo:"
 
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Konektproblemo"
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Pasvorto:"
 
-#: ../mdkonline:282 ../mdkonline:347
+#: ../mdkonline:109
 #, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate ne povis kontakti la retejon, ni reprovos."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Malĝusta pasvorto"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
-msgstr "Bonvenon al MandrakeOnline"
+msgid "Confirm Password:"
+msgstr "Pasvorto:"
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Salutnomo:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Pasvorto:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr ""
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -177,135 +98,144 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Eraro dum mi sendas informon"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Finis"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 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 ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
 msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "En Ordo"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Nuligu"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
 msgstr ""
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
+#: ../mdkonline:186
+msgid "Please provide a login"
 msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Finu"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Eliras Sorĉilon\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Konektproblemo"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Konektproblemo"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate ne povis kontakti la retejon, ni reprovos."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Malĝusta pasvorto"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Fermu"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr ""
 
 #: ../mdkupdate:43
 #, perl-format
@@ -364,3 +294,30 @@ msgstr "Ne kapablas krei mdkupdate-aĵon.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'mdkupdate medium'.\n"
+
+#~ msgid "Next"
+#~ msgstr "Sekva"
+
+#~ msgid "Quit"
+#~ msgstr "Eliru"
+
+#~ msgid "Back"
+#~ msgstr "Reen"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Averto: Neniu foliumilo specifita"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Eraro dum mi sendas informon"
+
+#~ msgid "Finished"
+#~ msgstr "Finis"
+
+#~ msgid "OK"
+#~ msgstr "En Ordo"
+
+#~ msgid "Cancel"
+#~ msgstr "Nuligu"
+
+#~ msgid "Close"
+#~ msgstr "Fermu"
diff --git a/po/es.po b/po/es.po
index c341ed46..dcbf9412 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-10 17:40-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -20,119 +20,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "África"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Norteamérica"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Sudamérica"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Siguiente"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Acabar"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Salir"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Anterior"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "No tengo ninguna cuenta en Mandrake Online y quiero una "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Suscribir"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Sí, quiero automatizar las actualizaciones"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Saliendo del asistente\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Réplica vacía"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "Réplica vacía. Por favor, elija un sitio."
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Aviso: No especificó ningún navegador"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Conectando...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problema de conexión"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"MandrakeUpdate no pudo contactar el sitio, ipor favor, vuélvalo a intentar "
-"más tarde.."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Contraseña incorrecta"
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"Su nombre de usuario no era correcto.\n"
-" Tendrá que volverlo a escribir, o necesitará crear una cuenta en "
-"MandrakeOnline.\n"
-" En el último caso, vaya hasta el primer paso para conectarse a "
-"MandrakeOnline.\n"
-" Tenga presente que también debe proporcionar un nombre de Máquina \n"
-" (sólo se admiten caracteres alfabéticos)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "Enviando configuración..."
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Bienvenido a MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -144,37 +40,55 @@ msgstr ""
 "(paquetes, configuración del hardware) a una base de datos centralizada\n"
 "para mantenerle informado de actualizaciones de seguridad y mejoras útiles.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Bienvenido a MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "No tengo ninguna cuenta en Mandrake Online y quiero una "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Suscribir"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Usuario:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Contraseña:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Política de privacidad de Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Autentificación"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "Introduzca su nombre de usuario, contraseña y nombre de máquina de "
 "MandrakeOnline:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Usuario:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Nombre de máquina:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Contraseña:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Enviando su configuración"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -209,25 +123,7 @@ msgstr ""
 "Finalmente, se le concederá un alias de correo del estilo\n"
 "nombreusuario@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Error mientras se enviaban las informaciones"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Hubo un error mientras se enviaba su información personal.\n"
-"\n"
-"Pulse Siguiente para intentar enviar su configuración de nuevo."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Acabado"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -235,7 +131,7 @@ msgstr ""
 "Desde ahora, recibirá anuncions de seguridad\n"
 "y actualizaciones gracias a MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -244,172 +140,139 @@ msgstr ""
 "Se ejecutará regularmente un programa  en su sistema a la espera de nuevas "
 "actualizaciones\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Actualización exitosa"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "actualizaciones automatizadas"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Seleccione su ubicación geográfica"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Sí, quiero automatizar las actualizaciones"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Leyendo la configuración\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "Aceptar"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Cancelar"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
 msgstr ""
-"¿Seguro que desea concluir MandrakeOnline?\n"
-"Para volver al asistente, pulse 'Cancelar'.\n"
-"Para salir realmente, pulse 'Salir'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "¿Concluir realmente? - MandrakeOnline"
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
-"Está utilizando la distribución gratuita de Mandrake Linux Download Edition "
-"por primera vez. \n"
-" \n"
-"En estos momentos hay más de tres millones de usuarios de Mandrake Linux en "
-"el mundo!.\n"
-"\n"
-" Por favor, dedique unos pocos segundos para rellenar un pequeño "
-"cuestionario. Los datos contenidos en este cuestionario serán utilizados "
-"solamente para añadirlos al estudio de mercado.\n"
-"El texto que viene a continuación es la política de privacidad de "
-"MandrakeSoft con respecto a sus datos personales."
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Acabar"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Saliendo del asistente\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Conectando...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problema de conexión"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"MandrakeUpdate no pudo contactar el sitio, ipor favor, vuélvalo a intentar "
+"más tarde.."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Contraseña incorrecta"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
-"¿Qué datos personales recogemos?         \n"
-"                               \n"
-"Se colecta varia información en distintas áreas del sitio web; \n"
-"lo que sigue a continuación es un compendio de los datos que guardamos:\n"
-"\n"
-"En primer lugar guardamos su dirección de correo-e, nombre y dirección de "
-"correo postal.\n"
-"En segundo lugar le asignamos un ID de usuario único. Este ID será usado \n"
-"para añadir información adicional relacionada con su cuenta Mandrake, \n"
-"como por ejemplo:\n"
-"    - Su suscripción a listas de correo.\n"
-"    - Cuando registre un producto adquirido, le pedimos información "
-"personal, así como datos sobre su sistema y su hardware, con el fin de poder "
-"darle el mejor soporte y el servicio personalizado que necesite.\n"
-"    - En nuestra página de donaciones y en nuestra tienda online "
-"(MandrakeStore), guardamos sus datos para la facturación (no guardamos dato "
-"alguno sobre su tarjeta de crédito).\n"
-"    \n"
-"¿Qué hacemos con esta información?\n"
-"\n"
-"Nunca compartimos información personal con otras personas o empresas. \n"
-"Utilizamos estos datos estrictamente para los siguientes propósitos: \n"
-"    - Si se ha suscrito a una lista de correo, guardamos su dirección de "
-"correo-e \n"
-"en nuestra base de datos para darle información personalizada y/o para \n"
-"posibilitarle la participación en los debates de varias listas de correo. Si "
-"Ud. \n"
-"manda un mensaje a una de dichas listas, otros usuarios verán su dirección \n"
-"e-mail pero no hay terceras partes que tengan acceso a nuestra base de \n"
-"datos de suscriptores. Puede darse de baja de cualquier lista utilizando \n"
-"el formulario apropiado. \n"
-"    - Si en proporciona información al registrar un producto que ha "
-"adquirido, \n"
-" guardamos dicha información privada con el fin de poder darle soporte. \n"
-"Solo en el caso de que uno de los miembros de nuestro equipo la necesite "
-"para proporcionarle ayuda, se la facilitaremos.\n"
-"    - Si utiliza MandrakeStore, también utilizamos su ID de cliente para "
-"hacer el seguimiento de su pedido y entregarle sus productos.\n"
-"    - Si nos facilita información de marketing la guardamos sólo para "
-"nuestro uso interno, con el fin de mejorar nuestros productos y adaptarlos "
-"mejor a sus necesidades, haya Ud. adquirido un producto o no.\n"
-"\n"
-"¿Cómo cambiar o corregir sus datos personales? \n"
-"\n"
-"La legislación francesa otorga a las personas, el derecho de acceder, "
-"corregir, modificar o eliminar sus datos personales de nuestra base de "
-"datos. Nosotros ofrecemos ésto como un derecho universal. Ud. puede \n"
-"ejercer este derecho en cualquier momento, introduciendo sus datos de \n"
-"usuario con su ID de cliente y editando sus datos. Para hacerlo puede \n"
-"entrar en esta página: http://www.mandrakeonline.net"
+"Su nombre de usuario no era correcto.\n"
+" Tendrá que volverlo a escribir, o necesitará crear una cuenta en "
+"MandrakeOnline.\n"
+" En el último caso, vaya hasta el primer paso para conectarse a "
+"MandrakeOnline.\n"
+" Tenga presente que también debe proporcionar un nombre de Máquina \n"
+" (sólo se admiten caracteres alfabéticos)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Enviando configuración..."
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Cerrar"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Leyendo la configuración\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -469,3 +332,207 @@ msgstr "No se puede crear el soporte mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "No se pueden actualizar paquetes desde el soporte mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "África"
+
+#~ msgid "Asia"
+#~ msgstr "Asia"
+
+#~ msgid "Australia"
+#~ msgstr "Australia"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "Norteamérica"
+
+#~ msgid "South America"
+#~ msgstr "Sudamérica"
+
+#~ msgid "Next"
+#~ msgstr "Siguiente"
+
+#~ msgid "Quit"
+#~ msgstr "Salir"
+
+#~ msgid "Back"
+#~ msgstr "Anterior"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Réplica vacía"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "Réplica vacía. Por favor, elija un sitio."
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Aviso: No especificó ningún navegador"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Enviando su configuración"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Error mientras se enviaban las informaciones"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Hubo un error mientras se enviaba su información personal.\n"
+#~ "\n"
+#~ "Pulse Siguiente para intentar enviar su configuración de nuevo."
+
+#~ msgid "Finished"
+#~ msgstr "Acabado"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Seleccione su ubicación geográfica"
+
+#~ msgid "OK"
+#~ msgstr "Aceptar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "¿Seguro que desea concluir MandrakeOnline?\n"
+#~ "Para volver al asistente, pulse 'Cancelar'.\n"
+#~ "Para salir realmente, pulse 'Salir'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "¿Concluir realmente? - MandrakeOnline"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ "Está utilizando la distribución gratuita de Mandrake Linux Download "
+#~ "Edition por primera vez. \n"
+#~ " \n"
+#~ "En estos momentos hay más de tres millones de usuarios de Mandrake Linux "
+#~ "en el mundo!.\n"
+#~ "\n"
+#~ " Por favor, dedique unos pocos segundos para rellenar un pequeño "
+#~ "cuestionario. Los datos contenidos en este cuestionario serán utilizados "
+#~ "solamente para añadirlos al estudio de mercado.\n"
+#~ "El texto que viene a continuación es la política de privacidad de "
+#~ "MandrakeSoft con respecto a sus datos personales."
+
+#~ msgid ""
+#~ "What personal data do we collect ?         \n"
+#~ "                               \n"
+#~ "Various information is collected in different areas of the website;\n"
+#~ "what follows is an overview of the data we keep:\n"
+#~ "\n"
+#~ "Firstly, we record your email address, name and postal address.\n"
+#~ "Secondly we give you a unique customer ID. This ID will be used to \n"
+#~ "add additional information related to your Mandrake account such as:\n"
+#~ "    - Your subscription to mailling lists.\n"
+#~ "    - When registering a purchased product, we ask for personal\n"
+#~ "information as well as system/hardware details so that we may deliver\n"
+#~ "the best support services customized to your needs.\n"
+#~ "    - On our donation page and on our online store (MandrakeStore), we\n"
+#~ "record data for billing purpose (we do not store any credit card data).\n"
+#~ "    \n"
+#~ "What do we do with this information?\n"
+#~ "\n"
+#~ "We never share personal information with other persons or companies -\n"
+#~ "we use this data strictly for the following purposes:\n"
+#~ "    - If you have subscribed to a mailing list, we keep this email\n"
+#~ "address in our database to provide you with customized information\n"
+#~ "and/or to enable you to participate in discussions in various mailing\n"
+#~ "lists. If you send a message to such a list, other people will see\n"
+#~ "your email address but no external parties have access to our database\n"
+#~ "of subscribers. At any time you may unsubscribe to any list by using\n"
+#~ "the appropriate form.\n"
+#~ "    - If you provide information when registering a purchased product\n"
+#~ "to receive support, we keep this information private unless the\n"
+#~ "information is required by one of our partners to deliver the support\n"
+#~ "you require.\n"
+#~ "    - If you use MandrakeStore, we also use your Customer ID to track\n"
+#~ "your order and deliver your products.\n"
+#~ "    - If you provide us with marketing information, we keep it for \n"
+#~ "internal use only in order to improve our products so that they can \n"
+#~ "better fit your needs whether you have purchased a product or not.), How "
+#~ "to change / correct your personal data?\n"
+#~ "\n"
+#~ "French law gives individuals the right to access, correct, modify or \n"
+#~ "remove their own personal data that we have on record. We offer this \n"
+#~ "as a worldwide privilege. You may execute this right at any time by \n"
+#~ "logging to your account with your customer ID and editing your\n"
+#~ "personnal data. You can log on to this page: http://www.mandrakeonline.net"
+#~ msgstr ""
+#~ "¿Qué datos personales recogemos?         \n"
+#~ "                               \n"
+#~ "Se colecta varia información en distintas áreas del sitio web; \n"
+#~ "lo que sigue a continuación es un compendio de los datos que guardamos:\n"
+#~ "\n"
+#~ "En primer lugar guardamos su dirección de correo-e, nombre y dirección de "
+#~ "correo postal.\n"
+#~ "En segundo lugar le asignamos un ID de usuario único. Este ID será "
+#~ "usado \n"
+#~ "para añadir información adicional relacionada con su cuenta Mandrake, \n"
+#~ "como por ejemplo:\n"
+#~ "    - Su suscripción a listas de correo.\n"
+#~ "    - Cuando registre un producto adquirido, le pedimos información "
+#~ "personal, así como datos sobre su sistema y su hardware, con el fin de "
+#~ "poder darle el mejor soporte y el servicio personalizado que necesite.\n"
+#~ "    - En nuestra página de donaciones y en nuestra tienda online "
+#~ "(MandrakeStore), guardamos sus datos para la facturación (no guardamos "
+#~ "dato alguno sobre su tarjeta de crédito).\n"
+#~ "    \n"
+#~ "¿Qué hacemos con esta información?\n"
+#~ "\n"
+#~ "Nunca compartimos información personal con otras personas o empresas. \n"
+#~ "Utilizamos estos datos estrictamente para los siguientes propósitos: \n"
+#~ "    - Si se ha suscrito a una lista de correo, guardamos su dirección de "
+#~ "correo-e \n"
+#~ "en nuestra base de datos para darle información personalizada y/o para \n"
+#~ "posibilitarle la participación en los debates de varias listas de correo. "
+#~ "Si Ud. \n"
+#~ "manda un mensaje a una de dichas listas, otros usuarios verán su "
+#~ "dirección \n"
+#~ "e-mail pero no hay terceras partes que tengan acceso a nuestra base de \n"
+#~ "datos de suscriptores. Puede darse de baja de cualquier lista "
+#~ "utilizando \n"
+#~ "el formulario apropiado. \n"
+#~ "    - Si en proporciona información al registrar un producto que ha "
+#~ "adquirido, \n"
+#~ " guardamos dicha información privada con el fin de poder darle soporte. \n"
+#~ "Solo en el caso de que uno de los miembros de nuestro equipo la necesite "
+#~ "para proporcionarle ayuda, se la facilitaremos.\n"
+#~ "    - Si utiliza MandrakeStore, también utilizamos su ID de cliente para "
+#~ "hacer el seguimiento de su pedido y entregarle sus productos.\n"
+#~ "    - Si nos facilita información de marketing la guardamos sólo para "
+#~ "nuestro uso interno, con el fin de mejorar nuestros productos y "
+#~ "adaptarlos mejor a sus necesidades, haya Ud. adquirido un producto o no.\n"
+#~ "\n"
+#~ "¿Cómo cambiar o corregir sus datos personales? \n"
+#~ "\n"
+#~ "La legislación francesa otorga a las personas, el derecho de acceder, "
+#~ "corregir, modificar o eliminar sus datos personales de nuestra base de "
+#~ "datos. Nosotros ofrecemos ésto como un derecho universal. Ud. puede \n"
+#~ "ejercer este derecho en cualquier momento, introduciendo sus datos de \n"
+#~ "usuario con su ID de cliente y editando sus datos. Para hacerlo puede \n"
+#~ "entrar en esta página: http://www.mandrakeonline.net"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Cerrar"
diff --git a/po/et.po b/po/et.po
index fc664126..58f1e285 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-et\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-06 20:51+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,119 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Aafrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Aasia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Austraalia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Euroopa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Põhja-Ameerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Lõuna-Ameerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Järgmine"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Lõpeta"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Välju"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Tagasi"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Mul ei ole veel MandrakeOnline'i kontot, aga ma tahan seda"
-
-# Sisu on õieti tabatud
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Konto loomine"
-
-#
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Jah, soovin automaatset uuendamist"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Nõustajast väljumine\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Tühi peegel"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "Tühi peegel. Palun valige asukoht."
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Hoiatus: brauserit ei ole määratud"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Ühendumine...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Probleem ühendusega"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeOnline'iga ei saadud ühendust, palun proovige hiljem uuesti"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Vale parool"
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 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:320
-msgid "Sending configuration..."
-msgstr "Konfiguratsiooni saatmine..."
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Tere tulemast MandrakeOnline'i"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -140,35 +36,54 @@ msgstr ""
 "(paketid, riistvara) tsentraalsesse andmebaasi, et edaspidi\n"
 "teavitada Teid turvaparandustest ja kasulikest uuendustest.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Tere tulemast MandrakeOnline'i"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Mul ei ole veel MandrakeOnline'i kontot, aga ma tahan seda"
+
+# Sisu on õieti tabatud
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Konto loomine"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Kasutajatunnus:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Parool:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Parool:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake privaatsuspoliitika"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Autentimine"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Sisestage oma MandrakeOnline'i kasutajatunnus, parool ja masina nimi:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Kasutajatunnus:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Masina nimi:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Parool:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Konfiguratsiooni saatmine"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -202,25 +117,7 @@ msgstr ""
 "teenuste puhul.\n"
 "Ja lõpuks saate ka e-posti aadressi: kasutajatunnus@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Viga info saatmisel"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Teie info saatmisel tekkis viga.\n"
-"\n"
-"Vajutage nupule 'Järgmine', et püüda konfiguratsiooni uuesti saata."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Lõpetatud"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -228,7 +125,7 @@ msgstr ""
 "Nüüdsest alates saate tänu MandrakeOnline'ile \n"
 "teateid turvaparanduste ja uuenduste kohta."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -236,166 +133,138 @@ msgstr ""
 "MandrakeOnline pakub võimalust uuendamine automaatseks muuta.\n"
 "Selleks käivitatakse Teie arvutis regulaarselt rakendus, mis otsib uuendusi\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Saatmine õnnestus!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automaatne uuendamine"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Valige oma geograafiline asukoht"
+#
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Jah, soovin automaatset uuendamist"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Konfiguratsiooni tuvastamine\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "Olgu"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Loobu"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
 msgstr ""
-"Kas tõesti loobute MandrakeOnline'ist?\n"
-"Tagasipöördumiseks nõustajasse vajutage nupule 'Loobu',\n"
-"kui tahate kindlasti loobuda, siis 'Välju'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Kas tõesti loobuda? - MandrakeOnline"
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
-"Te olete esimest korda käivitamas Mandrake Linuxi vaba allalaaditavat "
-"versiooni. \n"
-"\n"
-"Te olete üks kolmest miljonist inimesest maailmas, kes kasutab Mandrake "
-"Linuxit!\n"
-"\n"
-"Palun hoidke end veel mõni hetk tagasi ja täitke järgnev küsimustik. Selle \n"
-"andmeid kasutatakse turuandmete üldistamiseks.\n"
-"Allolev tekst tutvustab MandrakeSofti poliitikat Teie andmete turvalisuse "
-"kaitsmisel."
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Lõpeta"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Nõustajast väljumine\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Ühendumine...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Probleem ühendusega"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeOnline'iga ei saadud ühendust, palun proovige hiljem uuesti"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Vale parool"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
-"Milliseid isiklikke andmeid me kogume?\n"
-"\n"
-"Veebilehekülje erinevates osades leidub erinevat infot; siinkohal anname\n"
-"ülevaate andmetest, mida me seal säilitame:\n"
-"\n"
-"Kõigepealt salvestame Teie e-posti aadressi, nime ja postiaadressi.\n"
-"Teiseks anname Teile unikaalse kasutaja-ID. Seda läheb tarvis Teie\n"
-"MandrakeOnline'i kontoga seonduva uue info lisamiseks, milleks võib olla:\n"
-"    - Meililistide tellimise info.\n"
-"    - Ostetud toote registreerimisel palume Teilt nii erainfot kui infot\n"
-"süsteemi ja riistvara üksikasjade kohta, et võiksime pakkuda Teile just\n"
-"Teie vajadustega sobivat ja parimat teenindust.\n"
-"    - Meie annetusteleheküljel ja internetikaupluses (MandrakeStore)\n"
-"salvestatakse andmed, mis hõlbustavad ostmist (krediitkaardi andmeid ei "
-"salvestata).\n"
-"\n"
-"\n"
-"Mida me selle infoga peale hakkame?\n"
-"Me ei jaga kindlasti Teie erainfot teistele inimestele või firmadele - \n"
-"kogutud andmeid kasutatakse väga piiratud eesmärgil:\n"
-"    - Kui olete tellinud mõne meililisti, hoiame Teie e-posti aadressi\n"
-"oma andmebaasis, et pakkuda just Teile sobivat infot ja/või võimalust\n"
-"osaleda meililistide diskussioonides. Kui saadate listi kirja, näevad\n"
-"Teie aadressi ka teised inimesed, kuid meie tellijate andmebaasile ei ole\n"
-"ligipääsu ühelgi kolmandal poolel. Vastavat vormi kasutades on Teil ka\n"
-"iga hetk võimalik meililisti tellimisest loobuda.\n"
-"    - Kui annate meile ostetud toote registreerimisel teenuste\n"
-"osutamiseks vajaliku info, säilitame me selle teiste eest varjatuna,\n"
-"vähemalt seni, kuni mõni meie partneritest ei soovi infot, mida läheb\n"
-"vaja Teie soovitud teenuse osutamiseks.\n"
-"    - Kui olete MandrakeStore kasutaja, tarvitame Teie kasutaja-ID-d\n"
-"tellimuse sidumiseks Teie isikuga ning selle kättetoimetamiseks.\n"
-"    - Kui jagate meiega turundusinfot, kasutame me seda ainult ise,\n"
-"et muuta oma tooted paremaks ja sobivamaks Teie vajadustele sõltumata\n"
-"sellest, kas Te olete neid ostnud või mitte.\n"
-"\n"
-"\n"
-"Kuidas muuta/täpsustada oma eraandmeid?\n"
-"\n"
-"Vastavalt Prantsuse seadustele on eraisikul õigus pääseda ligi,\n"
-"täpsustada, muuta või eemaldada andmeid, mida me oleme kogunud.\n"
-"Meie pakume sellist võimalust kogu maailmale. Te võite seda õigust\n"
-"kasutada iga hetk, logides end kasutaja-ID abil oma kontole\n"
-"sisse ning muutes neid andmeid, mida vajalikuks peate. Sisse logida\n"
-"saab leheküljel http://www.mandrakeonline.net"
+"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:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Konfiguratsiooni saatmine..."
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Sulge"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Konfiguratsiooni tuvastamine\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -456,3 +325,201 @@ msgstr "mdkupdate andemekandja loomine ebaõnnestus.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Pakettide värskendamine mdkupdate andmekandjalt ebaõnnestus.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Aafrika"
+
+#~ msgid "Asia"
+#~ msgstr "Aasia"
+
+#~ msgid "Australia"
+#~ msgstr "Austraalia"
+
+#~ msgid "Europe"
+#~ msgstr "Euroopa"
+
+#~ msgid "North America"
+#~ msgstr "Põhja-Ameerika"
+
+#~ msgid "South America"
+#~ msgstr "Lõuna-Ameerika"
+
+#~ msgid "Next"
+#~ msgstr "Järgmine"
+
+#~ msgid "Quit"
+#~ msgstr "Välju"
+
+#~ msgid "Back"
+#~ msgstr "Tagasi"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Tühi peegel"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "Tühi peegel. Palun valige asukoht."
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Hoiatus: brauserit ei ole määratud"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Konfiguratsiooni saatmine"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Viga info saatmisel"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Teie info saatmisel tekkis viga.\n"
+#~ "\n"
+#~ "Vajutage nupule 'Järgmine', et püüda konfiguratsiooni uuesti saata."
+
+#~ msgid "Finished"
+#~ msgstr "Lõpetatud"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Valige oma geograafiline asukoht"
+
+#~ msgid "OK"
+#~ msgstr "Olgu"
+
+#~ msgid "Cancel"
+#~ msgstr "Loobu"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Kas tõesti loobute MandrakeOnline'ist?\n"
+#~ "Tagasipöördumiseks nõustajasse vajutage nupule 'Loobu',\n"
+#~ "kui tahate kindlasti loobuda, siis 'Välju'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Kas tõesti loobuda? - MandrakeOnline"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ "Te olete esimest korda käivitamas Mandrake Linuxi vaba allalaaditavat "
+#~ "versiooni. \n"
+#~ "\n"
+#~ "Te olete üks kolmest miljonist inimesest maailmas, kes kasutab Mandrake "
+#~ "Linuxit!\n"
+#~ "\n"
+#~ "Palun hoidke end veel mõni hetk tagasi ja täitke järgnev küsimustik. "
+#~ "Selle \n"
+#~ "andmeid kasutatakse turuandmete üldistamiseks.\n"
+#~ "Allolev tekst tutvustab MandrakeSofti poliitikat Teie andmete turvalisuse "
+#~ "kaitsmisel."
+
+#~ msgid ""
+#~ "What personal data do we collect ?         \n"
+#~ "                               \n"
+#~ "Various information is collected in different areas of the website;\n"
+#~ "what follows is an overview of the data we keep:\n"
+#~ "\n"
+#~ "Firstly, we record your email address, name and postal address.\n"
+#~ "Secondly we give you a unique customer ID. This ID will be used to \n"
+#~ "add additional information related to your Mandrake account such as:\n"
+#~ "    - Your subscription to mailling lists.\n"
+#~ "    - When registering a purchased product, we ask for personal\n"
+#~ "information as well as system/hardware details so that we may deliver\n"
+#~ "the best support services customized to your needs.\n"
+#~ "    - On our donation page and on our online store (MandrakeStore), we\n"
+#~ "record data for billing purpose (we do not store any credit card data).\n"
+#~ "    \n"
+#~ "What do we do with this information?\n"
+#~ "\n"
+#~ "We never share personal information with other persons or companies -\n"
+#~ "we use this data strictly for the following purposes:\n"
+#~ "    - If you have subscribed to a mailing list, we keep this email\n"
+#~ "address in our database to provide you with customized information\n"
+#~ "and/or to enable you to participate in discussions in various mailing\n"
+#~ "lists. If you send a message to such a list, other people will see\n"
+#~ "your email address but no external parties have access to our database\n"
+#~ "of subscribers. At any time you may unsubscribe to any list by using\n"
+#~ "the appropriate form.\n"
+#~ "    - If you provide information when registering a purchased product\n"
+#~ "to receive support, we keep this information private unless the\n"
+#~ "information is required by one of our partners to deliver the support\n"
+#~ "you require.\n"
+#~ "    - If you use MandrakeStore, we also use your Customer ID to track\n"
+#~ "your order and deliver your products.\n"
+#~ "    - If you provide us with marketing information, we keep it for \n"
+#~ "internal use only in order to improve our products so that they can \n"
+#~ "better fit your needs whether you have purchased a product or not.), How "
+#~ "to change / correct your personal data?\n"
+#~ "\n"
+#~ "French law gives individuals the right to access, correct, modify or \n"
+#~ "remove their own personal data that we have on record. We offer this \n"
+#~ "as a worldwide privilege. You may execute this right at any time by \n"
+#~ "logging to your account with your customer ID and editing your\n"
+#~ "personnal data. You can log on to this page: http://www.mandrakeonline.net"
+#~ msgstr ""
+#~ "Milliseid isiklikke andmeid me kogume?\n"
+#~ "\n"
+#~ "Veebilehekülje erinevates osades leidub erinevat infot; siinkohal anname\n"
+#~ "ülevaate andmetest, mida me seal säilitame:\n"
+#~ "\n"
+#~ "Kõigepealt salvestame Teie e-posti aadressi, nime ja postiaadressi.\n"
+#~ "Teiseks anname Teile unikaalse kasutaja-ID. Seda läheb tarvis Teie\n"
+#~ "MandrakeOnline'i kontoga seonduva uue info lisamiseks, milleks võib "
+#~ "olla:\n"
+#~ "    - Meililistide tellimise info.\n"
+#~ "    - Ostetud toote registreerimisel palume Teilt nii erainfot kui infot\n"
+#~ "süsteemi ja riistvara üksikasjade kohta, et võiksime pakkuda Teile just\n"
+#~ "Teie vajadustega sobivat ja parimat teenindust.\n"
+#~ "    - Meie annetusteleheküljel ja internetikaupluses (MandrakeStore)\n"
+#~ "salvestatakse andmed, mis hõlbustavad ostmist (krediitkaardi andmeid ei "
+#~ "salvestata).\n"
+#~ "\n"
+#~ "\n"
+#~ "Mida me selle infoga peale hakkame?\n"
+#~ "Me ei jaga kindlasti Teie erainfot teistele inimestele või firmadele - \n"
+#~ "kogutud andmeid kasutatakse väga piiratud eesmärgil:\n"
+#~ "    - Kui olete tellinud mõne meililisti, hoiame Teie e-posti aadressi\n"
+#~ "oma andmebaasis, et pakkuda just Teile sobivat infot ja/või võimalust\n"
+#~ "osaleda meililistide diskussioonides. Kui saadate listi kirja, näevad\n"
+#~ "Teie aadressi ka teised inimesed, kuid meie tellijate andmebaasile ei "
+#~ "ole\n"
+#~ "ligipääsu ühelgi kolmandal poolel. Vastavat vormi kasutades on Teil ka\n"
+#~ "iga hetk võimalik meililisti tellimisest loobuda.\n"
+#~ "    - Kui annate meile ostetud toote registreerimisel teenuste\n"
+#~ "osutamiseks vajaliku info, säilitame me selle teiste eest varjatuna,\n"
+#~ "vähemalt seni, kuni mõni meie partneritest ei soovi infot, mida läheb\n"
+#~ "vaja Teie soovitud teenuse osutamiseks.\n"
+#~ "    - Kui olete MandrakeStore kasutaja, tarvitame Teie kasutaja-ID-d\n"
+#~ "tellimuse sidumiseks Teie isikuga ning selle kättetoimetamiseks.\n"
+#~ "    - Kui jagate meiega turundusinfot, kasutame me seda ainult ise,\n"
+#~ "et muuta oma tooted paremaks ja sobivamaks Teie vajadustele sõltumata\n"
+#~ "sellest, kas Te olete neid ostnud või mitte.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kuidas muuta/täpsustada oma eraandmeid?\n"
+#~ "\n"
+#~ "Vastavalt Prantsuse seadustele on eraisikul õigus pääseda ligi,\n"
+#~ "täpsustada, muuta või eemaldada andmeid, mida me oleme kogunud.\n"
+#~ "Meie pakume sellist võimalust kogu maailmale. Te võite seda õigust\n"
+#~ "kasutada iga hetk, logides end kasutaja-ID abil oma kontole\n"
+#~ "sisse ning muutes neid andmeid, mida vajalikuks peate. Sisse logida\n"
+#~ "saab leheküljel http://www.mandrakeonline.net"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Sulge"
diff --git a/po/eu.po b/po/eu.po
index 86af9714..0d9733b0 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-05-26 23:07+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -17,119 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Ipar Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Hego Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Hurrengoa"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Amaitu"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Irten"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Atzera"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Ez dut MandrakeOnline-ren konturik eta nahiko nuke "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Harpidetu"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Bai, eguneratze automatikoak nahi ditut"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Morroitik irteten\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Abisua: Ez da arakatzailerik zehaztu"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Konexio-arazoa"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Konexio-arazoa"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate-k ezin izan du lekua kontaktatu, berriro saiatuko gara."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Pasahitza oker"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Erabiltzaile-izena edo pasahitza oker.\n"
-"Berriz idatzi beharko duzu, edo kontu bat sortu beharko duzu MandrakeOnline-"
-"n.\n"
-"Kontua sortu behar baduzu, joan atzera lehen urratsera MandrakeOnline-rekin "
-"konektatzeko.\n"
-"Kontuan izan Makinaren izena ere idatzi behar duzula \n"
-" (alfabetoaren karaktereak bakarrik erabil daitezke)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Ongi etorri MandrakeOnline-ra"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -141,35 +37,53 @@ msgstr ""
 "datu-base zentralizatu batera kargatzen lagunduko dizu, segurtasuneko \n"
 "eguneratzeen eta bertsio-berritzeen informazioa jaso ahal izan dezazun.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Ongi etorri MandrakeOnline-ra"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Ez dut MandrakeOnline-ren konturik eta nahiko nuke "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Harpidetu"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Izena:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Pasahitza:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Pasahitza:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake-ren pribatutasun-gidalerroa"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Autentifikazioa"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Idatzi MandrakeOnline-n sartzeko izena, pasahitza eta makinaren izena:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Izena:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Makinaren izena:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Pasahitza:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Zure konfigurazioa bidaltzen"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -204,25 +118,7 @@ msgstr ""
 "Azkenik, posta elektroniko alias bat emango dizugu: zure "
 "erabiltzaile_izena@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Errorea informazioa bidaltzean"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Errorea gertatu da zure informazio pertsonala bidaltzean.\n"
-"\n"
-"Egin klik 'Hurrengoa'n, berriro saiatzeko konfigurazioa bidaltzen."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Amaituta"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -230,7 +126,7 @@ msgstr ""
 "Hemendik aurrera segurtasunaren eta bertsio berrien\n"
 "informazioa jasoko duzu MandrakeOnline-ri esker."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -239,111 +135,139 @@ msgstr ""
 "Tarteka, programa bat exekutatuko da zure sisteman eguneratzerik dagoen "
 "ikusteko\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Kargatzea behar bezala egin da!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "bertsio-berritze automatizatuak"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Aukeratu zure kokaleku geografikoa"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Bai, eguneratze automatikoak nahi ditut"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Zure konfigurazioa irakurtzen\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "Ados"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Utzi"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
-"Benetan abortatu nahi duzu MandrakeOnline?\n"
-"Morroira itzultzeko egin klik 'Utzi'n,\n"
-"benetan irteteko egin klik 'Irten'en."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Benetan abortatu? - MandrakeOnline"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Amaitu"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Morroitik irteten\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Konexio-arazoa"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Konexio-arazoa"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate-k ezin izan du lekua kontaktatu, berriro saiatuko gara."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Pasahitza oker"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Erabiltzaile-izena edo pasahitza oker.\n"
+"Berriz idatzi beharko duzu, edo kontu bat sortu beharko duzu MandrakeOnline-"
+"n.\n"
+"Kontua sortu behar baduzu, joan atzera lehen urratsera MandrakeOnline-rekin "
+"konektatzeko.\n"
+"Kontuan izan Makinaren izena ere idatzi behar duzula \n"
+" (alfabetoaren karaktereak bakarrik erabil daitezke)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Itxi"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Zure konfigurazioa irakurtzen\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -404,3 +328,75 @@ msgstr "Ezin mdkupdate euskarria sortu.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "ezin mdkupdate euskarritik paketeak eguneratu.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Asia"
+
+#~ msgid "Australia"
+#~ msgstr "Australia"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "Ipar Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Hego Amerika"
+
+#~ msgid "Next"
+#~ msgstr "Hurrengoa"
+
+#~ msgid "Quit"
+#~ msgstr "Irten"
+
+#~ msgid "Back"
+#~ msgstr "Atzera"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Abisua: Ez da arakatzailerik zehaztu"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Zure konfigurazioa bidaltzen"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Errorea informazioa bidaltzean"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Errorea gertatu da zure informazio pertsonala bidaltzean.\n"
+#~ "\n"
+#~ "Egin klik 'Hurrengoa'n, berriro saiatzeko konfigurazioa bidaltzen."
+
+#~ msgid "Finished"
+#~ msgstr "Amaituta"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Aukeratu zure kokaleku geografikoa"
+
+#~ msgid "OK"
+#~ msgstr "Ados"
+
+#~ msgid "Cancel"
+#~ msgstr "Utzi"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Benetan abortatu nahi duzu MandrakeOnline?\n"
+#~ "Morroira itzultzeko egin klik 'Utzi'n,\n"
+#~ "benetan irteteko egin klik 'Irten'en."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Benetan abortatu? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Itxi"
diff --git a/po/fa.po b/po/fa.po
index 71c69598..e449660f 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-07-08 23:08+0200\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian <en@pgadmin.org>\n"
@@ -16,296 +16,224 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkonline:64
-msgid "Africa"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:65
-msgid "Asia"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
 msgstr ""
 
-#: ../mdkonline:66
-msgid "Australia"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:67
-msgid "Europe"
+#: ../mdkonline:101
+msgid "Create a MandrakeOnline Account"
 msgstr ""
 
-#: ../mdkonline:68
-msgid "North America"
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
 msgstr ""
 
-#: ../mdkonline:69
-msgid "South America"
+#: ../mdkonline:103
+msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:88
-msgid "Finish"
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
 msgstr ""
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
+#: ../mdkonline:109
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
+#: ../mdkonline:117
+msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:93
-msgid "Subscribe"
+#: ../mdkonline:123
+msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
+#: ../mdkonline:124
+msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
+#: ../mdkonline:129
+msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:135
+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"
+"1) the list of packages you have installed on your system,\n"
+"2) your hardware configuration.\n"
+"\n"
+"If you feel uncomfortable by that idea, or do not want to benefit from this "
+"service,\n"
+"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+"informed\n"
+"about security updates and useful upgrades via personalized email alerts.\n"
+"Furthermore, you benefit from discounted paid support services on\n"
+"www.mandrakeexpert.com.\n"
+"Finally, an email alias with your username@mandrakeonline.net will be "
+"provided to you."
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
+#: ../mdkonline:141
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
+#: ../mdkonline:141
+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 ""
 
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "مشکل اتصال"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "مشکل اتصال"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
+#: ../mdkonline:141
+msgid "Your upload was successful!"
 msgstr ""
-"MandrakeUpdate نتوانست با پایگاه تماس بگیرد، ما دوباره امتحان خواهیم کرد."
 
-#: ../mdkonline:294
-msgid "Wrong password"
+#: ../mdkonline:142
+msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:147
+msgid "Country:"
 msgstr ""
 
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
+#: ../mdkonline:172
+msgid "Creation"
 msgstr ""
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
 msgstr ""
 
-#: ../mdkonline:374
-msgid "Mandrake Privacy Policy"
+#: ../mdkonline:173
+msgid "Special Characters"
 msgstr ""
 
-#: ../mdkonline:379
-msgid "Authentification"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline:380
-msgid "Enter your MandrakeOnline login, password and machine name:"
+#: ../mdkonline:174
+msgid "Empty Fields"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Login:"
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Machine name:"
+#: ../mdkonline:175
+msgid "Email"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
+#: ../mdkonline:175
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline:387
-msgid "Sending your Configuration"
+#: ../mdkonline:176
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline:388
-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"
-"1) the list of packages you have installed on your system,\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrakeexpert.com.\n"
-"Finally, an email alias with your username@mandrakeonline.net will be "
-"provided to you."
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
 
-#: ../mdkonline:403
-msgid "Finished"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
 msgstr ""
 
-#: ../mdkonline:404
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to MandrakeOnline."
+#: ../mdkonline:186
+msgid "Please provide a login"
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:188
 msgid ""
-"MandrakeOnline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:404
-msgid "Your upload was successful!"
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:409
-msgid "automated Upgrades"
-msgstr ""
-
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr ""
-
-#: ../mdkonline:435
-msgid "Reading configuration\n"
+#: ../mdkonline:210
+msgid "Finish"
 msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
 msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr ""
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "مشکل اتصال"
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
-msgstr ""
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "مشکل اتصال"
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
 msgstr ""
+"MandrakeUpdate نتوانست با پایگاه تماس بگیرد، ما دوباره امتحان خواهیم کرد."
 
-#: ../mdkonline:567
-msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+#: ../mdkonline:273
+msgid "Wrong password"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkupdate:43
diff --git a/po/fi.po b/po/fi.po
index e6d9cc10..e8960857 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-fi - MDK Linux Release 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-15 19:00+0200\n"
 "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n"
 "Language-Team: Finnish <cooker-i18n@linux-mandrake.com>\n"
@@ -21,116 +21,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrikka"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Aasia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Eurooppa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Pohjois-Amerikka"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Etelä-Amerikka"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Seuraava"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Valmis"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Poistu"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Takaisin"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Minulla ei ole MandrakeOnline-tunnusta ja haluan "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Liittyä"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Kyllä, haluan automaattiset päivitykset"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Poistutaan velhosta\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Tyhjä peilipalvelin"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "Tyhjä peilipalvelin. Ole hyvä ja valitse kohdetta."
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Varoitus: selainta ei ole asetettu"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Yhdistetään ...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Yhteysongelma"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "Ei saatu yhteyttä MandrakeOnlineen kokeile myöhemmin uudelleen."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Väärä salasana"
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"Käyttäjätunnuksesi tai salasanasi oli väärä.\n"
-" Sinun pitää joko kirjoittaa se uudelleen tai luoda tunnus "
-"MandrakeOnlineen.\n"
-" Jälkimmäisessä tapauksessa mene takaisin ensimmäiseen vaiheeseen ottaaksesi "
-"yhteyden MandrakeOnlineen.\n"
-" Tiedoksi: sinun pitää antaa myös koneen nimi (vain kirjaimet hyväksytään)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "Lähetän asetustiedot..."
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Tervetuloa MandrakeOnlineen"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -143,35 +42,53 @@ msgstr ""
 "sinut voitaisiin pitää ajan tasalla turvapäivityksistä ja hyödyllisistä\n"
 "päivityksistä.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Tervetuloa MandrakeOnlineen"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Minulla ei ole MandrakeOnline-tunnusta ja haluan "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Liittyä"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Tunnus:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Salasana:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Salasana:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandraken yksityisyyspolitiikka"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Vahvistetaan"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Syötä MandrakeOnline-käyttäjätunnuksesi, salasanasi sekä koneesi nimi:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Tunnus:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Koneen nimi:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Salasana:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Lähetän asetuksesi"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -205,25 +122,7 @@ msgstr ""
 "maksullisista tukipalveluista.\n"
 "Lopuksi saat sähköposti-aliaksen malli käyttäjänimi@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Virhe lähetettäessä tietoja"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Virhe lähetettäessä henkilötietojasi.\n"
-"\n"
-"Paina Seuraava yrittääksesi lähettää asetuksesi uudelleen."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Valmis"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -231,7 +130,7 @@ msgstr ""
 "Tästä lähtien saat turva- ja päivitysilmoitukset\n"
 "suoraan MandrakeOnlinesta."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -240,121 +139,136 @@ msgstr ""
 "Ohjelma käynnistyy säännöllisesti järjestelmässäsi odottamaan uusia "
 "päivityksiä\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Tietojen siirto onnistui!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automaattiset päivitykset"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Vaihda geograafinen sijaintisi"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Kyllä, haluan automaattiset päivitykset"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Luetaan asetukset\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Peruuta"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
 msgstr ""
-"Haluatko todella keskeyttää MandrakeOnlinen?\n"
-"Palataksesi velhoon paina 'Peruuta',\n"
-"jos haluat todella poistua, paina 'Poistu'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Haluatko todella poistua? - MandrakeOnline"
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
-"Olet käynnistämässä meidän vapaa Mandake Linux Download Edition\n"
-"ensimmäistä kertaa.\n"
-"\n"
-"Nykyhetkellä on yli kolme miljoona Mandrake Linux käyttäjiä ympäri mailmaa!\n"
-"\n"
-"Ole ystävällinen ja täytä seuraava kysely. Tiedot tästä kyselystä käytetään\n"
-"ainoastaan kootussa markkinatutkimuksessa.\n"
-"Alla oleva texti koskee MandrakeSoftin yksityisyys-periattet "
-"henkilökotaisesta\n"
-"tiedoistasi."
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Valmis"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Poistutaan velhosta\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Yhdistetään ...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Yhteysongelma"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "Ei saatu yhteyttä MandrakeOnlineen kokeile myöhemmin uudelleen."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Väärä salasana"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Käyttäjätunnuksesi tai salasanasi oli väärä.\n"
+" Sinun pitää joko kirjoittaa se uudelleen tai luoda tunnus "
+"MandrakeOnlineen.\n"
+" Jälkimmäisessä tapauksessa mene takaisin ensimmäiseen vaiheeseen ottaaksesi "
+"yhteyden MandrakeOnlineen.\n"
+" Tiedoksi: sinun pitää antaa myös koneen nimi (vain kirjaimet hyväksytään)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Lähetän asetustiedot..."
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Sulje"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Luetaan asetukset\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -414,3 +328,110 @@ msgstr "Ei pystytty luomaan mdkupdate lähdettä.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Ei pystytty päivittämään paketteja mdkupdate-lähteestä.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrikka"
+
+#~ msgid "Asia"
+#~ msgstr "Aasia"
+
+#~ msgid "Australia"
+#~ msgstr "Australia"
+
+#~ msgid "Europe"
+#~ msgstr "Eurooppa"
+
+#~ msgid "North America"
+#~ msgstr "Pohjois-Amerikka"
+
+#~ msgid "South America"
+#~ msgstr "Etelä-Amerikka"
+
+#~ msgid "Next"
+#~ msgstr "Seuraava"
+
+#~ msgid "Quit"
+#~ msgstr "Poistu"
+
+#~ msgid "Back"
+#~ msgstr "Takaisin"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Tyhjä peilipalvelin"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "Tyhjä peilipalvelin. Ole hyvä ja valitse kohdetta."
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Varoitus: selainta ei ole asetettu"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Lähetän asetuksesi"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Virhe lähetettäessä tietoja"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Virhe lähetettäessä henkilötietojasi.\n"
+#~ "\n"
+#~ "Paina Seuraava yrittääksesi lähettää asetuksesi uudelleen."
+
+#~ msgid "Finished"
+#~ msgstr "Valmis"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Vaihda geograafinen sijaintisi"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Peruuta"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Haluatko todella keskeyttää MandrakeOnlinen?\n"
+#~ "Palataksesi velhoon paina 'Peruuta',\n"
+#~ "jos haluat todella poistua, paina 'Poistu'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Haluatko todella poistua? - MandrakeOnline"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ "Olet käynnistämässä meidän vapaa Mandake Linux Download Edition\n"
+#~ "ensimmäistä kertaa.\n"
+#~ "\n"
+#~ "Nykyhetkellä on yli kolme miljoona Mandrake Linux käyttäjiä ympäri "
+#~ "mailmaa!\n"
+#~ "\n"
+#~ "Ole ystävällinen ja täytä seuraava kysely. Tiedot tästä kyselystä "
+#~ "käytetään\n"
+#~ "ainoastaan kootussa markkinatutkimuksessa.\n"
+#~ "Alla oleva texti koskee MandrakeSoftin yksityisyys-periattet "
+#~ "henkilökotaisesta\n"
+#~ "tiedoistasi."
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Sulje"
diff --git a/po/fr.po b/po/fr.po
index 2b80c594..90b73fa4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-03-07 22:29+0100\n"
 "Last-Translator: Arnaud Hrycak <arnaud.hrycak@noos.fr>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -17,119 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrique"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asie"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australie"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europe"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Amérique du Nord"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Amérique du Sud"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Suivant"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Terminer"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Quitter"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Retour"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Je n'ai pas de compte MandrakeOnline et je veux "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Souscrire"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Oui, je veux automatiser les mises-à-jour"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Fermeture de l'assistant\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Alerte : aucun navigateur spécifié"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Problème de connexion"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problème de connexion"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate n'a pas pu contacter le site, nous allons réessayer."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Mot de passe incorrect"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Votre identifiant ou mot de passe était incorrect.\n"
-" Vous devrez soit en recommencer la saisie, soit créer un compte "
-"MandrakeOnline.\n"
-" Dans le second cas, revenez à la première étape pour vous connecter à "
-"MandrakeOnline.\n"
-" Veuillez noter que vous devez aussi indiquer un nom de Machine \n"
-" (seuls les caractères alphabétiques sont autorisés)."
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Bienvenue à MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -141,37 +37,55 @@ msgstr ""
 "paquetages, configuration matérielle) vers une base de données centralisée,\n"
 "afin de vous maintenir informé des mises-à-jour de sécurité.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Bienvenue à MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Je n'ai pas de compte MandrakeOnline et je veux "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Souscrire"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Identifiant :"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Mot de passe :"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Mot de passe :"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake et votre vie privée"
 
 # (in english : authentication !)
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Authentification"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "Entrez vos identifiant, mot de passe et nom de machine MandrakeOnline :"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Identifiant :"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Nom de machine :"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Mot de passe :"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Envoi de votre configuration"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -207,25 +121,7 @@ msgstr ""
 "net\n"
 "vous sera fourni."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Erreur à l'envoi des informations"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Une erreur s'est produite pendant l'envoi de vos informations personnelles.\n"
-"\n"
-"Appuyez sur Suivant pour réessayer."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Terminé"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -233,7 +129,7 @@ msgstr ""
 "À partir de maintenant, MandrakeOnline vous\n"
 "enverra les annonces de sécurité et de mises-à-jour."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -242,111 +138,139 @@ msgstr ""
 "Un programme se lancera régulièrement sur votre machine en\n"
 "attente de nouvelles mises-à-jour.\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Votre envoi a eu lieu avec succès !"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "mises-à-jour automatisées"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Choisir la localisation géographique"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Oui, je veux automatiser les mises-à-jour"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Lecture de la configuration\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Annuler"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
-"Voulez-vous abandonner MandrakeOnline?\n"
-"Pour revenir à l'assistant appuyez sur Annuler,\n"
-"pour quitter appuyez sur Quitter."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Abandonner? - MandrakeOnline"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Terminer"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Fermeture de l'assistant\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Problème de connexion"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problème de connexion"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate n'a pas pu contacter le site, nous allons réessayer."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Mot de passe incorrect"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Votre identifiant ou mot de passe était incorrect.\n"
+" Vous devrez soit en recommencer la saisie, soit créer un compte "
+"MandrakeOnline.\n"
+" Dans le second cas, revenez à la première étape pour vous connecter à "
+"MandrakeOnline.\n"
+" Veuillez noter que vous devez aussi indiquer un nom de Machine \n"
+" (seuls les caractères alphabétiques sont autorisés)."
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Fermer"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Lecture de la configuration\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -408,3 +332,76 @@ msgstr "Impossible d'ajouter le medium mdkupdate.\n"
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 "Impossible de mettre à jour les paquets à partir du medium de mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrique"
+
+#~ msgid "Asia"
+#~ msgstr "Asie"
+
+#~ msgid "Australia"
+#~ msgstr "Australie"
+
+#~ msgid "Europe"
+#~ msgstr "Europe"
+
+#~ msgid "North America"
+#~ msgstr "Amérique du Nord"
+
+#~ msgid "South America"
+#~ msgstr "Amérique du Sud"
+
+#~ msgid "Next"
+#~ msgstr "Suivant"
+
+#~ msgid "Quit"
+#~ msgstr "Quitter"
+
+#~ msgid "Back"
+#~ msgstr "Retour"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Alerte : aucun navigateur spécifié"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Envoi de votre configuration"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Erreur à l'envoi des informations"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Une erreur s'est produite pendant l'envoi de vos informations "
+#~ "personnelles.\n"
+#~ "\n"
+#~ "Appuyez sur Suivant pour réessayer."
+
+#~ msgid "Finished"
+#~ msgstr "Terminé"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Choisir la localisation géographique"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Voulez-vous abandonner MandrakeOnline?\n"
+#~ "Pour revenir à l'assistant appuyez sur Annuler,\n"
+#~ "pour quitter appuyez sur Quitter."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Abandonner? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Fermer"
diff --git a/po/he.po b/po/he.po
index 56fd0634..e9b97723 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-07-29 18:27+0300\n"
 "Last-Translator: el-cuco <cuco3001@yahoo.com>\n"
 "Language-Team: Hebrew\n"
@@ -18,148 +18,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "אפריקה"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "אסיה"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "אוסטרליה"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "אירופה"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "צפון אמריקה"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "דרום אמריקה"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "הבא"
+#: ../mdkonline:85
+msgid "Skip Wizard"
+msgstr ""
 
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "סיום"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
+msgstr "ברוך הבא לMandrakeOnline"
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "יציאה"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
+msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "אחורה"
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "ברוך הבא לMandrakeOnline"
 
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr "אין לי חשבון בMandrakeOnline  ואני רוצה"
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr "הרשמה כמנוי"
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "כן אני רוצה עידכון אוטומתי"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "יציאה מהאשף\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr ""
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "ההתחברות נכשלה"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "שם מישתמש:"
 
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "ההתחברות נכשלה"
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "סיסמה:"
 
-#: ../mdkonline:282 ../mdkonline:347
+#: ../mdkonline:109
 #, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "לא יכול להתחבר לאתר של MandrakeUpdate, נא לנסות שוב מאוחר יותר."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "סיסמה שגוייה"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
-msgstr "ברוך הבא לMandrakeOnline"
+msgid "Confirm Password:"
+msgstr "סיסמה:"
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "הצהרת הפרטיות של מנדריק"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "הכנס את שם המישתמש הסיסמה ושם המחשב שלך בMandrakeOnline :"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "שם מישתמש:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "סיסמה:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "שולח את התצורה שלך"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -179,135 +100,144 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "שגיעה בזמן שליחת הנטונים"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "סיום"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 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 ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "העלאת הנטונים הסתימה בהצלחה"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "בחר את האזור הגאוגרפי שלך"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "כן אני רוצה עידכון אוטומתי"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "קורא את קובץ התצורה \n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "אישור"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "ביטול"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "האים אתה בטוח שאתה רוצה לצאת ? - MandrakeOnline"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "סיום"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "יציאה מהאשף\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "ההתחברות נכשלה"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "ההתחברות נכשלה"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "לא יכול להתחבר לאתר של MandrakeUpdate, נא לנסות שוב מאוחר יותר."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "סיסמה שגוייה"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "סגור"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "קורא את קובץ התצורה \n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -366,3 +296,54 @@ msgstr "נכשלה יצירת מדית mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "נכשל שדרוג החבילות ממדית mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "אפריקה"
+
+#~ msgid "Asia"
+#~ msgstr "אסיה"
+
+#~ msgid "Australia"
+#~ msgstr "אוסטרליה"
+
+#~ msgid "Europe"
+#~ msgstr "אירופה"
+
+#~ msgid "North America"
+#~ msgstr "צפון אמריקה"
+
+#~ msgid "South America"
+#~ msgstr "דרום אמריקה"
+
+#~ msgid "Next"
+#~ msgstr "הבא"
+
+#~ msgid "Quit"
+#~ msgstr "יציאה"
+
+#~ msgid "Back"
+#~ msgstr "אחורה"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "שולח את התצורה שלך"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "שגיעה בזמן שליחת הנטונים"
+
+#~ msgid "Finished"
+#~ msgstr "סיום"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "בחר את האזור הגאוגרפי שלך"
+
+#~ msgid "OK"
+#~ msgstr "אישור"
+
+#~ msgid "Cancel"
+#~ msgstr "ביטול"
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "האים אתה בטוח שאתה רוצה לצאת ? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "סגור"
diff --git a/po/hi.po b/po/hi.po
index 96508d73..7dd79705 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-11 22:04+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी, भारत (Hindi, India) <dysxhi@yahoo.co.in>\n"
@@ -17,117 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "अफ़्रीका"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "एशिया"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "आस्ट्रेलिया"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "यूरोप"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "उत्तरी अमेरिका"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "दक्षिणी अमेरिका"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "अगला"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "समाप्त"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "निकास"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "पिछला"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "मेरे पास एक मैनड्रैकऑनलाइन खाता नहीं है और मै चाहता हूँ "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "ग्राहक बनें"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "हाँ मै स्वचालित रूप से अपडेटो को चाहता हूँ"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "विजार्ड से बाहर निकला जा रहा है\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "शून्य मिरर"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "शून्य मिरर। कृपया एक स्थल का चयन करें।"
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "चेतावनी: कोई ब्राउजर नहीं बताया गया"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "सम्बन्ध स्थापित किया जा रहा है ...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "सम्बन्ध स्थापन समस्या"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"मैनड्रैकऑनलाइन से सम्पर्क स्थापित नहीं हो पाया, कृपया कुछ समय उपरान्त पुनः प्रयास करें ।"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "गलत कूटशब्द"
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"आपका लॉग-इन या कूट-शब्द गलत था ।\n"
-" या तो आपको इसे पुनः टाइप करना पड़ेगा, या फ़िर आपको मैनड्रैकऑनलाइन पर एकखाता खोलना "
-"पड़ेगा ।\n"
-" दूसरे विकल्प का चयन करने के लिए, मैनड्रैकऑनलाइन से कनेक्ट होने के लिए,प्रथ चरण पर जायें।\n"
-" ध्यान रहें कि आपको एक मशीन का नाम भी प्रदान करना चाहिए\n"
-" (सिर्फ़ वर्णमाला अक्षरों को ही अनुमति है)"
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "संरचना के बारे में सूचित किया जा रहा है..."
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "मैनड्रैकऑनलाइन में स्वागत"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -139,35 +37,53 @@ msgstr ""
 "आपके तंत्र की संरचना को (पैकेजों, हार्डवेयर संरचना), एक केन्द्रीय डाटाबेस में\n"
 "अपलोड करने के लिए, यह सहायक आपकी सहायता करेगा ।\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "मैनड्रैकऑनलाइन में स्वागत"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "मेरे पास एक मैनड्रैकऑनलाइन खाता नहीं है और मै चाहता हूँ "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "ग्राहक बनें"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "लॉग-इन:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "कूटशब्द: "
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "कूटशब्द: "
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "मैनड्रैक गोपनीयता नीति"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "प्रमाणीकरण"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "अपना मैनड्रैकऑनलाइन लॉग-इन, कूटशब्द और मशीन नाम बतायें:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "लॉग-इन:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "मशीन नाम:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "कूटशब्द: "
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "आपके तंत्र की संरचना भेजी जा रही है"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -203,25 +119,7 @@ msgstr ""
 "अंत में, एक विपत्र उपनाम आपके username@mandrakeonline.net के साथभी आपको प्रदान किया "
 "जायेगा ।"
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "सूचनायें भेजने के दौरान त्रुटि"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"आपकी व्यक्तिगत सूचनाओं को भेजने के दौरान एक त्रुटि हो गयी थी।\n"
-"\n"
-"पुनः प्रयास करने और अपनी तंत्र संरचना को पुनः भेजने के लिए अगला को दबायें।"
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "समाप्त"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -229,7 +127,7 @@ msgstr ""
 "अब से आप सुरक्षा व अपडेटो की घोषणाओं को प्राप्त करेगें \n"
 "मैनड्रैकऑनलाइन को धन्यवाद।"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -238,173 +136,137 @@ msgstr ""
 "करता है।\n"
 "आपके तंत्र में एक कार्यक्रम लगातार नये अपडेटो की प्रतीक्षा में चलता रहेगा\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "आपका अपलोड सफ़ल रहा था !"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "स्वचालित किये हुए अपग्रेड"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "अपनी भौगौलिक स्थान का चयन करें"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "हाँ मै स्वचालित रूप से अपडेटो को चाहता हूँ"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "संरचना पढ़ी जा रही है\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "ठीक"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "निरस्त"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
 msgstr ""
-"क्या आप वास्तव में मैनड्रैकऑनलाइन को छोड़ना चाहते है?\n"
-"विजार्ड पर लौटने के लिए 'निरस्त' को दबायें,\n"
-"वास्तव में बाहर निकलने के लिए 'बाहर' को दबायें ।"
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "वास्तव में छोड़ें? - मैनड्रैकऑनलाइन"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
-" आप हमारे निशुल्क मैनड्रैक लिनक्स डॉउनलोड संस्करण को अब प्रथम बार आरम्भ करने जा रहे है ।\n"
-"\n"
-"अब समस्त विश्व में तीस लाख से ऊपर मैनड्रैक लिनक्स उपयोगकर्ता है !\n"
-"\n"
-"कृपया एक लघु प्रश्नावली को भरने के लिए कुछ एक क्षण दें ।  इस प्रश्वावली से प्राप्त सूचना \n"
-"का उपयोग सिर्फ़ सामूहिक बाजार अनुसन्धानों के लिए किया जायेगा। \n"
-"निम्नलिखित पाठ आपकी व्यक्तिगत सूचना के बारे मेंमैनड्रैकसॉफ़्ट की गोपनीयता नीति है ।"
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "समाप्त"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "विजार्ड से बाहर निकला जा रहा है\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "सम्बन्ध स्थापित किया जा रहा है ...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "सम्बन्ध स्थापन समस्या"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"मैनड्रैकऑनलाइन से सम्पर्क स्थापित नहीं हो पाया, कृपया कुछ समय उपरान्त पुनः प्रयास करें ।"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "गलत कूटशब्द"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
-"किन व्यक्तिगत जानकारियों को हम एकत्र करते है ?\n"
-"\n"
-"विभिन्न सूचनायें, इस वेब-स्थल के भिन्न-भिन्न स्थानों से एकत्र की जाती है;\n"
-"निम्नलिखित, उन जानकारियों का अवलोकन है जिन्हें हम अपने पास रखते है:\n"
-"\n"
-"सबसे पहले, हम आपका विपत्र पता, नाम और पत्र-व्यवहार का पता अभिलेखित करते है।\n"
-"तत्पश्चयात, हम आपको एक अद्वितीय ग्राहक पहचान संख्या प्रदान करते है। इस पहचान संख्या का "
-"उपयोग\n"
-"आपके मैनड्रैक खाते से सम्बधित अतिरिक्त सूचनाओं को जोड़ने में किया जा सकता है। जैसे कि:\n"
-"    - विपत्र सूचियों के लिए आपकी ग्राहकी।\n"
-"    - जब एक विक्रय किए हुए उत्पाद का पंजीकरण किया जा रहा हो, तब हम व्यक्तिगत\n"
-" जानकारियों तथा प्रणाली/हार्डवेयर के विवरणों के बारे में जानना चाहते है जिससे कि हम, "
-"आपको, \n"
-" विशिष्ट, सहायक तथा आपकी आवश्यकता अनुसार ढाली गई सेवाओं को प्रदान करते है।\n"
-"    - हमारे दान पृष्ट पर और हमारे ऑनलाइन स्टोर (ंमैनड्रैक स्टोर) पर,\n"
-" हम बीलिंग हेतू सूचना एकत्र करते है (हम कोई क्रेडिट-कार्ड सूचना नहीं रखते है)।\n"
-"\n"
-"\n"
-"हम इस जानकारी के साथ क्या करते है?\n"
-"\n"
-"हम व्यक्तिगत जानकारियों को कभी भी किन्हीं व्यक्तियों या प्रतिष्ठानों के साथ सहभाजन नहीं "
-"करते है -\n"
-"हम इस सूचना का दॄढ़ता-पूर्वक निम्नलिखित प्रयोजनों के हेतू उपयोग करते है:\n"
-"    - यदि आपने किसी एक विपत्र सूची के लिए अधिदान किया है, तब हम इस विपत्र पते को "
-"अपने डॉटाबेस में रखते है,\n"
-"जिससे कि आपको आपकी आवश्यकता अनुसार ढाली गई सूचनाओं को प्रदान करते है\n"
-"और/या आपको विभिन्न विपत्र सूचियों में वाद-विवादों में सम्मलित होने के लिए अधिकार-युक्त "
-"बनाते है।\n"
-"यदि आप एक संदेश ऐसी किसी सूची को भेजते है, तो अन्य व्यक्ति आपके विपत्र पते को देखेगें,\n"
-"परन्तु किसी भी बाह्य जनसमूह को हमारे ग्राहकों के डॉटाबेस तक पहूँच नहीं है।\n"
-"आप किसी भी सूची से कभी भी, एक समुचित प्रारूप का उपयोग करके, \n"
-"अपने को अलग कर सकते है।\n"
-"    - यदि आपने सहायता प्राप्त करने हेतु, एक विक्रय किये हुए उत्पाद के पंजीकरण के दौरान \n"
-" सूचना प्रदान की है, तो हम इस सूचना को गोपनीय रखते है सिवाय कि जब यह सूचना \n"
-" हमारे किसी साझीदार के द्वारा उस सहायता को, जो आपको आवश्यक है, प्रदान करने के लिए \n"
-"आकांक्षित ना हो।\n"
-"    - यदि आप मैनड्रैक स्टोर का उपयोग करते है, तो हम आपकी ग्राहकी पहचान संख्या का "
-"उपयोग, \n"
-"आपके आदेश का अनुसरण करने तथा आपके उत्पादों को प्रतिपादन करने हेतु भी उपयोग में लाते है।\n"
-"    - यदि आप हमें विप्रणन सम्बन्धी सूचना प्रदान करते है, तो हम इसे आंतरिक उपयोग हेतु रखते "
-"है,\n"
-"जिससे कि हम हमारे उत्पादों को बेहतर बना सके जो आपकी आवश्यकताओं को और अधिक पूरा करें,\n"
-"चाहे आपने किसी उत्पाद को क्रय किया हो या नहीं।\n"
-"\n"
-"\n"
-"अपनी व्यक्तिगत जानकारी को कैसे परिवर्तित या शुद्ध करें?\n"
-"\n"
-"फ़्रेंच कानून, व्यक्तियों को उनकी व्यक्तिगत जानकारियों तक पहूँच, उन्हें शुद्ध करने का, परिवर्तित "
-"करने का, या \n"
-"हटाने का अधिकार प्रदान करता है जिन्हें हमने अपने अभिलेखागार में रक्खा है। हम इसे एक विश्व-"
-"व्यापी विशेषाधिकार\n"
-" के रूप में प्रस्तावित करते है। आप इस अधिकार का उपयोग कभी भी अपने खाते में, अपनी ग्राहकी "
-"पहचान संख्या \n"
-" के साथ संत्र आरम्भ करके और अपनी व्यक्तिगत जानकारियों को संपादित करके, कर सकते है।\n"
-" आप इस वेब पृष्ट पर लॉग कर सकते है: http://www.mandrakeonline.net"
-
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
-
-#: ../mdkonline:641
-msgid "Close"
-msgstr "बन्द"
+"आपका लॉग-इन या कूट-शब्द गलत था ।\n"
+" या तो आपको इसे पुनः टाइप करना पड़ेगा, या फ़िर आपको मैनड्रैकऑनलाइन पर एकखाता खोलना "
+"पड़ेगा ।\n"
+" दूसरे विकल्प का चयन करने के लिए, मैनड्रैकऑनलाइन से कनेक्ट होने के लिए,प्रथ चरण पर जायें।\n"
+" ध्यान रहें कि आपको एक मशीन का नाम भी प्रदान करना चाहिए\n"
+" (सिर्फ़ वर्णमाला अक्षरों को ही अनुमति है)"
+
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "संरचना के बारे में सूचित किया जा रहा है..."
+
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "संरचना पढ़ी जा रही है\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -467,3 +329,210 @@ msgstr "एम०डी०के० नवीनीकरण(mdkupdate) मा�
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "एम०डी०के० नवीनीकरण(mdkupdate) माध्यम से पैकजों को अपडेट करने में असफ़ल ।\n"
+
+#~ msgid "Africa"
+#~ msgstr "अफ़्रीका"
+
+#~ msgid "Asia"
+#~ msgstr "एशिया"
+
+#~ msgid "Australia"
+#~ msgstr "आस्ट्रेलिया"
+
+#~ msgid "Europe"
+#~ msgstr "यूरोप"
+
+#~ msgid "North America"
+#~ msgstr "उत्तरी अमेरिका"
+
+#~ msgid "South America"
+#~ msgstr "दक्षिणी अमेरिका"
+
+#~ msgid "Next"
+#~ msgstr "अगला"
+
+#~ msgid "Quit"
+#~ msgstr "निकास"
+
+#~ msgid "Back"
+#~ msgstr "पिछला"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "शून्य मिरर"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "शून्य मिरर। कृपया एक स्थल का चयन करें।"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "चेतावनी: कोई ब्राउजर नहीं बताया गया"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "आपके तंत्र की संरचना भेजी जा रही है"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "सूचनायें भेजने के दौरान त्रुटि"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "आपकी व्यक्तिगत सूचनाओं को भेजने के दौरान एक त्रुटि हो गयी थी।\n"
+#~ "\n"
+#~ "पुनः प्रयास करने और अपनी तंत्र संरचना को पुनः भेजने के लिए अगला को दबायें।"
+
+#~ msgid "Finished"
+#~ msgstr "समाप्त"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "अपनी भौगौलिक स्थान का चयन करें"
+
+#~ msgid "OK"
+#~ msgstr "ठीक"
+
+#~ msgid "Cancel"
+#~ msgstr "निरस्त"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "क्या आप वास्तव में मैनड्रैकऑनलाइन को छोड़ना चाहते है?\n"
+#~ "विजार्ड पर लौटने के लिए 'निरस्त' को दबायें,\n"
+#~ "वास्तव में बाहर निकलने के लिए 'बाहर' को दबायें ।"
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "वास्तव में छोड़ें? - मैनड्रैकऑनलाइन"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ " आप हमारे निशुल्क मैनड्रैक लिनक्स डॉउनलोड संस्करण को अब प्रथम बार आरम्भ करने जा रहे है "
+#~ "।\n"
+#~ "\n"
+#~ "अब समस्त विश्व में तीस लाख से ऊपर मैनड्रैक लिनक्स उपयोगकर्ता है !\n"
+#~ "\n"
+#~ "कृपया एक लघु प्रश्नावली को भरने के लिए कुछ एक क्षण दें ।  इस प्रश्वावली से प्राप्त "
+#~ "सूचना \n"
+#~ "का उपयोग सिर्फ़ सामूहिक बाजार अनुसन्धानों के लिए किया जायेगा। \n"
+#~ "निम्नलिखित पाठ आपकी व्यक्तिगत सूचना के बारे मेंमैनड्रैकसॉफ़्ट की गोपनीयता नीति है ।"
+
+#~ msgid ""
+#~ "What personal data do we collect ?         \n"
+#~ "                               \n"
+#~ "Various information is collected in different areas of the website;\n"
+#~ "what follows is an overview of the data we keep:\n"
+#~ "\n"
+#~ "Firstly, we record your email address, name and postal address.\n"
+#~ "Secondly we give you a unique customer ID. This ID will be used to \n"
+#~ "add additional information related to your Mandrake account such as:\n"
+#~ "    - Your subscription to mailling lists.\n"
+#~ "    - When registering a purchased product, we ask for personal\n"
+#~ "information as well as system/hardware details so that we may deliver\n"
+#~ "the best support services customized to your needs.\n"
+#~ "    - On our donation page and on our online store (MandrakeStore), we\n"
+#~ "record data for billing purpose (we do not store any credit card data).\n"
+#~ "    \n"
+#~ "What do we do with this information?\n"
+#~ "\n"
+#~ "We never share personal information with other persons or companies -\n"
+#~ "we use this data strictly for the following purposes:\n"
+#~ "    - If you have subscribed to a mailing list, we keep this email\n"
+#~ "address in our database to provide you with customized information\n"
+#~ "and/or to enable you to participate in discussions in various mailing\n"
+#~ "lists. If you send a message to such a list, other people will see\n"
+#~ "your email address but no external parties have access to our database\n"
+#~ "of subscribers. At any time you may unsubscribe to any list by using\n"
+#~ "the appropriate form.\n"
+#~ "    - If you provide information when registering a purchased product\n"
+#~ "to receive support, we keep this information private unless the\n"
+#~ "information is required by one of our partners to deliver the support\n"
+#~ "you require.\n"
+#~ "    - If you use MandrakeStore, we also use your Customer ID to track\n"
+#~ "your order and deliver your products.\n"
+#~ "    - If you provide us with marketing information, we keep it for \n"
+#~ "internal use only in order to improve our products so that they can \n"
+#~ "better fit your needs whether you have purchased a product or not.), How "
+#~ "to change / correct your personal data?\n"
+#~ "\n"
+#~ "French law gives individuals the right to access, correct, modify or \n"
+#~ "remove their own personal data that we have on record. We offer this \n"
+#~ "as a worldwide privilege. You may execute this right at any time by \n"
+#~ "logging to your account with your customer ID and editing your\n"
+#~ "personnal data. You can log on to this page: http://www.mandrakeonline.net"
+#~ msgstr ""
+#~ "किन व्यक्तिगत जानकारियों को हम एकत्र करते है ?\n"
+#~ "\n"
+#~ "विभिन्न सूचनायें, इस वेब-स्थल के भिन्न-भिन्न स्थानों से एकत्र की जाती है;\n"
+#~ "निम्नलिखित, उन जानकारियों का अवलोकन है जिन्हें हम अपने पास रखते है:\n"
+#~ "\n"
+#~ "सबसे पहले, हम आपका विपत्र पता, नाम और पत्र-व्यवहार का पता अभिलेखित करते है।\n"
+#~ "तत्पश्चयात, हम आपको एक अद्वितीय ग्राहक पहचान संख्या प्रदान करते है। इस पहचान संख्या "
+#~ "का उपयोग\n"
+#~ "आपके मैनड्रैक खाते से सम्बधित अतिरिक्त सूचनाओं को जोड़ने में किया जा सकता है। जैसे कि:\n"
+#~ "    - विपत्र सूचियों के लिए आपकी ग्राहकी।\n"
+#~ "    - जब एक विक्रय किए हुए उत्पाद का पंजीकरण किया जा रहा हो, तब हम व्यक्तिगत\n"
+#~ " जानकारियों तथा प्रणाली/हार्डवेयर के विवरणों के बारे में जानना चाहते है जिससे कि हम, "
+#~ "आपको, \n"
+#~ " विशिष्ट, सहायक तथा आपकी आवश्यकता अनुसार ढाली गई सेवाओं को प्रदान करते है।\n"
+#~ "    - हमारे दान पृष्ट पर और हमारे ऑनलाइन स्टोर (ंमैनड्रैक स्टोर) पर,\n"
+#~ " हम बीलिंग हेतू सूचना एकत्र करते है (हम कोई क्रेडिट-कार्ड सूचना नहीं रखते है)।\n"
+#~ "\n"
+#~ "\n"
+#~ "हम इस जानकारी के साथ क्या करते है?\n"
+#~ "\n"
+#~ "हम व्यक्तिगत जानकारियों को कभी भी किन्हीं व्यक्तियों या प्रतिष्ठानों के साथ सहभाजन "
+#~ "नहीं करते है -\n"
+#~ "हम इस सूचना का दॄढ़ता-पूर्वक निम्नलिखित प्रयोजनों के हेतू उपयोग करते है:\n"
+#~ "    - यदि आपने किसी एक विपत्र सूची के लिए अधिदान किया है, तब हम इस विपत्र पते को "
+#~ "अपने डॉटाबेस में रखते है,\n"
+#~ "जिससे कि आपको आपकी आवश्यकता अनुसार ढाली गई सूचनाओं को प्रदान करते है\n"
+#~ "और/या आपको विभिन्न विपत्र सूचियों में वाद-विवादों में सम्मलित होने के लिए अधिकार-युक्त "
+#~ "बनाते है।\n"
+#~ "यदि आप एक संदेश ऐसी किसी सूची को भेजते है, तो अन्य व्यक्ति आपके विपत्र पते को देखेगें,\n"
+#~ "परन्तु किसी भी बाह्य जनसमूह को हमारे ग्राहकों के डॉटाबेस तक पहूँच नहीं है।\n"
+#~ "आप किसी भी सूची से कभी भी, एक समुचित प्रारूप का उपयोग करके, \n"
+#~ "अपने को अलग कर सकते है।\n"
+#~ "    - यदि आपने सहायता प्राप्त करने हेतु, एक विक्रय किये हुए उत्पाद के पंजीकरण के "
+#~ "दौरान \n"
+#~ " सूचना प्रदान की है, तो हम इस सूचना को गोपनीय रखते है सिवाय कि जब यह सूचना \n"
+#~ " हमारे किसी साझीदार के द्वारा उस सहायता को, जो आपको आवश्यक है, प्रदान करने के "
+#~ "लिए \n"
+#~ "आकांक्षित ना हो।\n"
+#~ "    - यदि आप मैनड्रैक स्टोर का उपयोग करते है, तो हम आपकी ग्राहकी पहचान संख्या का "
+#~ "उपयोग, \n"
+#~ "आपके आदेश का अनुसरण करने तथा आपके उत्पादों को प्रतिपादन करने हेतु भी उपयोग में लाते है।\n"
+#~ "    - यदि आप हमें विप्रणन सम्बन्धी सूचना प्रदान करते है, तो हम इसे आंतरिक उपयोग हेतु "
+#~ "रखते है,\n"
+#~ "जिससे कि हम हमारे उत्पादों को बेहतर बना सके जो आपकी आवश्यकताओं को और अधिक पूरा "
+#~ "करें,\n"
+#~ "चाहे आपने किसी उत्पाद को क्रय किया हो या नहीं।\n"
+#~ "\n"
+#~ "\n"
+#~ "अपनी व्यक्तिगत जानकारी को कैसे परिवर्तित या शुद्ध करें?\n"
+#~ "\n"
+#~ "फ़्रेंच कानून, व्यक्तियों को उनकी व्यक्तिगत जानकारियों तक पहूँच, उन्हें शुद्ध करने का, "
+#~ "परिवर्तित करने का, या \n"
+#~ "हटाने का अधिकार प्रदान करता है जिन्हें हमने अपने अभिलेखागार में रक्खा है। हम इसे एक "
+#~ "विश्व-व्यापी विशेषाधिकार\n"
+#~ " के रूप में प्रस्तावित करते है। आप इस अधिकार का उपयोग कभी भी अपने खाते में, अपनी "
+#~ "ग्राहकी पहचान संख्या \n"
+#~ " के साथ संत्र आरम्भ करके और अपनी व्यक्तिगत जानकारियों को संपादित करके, कर सकते है।\n"
+#~ " आप इस वेब पृष्ट पर लॉग कर सकते है: http://www.mandrakeonline.net"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "बन्द"
diff --git a/po/hr.po b/po/hr.po
index 4796e1e1..099f0d90 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2002-03-13 01:47CET\n"
 "Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -15,161 +15,73 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Azija"
+#: ../mdkonline:85
+msgid "Skip Wizard"
+msgstr ""
 
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australija"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
+msgstr "Dobro došli u MandrakeOnLine"
 
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
+msgstr ""
+"U ovom koraku se pretpostavlja da imate račun na MandrakeOnline.\n"
+"Ovaj pomoćnik će vam pomoći da pošaljete svoju konfiguraciju\n"
+"(pakete, hardwaresku konfiguraciju) u centralnu bazu kako\n"
+"bih vas mogli informirati o sigurnosnim i korisnim dogradnjama.\n"
 
-#: ../mdkonline:68
+#: ../mdkonline:101
 #, fuzzy
-msgid "North America"
-msgstr "Južna Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Južna Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Slijedeće"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Završi"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Izlaz"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Unazad"
+msgid "Create a MandrakeOnline Account"
+msgstr "Dobro došli u MandrakeOnLine"
 
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr "Nemam MandrakeOnline račun i želim "
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr "Pretplatiti se"
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Da, želim automatske dogradnje"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Izlazim iz čarobnjaka\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Upozorenje: Preglednik nije određen"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Problem s vezom"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Login:"
 
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problem s vezom"
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Lozinka:"
 
-#: ../mdkonline:282 ../mdkonline:347
+#: ../mdkonline:109
 #, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"MandrakeOnline ne može biti kontaktiran, molimo probajte ponovno kasnije"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Kriva lozinka"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Vaš login ili lozinka su pogrešni.\n"
-" Ili ih trebate unijeti ponovno, ili trebate napraviti račun na "
-"MandrakeOnline.\n"
-" Ukoliko je ovaj posljednji slučaj, vratite se na prvi korak za\n"
-"spajanje na MandrakeOnline.\n"
-" Budite upozoreni da morate također omogućiti ime računala \n"
-" (samo alfabetski karakteri se priznaju)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
-msgstr "Dobro došli u MandrakeOnLine"
+msgid "Confirm Password:"
+msgstr "Lozinka:"
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
-"U ovom koraku se pretpostavlja da imate račun na MandrakeOnline.\n"
-"Ovaj pomoćnik će vam pomoći da pošaljete svoju konfiguraciju\n"
-"(pakete, hardwaresku konfiguraciju) u centralnu bazu kako\n"
-"bih vas mogli informirati o sigurnosnim i korisnim dogradnjama.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake Polica Privatnosti"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Autentifikacija"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Unesite vaš MandrakeOnline login,lozinku i ime računala:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Login:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Ime računala:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Lozinka:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Šaljemo vašu Konfiguraciju"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -205,25 +117,7 @@ msgstr ""
 "Na kraju, biti će vam dodijeljen email alias sa izgledom "
 "korisnik@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Greška prilikom slanja informacija"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Dogodila se greška prilikom slanja vaših osobnih informacija.\n"
-"\n"
-"Pritisnite Slijedeće da probate poslati konfiguraciju ponovno."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Završeno"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -231,7 +125,7 @@ msgstr ""
 "Od sada ćete primati obavijesti o sigurnosti\n"
 "i dogradnjama zahvaljujući MandrakeOnlineu."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -239,111 +133,140 @@ msgstr ""
 "MandrakeOnline nudi vam mogućnost automatiziranja dogradnji.\n"
 "Program će se pokrenuti redovno na vašem sustavu čekajući nove dogradnje\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Vaše slanje je bilo uspješno!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automatizirane Dogradnje"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Izaberite vašu zemljopisnu lokaciju"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Da, želim automatske dogradnje"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Čitam postavke\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "U redu"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Odustani"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
 msgstr ""
-"Da li zaista želite prekinuti MandrakeOnline?\n"
-"Za povratak u Čarobnjak pritisnite 'Odustani',\n"
-"za izlaz pritisnite 'Izlaz'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Zaista prekinuti? - MandrakeOnline"
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Završi"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Izlazim iz čarobnjaka\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Problem s vezom"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problem s vezom"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"MandrakeOnline ne može biti kontaktiran, molimo probajte ponovno kasnije"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Kriva lozinka"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Vaš login ili lozinka su pogrešni.\n"
+" Ili ih trebate unijeti ponovno, ili trebate napraviti račun na "
+"MandrakeOnline.\n"
+" Ukoliko je ovaj posljednji slučaj, vratite se na prvi korak za\n"
+"spajanje na MandrakeOnline.\n"
+" Budite upozoreni da morate također omogućiti ime računala \n"
+" (samo alfabetski karakteri se priznaju)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Zatvori"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Čitam postavke\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -398,3 +321,76 @@ msgstr ""
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Azija"
+
+#~ msgid "Australia"
+#~ msgstr "Australija"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#, fuzzy
+#~ msgid "North America"
+#~ msgstr "Južna Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Južna Amerika"
+
+#~ msgid "Next"
+#~ msgstr "Slijedeće"
+
+#~ msgid "Quit"
+#~ msgstr "Izlaz"
+
+#~ msgid "Back"
+#~ msgstr "Unazad"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Upozorenje: Preglednik nije određen"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Šaljemo vašu Konfiguraciju"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Greška prilikom slanja informacija"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Dogodila se greška prilikom slanja vaših osobnih informacija.\n"
+#~ "\n"
+#~ "Pritisnite Slijedeće da probate poslati konfiguraciju ponovno."
+
+#~ msgid "Finished"
+#~ msgstr "Završeno"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Izaberite vašu zemljopisnu lokaciju"
+
+#~ msgid "OK"
+#~ msgstr "U redu"
+
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Da li zaista želite prekinuti MandrakeOnline?\n"
+#~ "Za povratak u Čarobnjak pritisnite 'Odustani',\n"
+#~ "za izlaz pritisnite 'Izlaz'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Zaista prekinuti? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Zatvori"
diff --git a/po/hu.po b/po/hu.po
index e17e4856..722b9482 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-11 22:58+0100\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -16,161 +16,76 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Ázsia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Ausztrália"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Európa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Észak-Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Dél-Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Következő"
+#: ../mdkonline:85
+msgid "Skip Wizard"
+msgstr ""
 
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Befejezés"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
+msgstr "Üdvözli a MandrakeOnline!"
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Kilépés"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
+msgstr ""
+"Ehhez a lépéshez szükséges, hogy Ön rendelkezzen MandrakeOnline "
+"azonosítóval.\n"
+"Jelen segédprogram segítséget nyújt ahhoz, hogy feltöltse a gépe adatait\n"
+"(csomagok és hardverkonfiguráció) egy központi adatbázisba annak érdekében,\n"
+"hogy informálhassuk a biztonsági és egyéb frissítésekről.\n"
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Vissza"
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Üdvözli a MandrakeOnline!"
 
 # a sztring jelentése: nincs azonosítója, és szeretne egyet
 # a MandrakeOnline tulajdonnevet nem szabad lefordítani
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr "Nincs MandrakeOnline azonosítóm, de szeretnék egyet "
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr "Feliratkozás"
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Szeretnék automatikus frissítéseket"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Kilépés a Varázslóból\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Figyelmeztetés: nincs megadva böngésző"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Kapcsolati hiba"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Azonosító:"
 
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Kapcsolati hiba"
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Jelszó:"
 
-#: ../mdkonline:282 ../mdkonline:347
+#: ../mdkonline:109
 #, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "A MandrakeUpdate nem tudott kapcsolatba lépni a géppel; újabb próba."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Helytelen jelszó"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"A bejelentkezési név vagy a jelszó helytelen.\n"
-"Gépelje be újra; ha viszont nincs létrehozva ilyen felhasználónév a "
-"MandrakeOnline-on, akkor létre kell hozni azt.\n"
-"Az utóbbi esetben lépjen vissza az első lépéshez, hogy kapcsolódhasson a "
-"MandrakeOnline-hoz.\n"
-"Egy gépnevet is meg kell adnia; a név csak normál betűket tartalmazhat."
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
-msgstr "Üdvözli a MandrakeOnline!"
+msgid "Confirm Password:"
+msgstr "Jelszó:"
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
-"Ehhez a lépéshez szükséges, hogy Ön rendelkezzen MandrakeOnline "
-"azonosítóval.\n"
-"Jelen segédprogram segítséget nyújt ahhoz, hogy feltöltse a gépe adatait\n"
-"(csomagok és hardverkonfiguráció) egy központi adatbázisba annak érdekében,\n"
-"hogy informálhassuk a biztonsági és egyéb frissítésekről.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake adatvédelmi elvek"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Adja meg MandrakeOnline azonosítóját, jelszavát és a gépnevet:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Azonosító:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Gépnév:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Jelszó:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Konfiguráció küldése"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -208,25 +123,7 @@ msgstr ""
 "Egy új e-mail-címet is rendelkezésére bocsátunk:\n"
 "felhasználónév@mandrakeonline.net"
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Hiba az adatok küldése közben"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Hiba lépett fel a személyi információk küldése közben.\n"
-"\n"
-"Nyomja le a 'Következő' gombot, ha szeretné újra megpróbálni."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Kész"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -234,7 +131,7 @@ msgstr ""
 "Mostantól kezdve információkat fog kapni a biztonsági\n"
 "és egyéb frissítésekről - a MandrakeOnline-nak köszönhetően."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -242,111 +139,138 @@ msgstr ""
 "A MandrakeOnline lehetőséget nyújt a frissítések automatizálására.\n"
 "Egy program fog futni rendszeresen az Ön gépén, a frissítéseket figyelve.\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "A feltöltés sikeresen megtörtént."
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automatizált frissítések"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Válassza ki a földrajzi helyét"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Szeretnék automatikus frissítéseket"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Konfiguráció beolvasása\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Mégsem"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
-"Valóban ki szeretne lépni a MandrakeOnline-ból?\n"
-"A Varázslóhoz való visszatéréshez nyomjon 'Mégsem'-et;\n"
-"ha viszont ki szeretne lépni, nyomjon 'Kilépés'-t."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Valóban kilép? - MandrakeOnline"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Befejezés"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Kilépés a Varázslóból\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Kapcsolati hiba"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Kapcsolati hiba"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "A MandrakeUpdate nem tudott kapcsolatba lépni a géppel; újabb próba."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Helytelen jelszó"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"A bejelentkezési név vagy a jelszó helytelen.\n"
+"Gépelje be újra; ha viszont nincs létrehozva ilyen felhasználónév a "
+"MandrakeOnline-on, akkor létre kell hozni azt.\n"
+"Az utóbbi esetben lépjen vissza az első lépéshez, hogy kapcsolódhasson a "
+"MandrakeOnline-hoz.\n"
+"Egy gépnevet is meg kell adnia; a név csak normál betűket tartalmazhat."
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Bezárás"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Konfiguráció beolvasása\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -408,3 +332,75 @@ msgstr "MandrakeUpdate-adatforrás létrehozása sikertelen.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "A csomagok MandrakeUpdate-adatforrásból való frissítése sikertelen.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Ázsia"
+
+#~ msgid "Australia"
+#~ msgstr "Ausztrália"
+
+#~ msgid "Europe"
+#~ msgstr "Európa"
+
+#~ msgid "North America"
+#~ msgstr "Észak-Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Dél-Amerika"
+
+#~ msgid "Next"
+#~ msgstr "Következő"
+
+#~ msgid "Quit"
+#~ msgstr "Kilépés"
+
+#~ msgid "Back"
+#~ msgstr "Vissza"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Figyelmeztetés: nincs megadva böngésző"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Konfiguráció küldése"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Hiba az adatok küldése közben"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Hiba lépett fel a személyi információk küldése közben.\n"
+#~ "\n"
+#~ "Nyomja le a 'Következő' gombot, ha szeretné újra megpróbálni."
+
+#~ msgid "Finished"
+#~ msgstr "Kész"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Válassza ki a földrajzi helyét"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Mégsem"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Valóban ki szeretne lépni a MandrakeOnline-ból?\n"
+#~ "A Varázslóhoz való visszatéréshez nyomjon 'Mégsem'-et;\n"
+#~ "ha viszont ki szeretne lépni, nyomjon 'Kilépés'-t."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Valóban kilép? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Bezárás"
diff --git a/po/id.po b/po/id.po
index d30ec9ff..99afc4eb 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.01\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-03-18 15:48+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Bahasa Indonesia <id@li.org>\n"
@@ -14,118 +14,15 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Eropa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Amerika Utara"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Amerika Selatan"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Lanjut"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Selesai"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Keluar"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Kembali"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Saya tak punya account MandrakeOnline dan saya ingin "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Ikut"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Ya saya ingin upgrade otomatis"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Keluar Wizard\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Awas: Tiada browser ditunjuk"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Problem koneksi"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problem koneksi"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate gagal menghubungi situs yg dimaksud, nanti dicoba lagi."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Salah katasandi"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Login atau katasandi Anda keliru.\n"
-"Anda harus menuliskannya lagi, atau membuat account di MandrakeOnline.\n"
-" Pada kasus terakhir, kembalilah ke step awal utk menghubungi "
-"MandrakeOnline.\n"
-" Ingat, Anda juga harus memberikan nama Mesin \n"
-" (hanya karakter alfabet)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Selamat Datang di MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -137,35 +34,53 @@ msgstr ""
 "(paket, konfigurasi perangkat keras) ke database terpusat agar Anda selalu\n"
 "diberi tahu update sekuriti dan upgrade yang berguna.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Selamat Datang di MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Saya tak punya account MandrakeOnline dan saya ingin "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Ikut"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Login:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Katasandi:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Katasandi:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Kebijakan Privacy Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Masukkan login, katasandi, dan nama mesin  MandrakeOnline Anda:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Login:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Nama mesin:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Katasandi:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Mengirim Konfigurasi Anda"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -197,25 +112,7 @@ msgstr ""
 "Tambah lagi, Anda akan mendapat diskon servis di www.mandrakeexpert.com.\n"
 "Terakhir, Anda akan mendapatkan alias email namaanda@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Error saat mengirim informasi"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Ada error saat mengirim info personal Anda.\n"
-"\n"
-"Tekan Lanjut untuk mencoba dan mengirim konfigurasi Anda lagi."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Selesai"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -223,7 +120,7 @@ msgstr ""
 "Mulai saat ini Anda akan menerima pemberitahuan sekuriti dan upgrade\n"
 "dari MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -231,111 +128,138 @@ msgstr ""
 "MandrakeOnline memberi Anda kemampuan update otomatis.\n"
 "Sebuah program akan secara periodik berjalan menunggu update baru\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Upload Anda sukses!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "upgrade otomatis"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Pilih letak geografis Anda"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Ya saya ingin upgrade otomatis"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Baca konfigurasi\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Batal"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
-"Anda ingin keluar dari MandrakeOnline?\n"
-"Untuk kembali ke Wizard tekan 'Batal',\n"
-"untuk benar-benar keluar tekan 'Keluar'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Benar ingin keluar? - MandrakeOnline"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Selesai"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Keluar Wizard\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Problem koneksi"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problem koneksi"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate gagal menghubungi situs yg dimaksud, nanti dicoba lagi."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Salah katasandi"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Login atau katasandi Anda keliru.\n"
+"Anda harus menuliskannya lagi, atau membuat account di MandrakeOnline.\n"
+" Pada kasus terakhir, kembalilah ke step awal utk menghubungi "
+"MandrakeOnline.\n"
+" Ingat, Anda juga harus memberikan nama Mesin \n"
+" (hanya karakter alfabet)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Tutup"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Baca konfigurasi\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -393,3 +317,75 @@ msgstr "Gagal membuat media mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Gagal meng-update paket dari media mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Asia"
+
+#~ msgid "Australia"
+#~ msgstr "Australia"
+
+#~ msgid "Europe"
+#~ msgstr "Eropa"
+
+#~ msgid "North America"
+#~ msgstr "Amerika Utara"
+
+#~ msgid "South America"
+#~ msgstr "Amerika Selatan"
+
+#~ msgid "Next"
+#~ msgstr "Lanjut"
+
+#~ msgid "Quit"
+#~ msgstr "Keluar"
+
+#~ msgid "Back"
+#~ msgstr "Kembali"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Awas: Tiada browser ditunjuk"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Mengirim Konfigurasi Anda"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Error saat mengirim informasi"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Ada error saat mengirim info personal Anda.\n"
+#~ "\n"
+#~ "Tekan Lanjut untuk mencoba dan mengirim konfigurasi Anda lagi."
+
+#~ msgid "Finished"
+#~ msgstr "Selesai"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Pilih letak geografis Anda"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Batal"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Anda ingin keluar dari MandrakeOnline?\n"
+#~ "Untuk kembali ke Wizard tekan 'Batal',\n"
+#~ "untuk benar-benar keluar tekan 'Keluar'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Benar ingin keluar? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Tutup"
diff --git a/po/is.po b/po/is.po
index 10c87c25..55adef9c 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-09-02 14:10GMT\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -16,148 +16,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkonline:64
-msgid "Africa"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:65
-msgid "Asia"
-msgstr ""
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr ""
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr ""
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr ""
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr ""
-
-#: ../mdkonline:88
-msgid "Finish"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
 msgstr ""
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
+#: ../mdkonline:101
+msgid "Create a MandrakeOnline Account"
 msgstr ""
 
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr ""
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr ""
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr ""
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Tenging mistókst"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Tenging mistókst"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate gat ekki tengst þjóninum, við reynum aftur."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr ""
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
 msgstr ""
 
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
+#: ../mdkonline:109
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr ""
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr ""
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr ""
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -177,134 +96,143 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr ""
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr ""
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 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 ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
+#: ../mdkonline:147
+msgid "Country:"
 msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
+#: ../mdkonline:172
+msgid "Creation"
 msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
 msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr ""
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr ""
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Tenging mistókst"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Tenging mistókst"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate gat ekki tengst þjóninum, við reynum aftur."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr ""
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkupdate:43
diff --git a/po/it.po b/po/it.po
index f90b097d..e15e6aa1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-16 11:09+0100\n"
 "Last-Translator: Daniele Pighin <daniele@dcs.it>\n"
 "Language-Team: italian <timl@freelists.org>\n"
@@ -18,116 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Africa"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Nord America"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Sud America"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Avanti"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Fine"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Esci"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Indietro"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Non ho un account su MandrakeOnline e vorrei "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Registrarmi"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Desidero l'aggiornamento automatico"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Chiusura in corso\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Il mirror è vuoto"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "Il mirror è vuoto: per favore, scegli un'area geografica."
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Attenzione: nessun browser specificato"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Connessione in corso ...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problema di connessione"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "Non è stato possibile contattare MandrakeOnline, riprova piú tardi"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Password errata"
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"Il nome utente o la password sono errati.\n"
-" Dovrai ridigitarli oppure, qualora non ne avessi uno, creare un account su "
-"MandrakeOnline.\n"
-" Nel secondo caso, torna al primo passo per collegarti a MandrakeOnline.\n"
-" Ricorda che devi fornire anche un nome per il tuo computer \n"
-" (sono ammessi solo caratteri alfabetici)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "Invio della configurazione in corso..."
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Benvenuto su MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -140,35 +39,53 @@ msgstr ""
 "informato su aggiornamenti del software mirati alla produttività e alla "
 "sicurezza.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Benvenuto su MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Non ho un account su MandrakeOnline e vorrei "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Registrarmi"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Nome utente:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Password:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Password:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Politica di Mandrake sulla privacy"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Identificazione"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Immetti nome utente, password e nome computer per MandrakeOnline:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Nome utente:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Nome computer:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Password:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Invio della configurazione in corso"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -202,25 +119,7 @@ msgstr ""
 "Infine, un alias di posta elettronica tuo_nome@mandrakeonline.net verrà "
 "creato per te."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Errore durante la trasmissione dei dati"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Si è verificato un errore durante la trasmissione dei tuoi dati personali.\n"
-"\n"
-"Premi 'Avanti' per riprovare."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Operazione completata"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -228,7 +127,7 @@ msgstr ""
 "Da ora in poi riceverai avvisi sulla sicurezza e sugli\n"
 "aggiornamenti grazie a MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -236,165 +135,136 @@ msgstr ""
 "MandrakeOnline ti offre la possibilità di automatizzare gli aggiornamenti.\n"
 "Un programma in attesa di nuovi aggiornamenti sarà eseguito periodicamente\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Trasmissione completata con successo!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "Aggiornamenti automatici"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Seleziona la tua area geografica"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Desidero l'aggiornamento automatico"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Lettura della configurazione in corso\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Annulla"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:174
+msgid "Empty Fields"
 msgstr ""
-"Vuoi veramente interrompere MandrakeOnline?\n"
-"Per ritornare alla procedura guidata premi 'Annulla',\n"
-"Per uscire premi 'Esci'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Sicuro di voler interrompere? - MandrakeOnline"
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
-"Hai appena avviato per la prima volta Mandrake Linux - Free Download "
-"Edition.\n"
-"\n"
-"Attualmente, piú di tre milioni di persone nel mondo usano Mandrake Linux!\n"
-"\n"
-"Per favore,impiega pochi secondi per compilare un breve questionario i cui\n"
-"dati saranno utilizzati solo per indagini di mercato.\n"
-"Segue la descrizione della politica di MandrakeSoft sul trattamento dei dati "
-"personali."
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Fine"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Chiusura in corso\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Connessione in corso ...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problema di connessione"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "Non è stato possibile contattare MandrakeOnline, riprova piú tardi"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Password errata"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
-"Che dati personali raccogliamo?            \n"
-"                               \n"
-"Varie informazioni vengono raccolte in diverse aree del sito;\n"
-"quella che segue è una panoramica sui dati che conserviamo:\n"
-"\n"
-"Il tuo nome, la tua email e il tuo recapito postale vengono registrati.\n"
-"Quindi, ti assegniamo un identificativo (ID) univoco, usato per tenere\n"
-"traccia di informazioni collegate al tuo account Mandrake. Ad esempio:\n"
-"    - la tua eventuale adesione ad alcune mailing list (ML);     - quando "
-"registri un prodotto acquistato, ti chiediamo informazioni\n"
-"personali e dettagli software/hardware, in modo da poterti fornire\n"
-"servizi di assistenza adeguati alle tue necessità;     - sulla pagina "
-"relativa alle donazioni o nel nostro negozio online\n"
-"(MandrakeStore) registriamo i tuoi dati (ma non quelli della carta di\n"
-"credito!) per ragioni di fatturazione.\n"
-"....\n"
-"Che ne facciamo di queste informazioni?\n"
-"\n"
-"Non cediamo MAI le informazioni personali ad altre persone o compagnie.\n"
-"Questi dati vengono usati esclusivamente con i seguenti scopi:\n"
-"    - Se ti iscrivi ad una mailing list, l'indirizzo email viene usato\n"
-"per fornirti informazioni personalizzate e/o per permetterti di\n"
-"partecipare alle discussioni di diverse ML. Se mandi un messaggio ad\n"
-"una ML, altre persone leggeranno il tuo indirizzo, ma nessuna parte\n"
-"terza ha accesso al nostro database degli iscritti. Potrai ritirare la\n"
-"tua sottoscrizione ad ogni ML in qualsiasi momento compilando un modulo\n"
-"apposito.\n"
-"    - Se fornisci informazioni durante la registrazione di un prodotto\n"
-"acquistato per ricevere assistenza, queste informazioni restano private\n"
-"a meno che non servano ad uno dei nostri partner per fornirti\n"
-"l'assistenza richiesta.\n"
-"    - Se utilizzi MandrakeStore, il tuo ID è utilizzato per tenere\n"
-"traccia dei tuoi ordini e per consegnarti i prodotti.\n"
-"    - Se ci fornisci informazioni di marketing, le teniamo solo per uso\n"
-"interno, al fine di migliorare i nostri prodotti e offrirti soluzioni\n"
-"piú adatte alle tue necessità, anche se non hai comprato nulla.\n"
-"\n"
-"Come modificare/correggere i tuoi dati personali?\n"
-"\n"
-"La legge francese garantisce agli individui la possibilità di accedere,\n"
-"correggere, modificare o rimuovere i propri dati personali in nostro\n"
-"possesso. Noi estendiamo questo diritto su scala planetaria. Puoi\n"
-"esercitare questo diritto in ogni momento accedendo al tuo account con\n"
-"il tuo ID e agendo suo tuoi tuoi dati personali, recandoti presso:\n"
-"http://www.mandrakeonline.net"
+"Il nome utente o la password sono errati.\n"
+" Dovrai ridigitarli oppure, qualora non ne avessi uno, creare un account su "
+"MandrakeOnline.\n"
+" Nel secondo caso, torna al primo passo per collegarti a MandrakeOnline.\n"
+" Ricorda che devi fornire anche un nome per il tuo computer \n"
+" (sono ammessi solo caratteri alfabetici)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Invio della configurazione in corso..."
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Chiudi"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Lettura della configurazione in corso\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -454,3 +324,200 @@ msgstr "Impossibile creare il supporto mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Impossibile aggiornare i pacchetti dal supporto mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Africa"
+
+#~ msgid "Asia"
+#~ msgstr "Asia"
+
+#~ msgid "Australia"
+#~ msgstr "Australia"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "Nord America"
+
+#~ msgid "South America"
+#~ msgstr "Sud America"
+
+#~ msgid "Next"
+#~ msgstr "Avanti"
+
+#~ msgid "Quit"
+#~ msgstr "Esci"
+
+#~ msgid "Back"
+#~ msgstr "Indietro"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Il mirror è vuoto"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "Il mirror è vuoto: per favore, scegli un'area geografica."
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Attenzione: nessun browser specificato"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Invio della configurazione in corso"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Errore durante la trasmissione dei dati"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Si è verificato un errore durante la trasmissione dei tuoi dati "
+#~ "personali.\n"
+#~ "\n"
+#~ "Premi 'Avanti' per riprovare."
+
+#~ msgid "Finished"
+#~ msgstr "Operazione completata"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Seleziona la tua area geografica"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Annulla"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Vuoi veramente interrompere MandrakeOnline?\n"
+#~ "Per ritornare alla procedura guidata premi 'Annulla',\n"
+#~ "Per uscire premi 'Esci'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Sicuro di voler interrompere? - MandrakeOnline"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ "Hai appena avviato per la prima volta Mandrake Linux - Free Download "
+#~ "Edition.\n"
+#~ "\n"
+#~ "Attualmente, piú di tre milioni di persone nel mondo usano Mandrake "
+#~ "Linux!\n"
+#~ "\n"
+#~ "Per favore,impiega pochi secondi per compilare un breve questionario i "
+#~ "cui\n"
+#~ "dati saranno utilizzati solo per indagini di mercato.\n"
+#~ "Segue la descrizione della politica di MandrakeSoft sul trattamento dei "
+#~ "dati personali."
+
+#~ msgid ""
+#~ "What personal data do we collect ?         \n"
+#~ "                               \n"
+#~ "Various information is collected in different areas of the website;\n"
+#~ "what follows is an overview of the data we keep:\n"
+#~ "\n"
+#~ "Firstly, we record your email address, name and postal address.\n"
+#~ "Secondly we give you a unique customer ID. This ID will be used to \n"
+#~ "add additional information related to your Mandrake account such as:\n"
+#~ "    - Your subscription to mailling lists.\n"
+#~ "    - When registering a purchased product, we ask for personal\n"
+#~ "information as well as system/hardware details so that we may deliver\n"
+#~ "the best support services customized to your needs.\n"
+#~ "    - On our donation page and on our online store (MandrakeStore), we\n"
+#~ "record data for billing purpose (we do not store any credit card data).\n"
+#~ "    \n"
+#~ "What do we do with this information?\n"
+#~ "\n"
+#~ "We never share personal information with other persons or companies -\n"
+#~ "we use this data strictly for the following purposes:\n"
+#~ "    - If you have subscribed to a mailing list, we keep this email\n"
+#~ "address in our database to provide you with customized information\n"
+#~ "and/or to enable you to participate in discussions in various mailing\n"
+#~ "lists. If you send a message to such a list, other people will see\n"
+#~ "your email address but no external parties have access to our database\n"
+#~ "of subscribers. At any time you may unsubscribe to any list by using\n"
+#~ "the appropriate form.\n"
+#~ "    - If you provide information when registering a purchased product\n"
+#~ "to receive support, we keep this information private unless the\n"
+#~ "information is required by one of our partners to deliver the support\n"
+#~ "you require.\n"
+#~ "    - If you use MandrakeStore, we also use your Customer ID to track\n"
+#~ "your order and deliver your products.\n"
+#~ "    - If you provide us with marketing information, we keep it for \n"
+#~ "internal use only in order to improve our products so that they can \n"
+#~ "better fit your needs whether you have purchased a product or not.), How "
+#~ "to change / correct your personal data?\n"
+#~ "\n"
+#~ "French law gives individuals the right to access, correct, modify or \n"
+#~ "remove their own personal data that we have on record. We offer this \n"
+#~ "as a worldwide privilege. You may execute this right at any time by \n"
+#~ "logging to your account with your customer ID and editing your\n"
+#~ "personnal data. You can log on to this page: http://www.mandrakeonline.net"
+#~ msgstr ""
+#~ "Che dati personali raccogliamo?            \n"
+#~ "                               \n"
+#~ "Varie informazioni vengono raccolte in diverse aree del sito;\n"
+#~ "quella che segue è una panoramica sui dati che conserviamo:\n"
+#~ "\n"
+#~ "Il tuo nome, la tua email e il tuo recapito postale vengono registrati.\n"
+#~ "Quindi, ti assegniamo un identificativo (ID) univoco, usato per tenere\n"
+#~ "traccia di informazioni collegate al tuo account Mandrake. Ad esempio:\n"
+#~ "    - la tua eventuale adesione ad alcune mailing list (ML);     - quando "
+#~ "registri un prodotto acquistato, ti chiediamo informazioni\n"
+#~ "personali e dettagli software/hardware, in modo da poterti fornire\n"
+#~ "servizi di assistenza adeguati alle tue necessità;     - sulla pagina "
+#~ "relativa alle donazioni o nel nostro negozio online\n"
+#~ "(MandrakeStore) registriamo i tuoi dati (ma non quelli della carta di\n"
+#~ "credito!) per ragioni di fatturazione.\n"
+#~ "....\n"
+#~ "Che ne facciamo di queste informazioni?\n"
+#~ "\n"
+#~ "Non cediamo MAI le informazioni personali ad altre persone o compagnie.\n"
+#~ "Questi dati vengono usati esclusivamente con i seguenti scopi:\n"
+#~ "    - Se ti iscrivi ad una mailing list, l'indirizzo email viene usato\n"
+#~ "per fornirti informazioni personalizzate e/o per permetterti di\n"
+#~ "partecipare alle discussioni di diverse ML. Se mandi un messaggio ad\n"
+#~ "una ML, altre persone leggeranno il tuo indirizzo, ma nessuna parte\n"
+#~ "terza ha accesso al nostro database degli iscritti. Potrai ritirare la\n"
+#~ "tua sottoscrizione ad ogni ML in qualsiasi momento compilando un modulo\n"
+#~ "apposito.\n"
+#~ "    - Se fornisci informazioni durante la registrazione di un prodotto\n"
+#~ "acquistato per ricevere assistenza, queste informazioni restano private\n"
+#~ "a meno che non servano ad uno dei nostri partner per fornirti\n"
+#~ "l'assistenza richiesta.\n"
+#~ "    - Se utilizzi MandrakeStore, il tuo ID è utilizzato per tenere\n"
+#~ "traccia dei tuoi ordini e per consegnarti i prodotti.\n"
+#~ "    - Se ci fornisci informazioni di marketing, le teniamo solo per uso\n"
+#~ "interno, al fine di migliorare i nostri prodotti e offrirti soluzioni\n"
+#~ "piú adatte alle tue necessità, anche se non hai comprato nulla.\n"
+#~ "\n"
+#~ "Come modificare/correggere i tuoi dati personali?\n"
+#~ "\n"
+#~ "La legge francese garantisce agli individui la possibilità di accedere,\n"
+#~ "correggere, modificare o rimuovere i propri dati personali in nostro\n"
+#~ "possesso. Noi estendiamo questo diritto su scala planetaria. Puoi\n"
+#~ "esercitare questo diritto in ogni momento accedendo al tuo account con\n"
+#~ "il tuo ID e agendo suo tuoi tuoi dati personali, recandoti presso:\n"
+#~ "http://www.mandrakeonline.net"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Chiudi"
diff --git a/po/ja.po b/po/ja.po
index b7114f1f..e7d86375 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-03-18 21:48+0900\n"
 "Last-Translator: utuhiro\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -17,118 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "アフリカ"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "アジア"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "オーストラリア"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "ヨーロッパ"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "北米"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "南米"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "次へ"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "終る"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "出る"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "戻る"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "MandrakeOnline アカウントを持っていない。次のことをやりたい :"
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "入会"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "はい、自動アップデートしたい"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Wizard を出る\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "警告：閲覧ソフトが指定されていない"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "接続トラブル"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "接続トラブル"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdateはこのサイトに接続できません。再試行します。"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "パスワード誤り"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"不正ログイン又はパスワード\n"
-"再試行するか MandrakeOnline でアカウントを作って下さい\n"
-"アカウントを作成するには最初のステップに戻り MandrakeOnline に接続して下さ"
-"い\n"
-"注意：マシン名も必要\n"
-" (アルファベットのみ可)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "MandrakeOnline へようこそ"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -140,35 +37,53 @@ msgstr ""
 "ためにこの支援ツールは集中 DB への (パッケージやハードウェア) \n"
 "設定のアップロードを手伝います。\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "MandrakeOnline へようこそ"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "MandrakeOnline アカウントを持っていない。次のことをやりたい :"
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "入会"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "ログイン："
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "パスワード："
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "パスワード："
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake プライバシ方針"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "MandrakeOnline ログイン、パスワードとマシン名を入力して下さい："
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "ログイン："
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "マシン名："
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "パスワード："
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "設定情報送信中"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -200,25 +115,7 @@ msgstr ""
 "更に www.mandrakeexpert.com 有料サポートサービス割引が適用されます。\n"
 "最後に、メールアドレス username@mandrakeonline.net も差し上げます。"
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "情報送信エラー"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"個人情報送信中にエラーが発生しました。\n"
-"\n"
-"「次へ」を押すと再試行します。"
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "終了"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -226,7 +123,7 @@ msgstr ""
 "これから MandrakeOnline よりセキュリティやアップデート情報が\n"
 "届けられます。"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -234,111 +131,138 @@ msgstr ""
 "MandrakeOnline は自動アップデートを可能にします。\n"
 "あるプログラムが新アップデートを待って定期的に実行します。\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "アップロード成功"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "自動アップグレード"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "地理的住所を選んで下さい"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "はい、自動アップデートしたい"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "設定読み込み中\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "キャンセル"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
-"MandrakeOnline を中断しますか。\n"
-"Wizard へ戻るには「キャンセル」を、\n"
-"完全にやめるには「出る」を押して下さい。"
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "本当に中止しますか - MandrakeOnline"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "終る"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Wizard を出る\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "接続トラブル"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "接続トラブル"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdateはこのサイトに接続できません。再試行します。"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "パスワード誤り"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"不正ログイン又はパスワード\n"
+"再試行するか MandrakeOnline でアカウントを作って下さい\n"
+"アカウントを作成するには最初のステップに戻り MandrakeOnline に接続して下さ"
+"い\n"
+"注意：マシン名も必要\n"
+" (アルファベットのみ可)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "閉じる"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "設定読み込み中\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -396,3 +320,75 @@ msgstr "mdkupdateメディアを作成できません。\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "mdkupdateメディアからのパッケージ更新ができません。\n"
+
+#~ msgid "Africa"
+#~ msgstr "アフリカ"
+
+#~ msgid "Asia"
+#~ msgstr "アジア"
+
+#~ msgid "Australia"
+#~ msgstr "オーストラリア"
+
+#~ msgid "Europe"
+#~ msgstr "ヨーロッパ"
+
+#~ msgid "North America"
+#~ msgstr "北米"
+
+#~ msgid "South America"
+#~ msgstr "南米"
+
+#~ msgid "Next"
+#~ msgstr "次へ"
+
+#~ msgid "Quit"
+#~ msgstr "出る"
+
+#~ msgid "Back"
+#~ msgstr "戻る"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "警告：閲覧ソフトが指定されていない"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "設定情報送信中"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "情報送信エラー"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "個人情報送信中にエラーが発生しました。\n"
+#~ "\n"
+#~ "「次へ」を押すと再試行します。"
+
+#~ msgid "Finished"
+#~ msgstr "終了"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "地理的住所を選んで下さい"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "キャンセル"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "MandrakeOnline を中断しますか。\n"
+#~ "Wizard へ戻るには「キャンセル」を、\n"
+#~ "完全にやめるには「出る」を押して下さい。"
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "本当に中止しますか - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "閉じる"
diff --git a/po/ka.po b/po/ka.po
index 0d8b41f3..fc32b025 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-01-29 23:46+0400\n"
 "Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
 "Language-Team: Georgian\n"
@@ -15,117 +15,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:65
-msgid "Asia"
-msgstr ""
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr ""
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr ""
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr ""
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "შემდეგი"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "დამთავრება"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "გასვლა"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "დაბრუნება"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "მე არ მაქვს MandrakeOnline ანგარიში, თუმცა მინდა მქონდეს"
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "გაწევრიანება"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr ""
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "ოსტატის დასრულება\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "გაფრთხილება: ბროუზერი არ აგირჩევიათ"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "კავშირის პრობლემა"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "კავშირის პრობლემა"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeOnline-ს ვერ ვუკავშირდები. გთხოვთ მოგვიანებით სცადოთ"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "არასწორი პაროლი"
-
-#: ../mdkonline:294
-#, fuzzy
-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)"
-msgstr ""
-"თქვენი მომხმარებლის სახელი ან პაროლი არასწორია.\n"
-"ან ხელახლა უნდა ჩაწეროთ, ან ახალი ანგარიში შექმნათ MandrakeOnline-ზე.\n"
-"ამ უკანასკნელის გასაკეთებლად მიუბრუნდით პირველ მოქმედებას MandrakeOnline-ზე "
-"დასაკავშირებლად."
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "კეთილი იყოს თქვენი ფეხი MandrakeOnline-ზე."
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -139,36 +37,54 @@ msgstr ""
 "თქვენ ავტომატურად შეიტყოთ უსაფრთხობასთან დაკავშირებულ და მნიშვნელოვან "
 "გაუმჯობესებებზე.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "კეთილი იყოს თქვენი ფეხი MandrakeOnline-ზე."
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "მე არ მაქვს MandrakeOnline ანგარიში, თუმცა მინდა მქონდეს"
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "გაწევრიანება"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "მომხმარებელი:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "პაროლი:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "პაროლი:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake-ის პირადი უფლებების პოლისი"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "რეგისტრაცია"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 #, fuzzy
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "შეიყვანეთ თქვენი MandrakeOnline-ის მომხმარებლის სახელი და პაროლი:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "მომხმარებელი:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "პაროლი:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "ვაგზავნი თქვენს კონფიგურაციას"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -202,25 +118,7 @@ msgstr ""
 "www.mandrakeexpert.com.-ზე\n"
 "და ბოლოს, თქვენ მიიღებთ ელფოსტის ალიასს მომხმარებელი@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "შეცდომა ინფორმაციის გადაგზავნისას"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"შეცდომა თქვენი პირადი ინფორმაციის გადაგზავნისას.\n"
-"\n"
-"დააჭირეთ 'შემდეგი'-ს თუ გნებავთ ისევ სცადოთ ნფორმაციის გაგზავნა."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "დასრულდა"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 #, fuzzy
 msgid ""
 "From now you will receive on security and updates \n"
@@ -231,118 +129,144 @@ msgstr ""
 "დაკავშირებულ\n"
 "და მნიშვნელოვან გაუმჯობესებების განცხადებებს."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 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 ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:435
-#, fuzzy
-msgid "Reading configuration\n"
-msgstr "ვაგზავნი თქვენს კონფიგურაციას"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "ო-ქეი"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "სტოპ!"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
 msgstr ""
-"მართლა გნებავთ MandrakeOnline-იდან გამოსვლა?\n"
-"თუ გნებავთ ოსტატს დაუბრუნდეთ, დააჭირეთ 'სტოპ!'-ს,\n"
-"თუ მართლა გნებავთ გამოსვლა, დააჭირეთ 'გამოსვლა'-ს."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "მართლა გნებავთ გამოსვლა? - MandrakeOnline"
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "დამთავრება"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "ოსტატის დასრულება\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "კავშირის პრობლემა"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "კავშირის პრობლემა"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeOnline-ს ვერ ვუკავშირდები. გთხოვთ მოგვიანებით სცადოთ"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "არასწორი პაროლი"
+
+#: ../mdkonline:273
+#, fuzzy
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"თქვენი მომხმარებლის სახელი ან პაროლი არასწორია.\n"
+"ან ხელახლა უნდა ჩაწეროთ, ან ახალი ანგარიში შექმნათ MandrakeOnline-ზე.\n"
+"ამ უკანასკნელის გასაკეთებლად მიუბრუნდით პირველ მოქმედებას MandrakeOnline-ზე "
+"დასაკავშირებლად."
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "დახურვა"
+#: ../mdkonline:335
+#, fuzzy
+msgid "Reading configuration\n"
+msgstr "ვაგზავნი თქვენს კონფიგურაციას"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -396,3 +320,54 @@ msgstr ""
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
+
+#~ msgid "Next"
+#~ msgstr "შემდეგი"
+
+#~ msgid "Quit"
+#~ msgstr "გასვლა"
+
+#~ msgid "Back"
+#~ msgstr "დაბრუნება"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "გაფრთხილება: ბროუზერი არ აგირჩევიათ"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "ვაგზავნი თქვენს კონფიგურაციას"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "შეცდომა ინფორმაციის გადაგზავნისას"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "შეცდომა თქვენი პირადი ინფორმაციის გადაგზავნისას.\n"
+#~ "\n"
+#~ "დააჭირეთ 'შემდეგი'-ს თუ გნებავთ ისევ სცადოთ ნფორმაციის გაგზავნა."
+
+#~ msgid "Finished"
+#~ msgstr "დასრულდა"
+
+#~ msgid "OK"
+#~ msgstr "ო-ქეი"
+
+#~ msgid "Cancel"
+#~ msgstr "სტოპ!"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "მართლა გნებავთ MandrakeOnline-იდან გამოსვლა?\n"
+#~ "თუ გნებავთ ოსტატს დაუბრუნდეთ, დააჭირეთ 'სტოპ!'-ს,\n"
+#~ "თუ მართლა გნებავთ გამოსვლა, დააჭირეთ 'გამოსვლა'-ს."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "მართლა გნებავთ გამოსვლა? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "დახურვა"
diff --git a/po/ko.po b/po/ko.po
index 5a61c8f7..8e7c664d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2002-08-16 12:34+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: korean <baedaron@hanafos.com>\n"
@@ -14,118 +14,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "아프리카"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "아시아"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "오스트레일리아"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "유럽"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "북아메리카"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "남아메리카"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "다음"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "완료"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "종료"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "뒤로"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "맨드레이크 온라인에 계정이 없으며, 새로 만들고 싶습니다."
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "구독"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "예, 자동 업데이트하고 싶습니다."
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "마법사 종료 중\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "경고: 브라우저가 지정되지 않았습니다."
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "연결 문제"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "연결 문제"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"맨드레이크 업데이트가 사이트에 접속하지 못했습니다. 다시 시도할 것입니다."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "잘못된 암호"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"사용자명이나 암호가 틀렸습니다.\n"
-"다시 시도해 보거나, 맨드레이크 온라인에 새 계정을 만들어 보세요.\n"
-"새 계정을 만들려면, 맨드레이크 온라인에 접속하기 위한 첫 단계로 돌아가세요.\n"
-"또한 컴퓨터 이름도 입력해야 한다는 것을 알아두세요.\n"
-"(컴퓨터 이름은 알파뱃만 허용됩니다.)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "맨드레이크 온라인에 잘 오셨습니다."
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -139,35 +36,53 @@ msgstr ""
 "이는 님께 보안 업데이트나 유용한 업그레이드에 대해 지속적으로 알리기 위함입니"
 "다.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "맨드레이크 온라인에 잘 오셨습니다."
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "맨드레이크 온라인에 계정이 없으며, 새로 만들고 싶습니다."
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "구독"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "로그인:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "암호:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "암호:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "맨드레이크 프라이버시 정책"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "인증"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "맨드레이크온라인 사용자명, 암호, 컴퓨터 이름을 입력하세요:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "로그인:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "컴퓨터 이름:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "암호:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "님의 설정을 전송 중"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -200,25 +115,7 @@ msgstr ""
 "받으실 수도 있습니다.\n"
 "또한, 「사용자명@mandrakeonline.net」의 이메일 별칭을 부여받게 됩니다."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "정보를 보내는 동안 오류 발생"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"개인 정보를 보내는 도중에 오류가 발생했습니다.\n"
-"\n"
-"님의 설정을 다시 보내려면,「다음」을 누르세요."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "완료했습니다."
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -226,7 +123,7 @@ msgstr ""
 "이제부터 보안과 업그레이드에 대한 정보를 \n"
 "맨드레이크 온라인을 통해 받아 보실 수 있습니다."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -234,111 +131,138 @@ msgstr ""
 "맨들레크 온라인은 님께 자동업데이트 기능을 제공합니다.\n"
 "새로운 업데이트를 확인하기 위하여 프로그램이 정기적으로 실행될 것입니다.\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "성공적으로 전송되었습니다!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "자동 업그레이드"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "님이 거주하는 지역을 선택하세요."
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "예, 자동 업데이트하고 싶습니다."
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "설정사항 읽는 중\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "확인"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "취소"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
-"정말 맨드레이크 온라인을 종료할까요?\n"
-"마법사로 돌아가려면 「취소」를 누르고,\n"
-"정말 종료하려면 「종료」를 누르세요."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "정말 종료합니까? - 맨드레이크 온라인"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "완료"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "마법사 종료 중\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "연결 문제"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "연결 문제"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"맨드레이크 업데이트가 사이트에 접속하지 못했습니다. 다시 시도할 것입니다."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "잘못된 암호"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"사용자명이나 암호가 틀렸습니다.\n"
+"다시 시도해 보거나, 맨드레이크 온라인에 새 계정을 만들어 보세요.\n"
+"새 계정을 만들려면, 맨드레이크 온라인에 접속하기 위한 첫 단계로 돌아가세요.\n"
+"또한 컴퓨터 이름도 입력해야 한다는 것을 알아두세요.\n"
+"(컴퓨터 이름은 알파뱃만 허용됩니다.)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "닫기"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "설정사항 읽는 중\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -401,3 +325,75 @@ msgstr ""
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
+
+#~ msgid "Africa"
+#~ msgstr "아프리카"
+
+#~ msgid "Asia"
+#~ msgstr "아시아"
+
+#~ msgid "Australia"
+#~ msgstr "오스트레일리아"
+
+#~ msgid "Europe"
+#~ msgstr "유럽"
+
+#~ msgid "North America"
+#~ msgstr "북아메리카"
+
+#~ msgid "South America"
+#~ msgstr "남아메리카"
+
+#~ msgid "Next"
+#~ msgstr "다음"
+
+#~ msgid "Quit"
+#~ msgstr "종료"
+
+#~ msgid "Back"
+#~ msgstr "뒤로"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "경고: 브라우저가 지정되지 않았습니다."
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "님의 설정을 전송 중"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "정보를 보내는 동안 오류 발생"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "개인 정보를 보내는 도중에 오류가 발생했습니다.\n"
+#~ "\n"
+#~ "님의 설정을 다시 보내려면,「다음」을 누르세요."
+
+#~ msgid "Finished"
+#~ msgstr "완료했습니다."
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "님이 거주하는 지역을 선택하세요."
+
+#~ msgid "OK"
+#~ msgstr "확인"
+
+#~ msgid "Cancel"
+#~ msgstr "취소"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "정말 맨드레이크 온라인을 종료할까요?\n"
+#~ "마법사로 돌아가려면 「취소」를 누르고,\n"
+#~ "정말 종료하려면 「종료」를 누르세요."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "정말 종료합니까? - 맨드레이크 온라인"
+
+#~ msgid "Close"
+#~ msgstr "닫기"
diff --git a/po/lt.po b/po/lt.po
index e1f1510b..eecf5cb1 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-20 13:28+0200\n"
 "Last-Translator: Darius Liepuonis <dariusle@takas.lt>\n"
 "Language-Team: Lithuanian <>\n"
@@ -14,150 +14,69 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Azija"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australija"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Šiaurės Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Pietų Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Sekantis"
+#: ../mdkonline:85
+msgid "Skip Wizard"
+msgstr ""
 
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Baigti"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
+msgstr "Sveiki atvykę į MandrakeOnline"
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Išeiti"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
+msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Atgal"
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Sveiki atvykę į MandrakeOnline"
 
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr "Aš neturiu MandrakeOnline sąskaitos bet noriu "
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr "Užsiprenumeruoti"
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Taip, aš noriu automatinių atnaujinimų"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Baigti vedlį\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Ispėjimas: Nenurodyta naršyklė"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Sujungimo klaida"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Vardas:"
 
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Sujungimo klaida"
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Slaptažodis"
 
-#: ../mdkonline:282 ../mdkonline:347
+#: ../mdkonline:109
 #, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"MandrakeUpdate negali prisijungti prie tarnybinės stoties, pabandysime "
-"vėliau."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Neteisingas slaptažodis"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
-msgstr "Sveiki atvykę į MandrakeOnline"
+msgid "Confirm Password:"
+msgstr "Slaptažodis"
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Autentifikacija"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Įveskite savo MandrakeOnline sąskaitos vardą ir slaptažodį:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Vardas:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Mašinos vardas:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Slaptažodis"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Siusti jūsų nustatymus"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -177,22 +96,7 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Klaida siunčiant informacija"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Baigta"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -200,7 +104,7 @@ msgstr ""
 "Nuo dabar jūs gausite pranešimus apie saugumo pataisas \n"
 "ir atnaujinimus."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -208,108 +112,134 @@ msgstr ""
 "MandrakeOnlina jums siųlo galimybę automatizuoti jūsų atnaujinimus.\n"
 "Programa reguleriai pasileis jūsų sistemoje laukdama atnaujinimų\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Jūsų siuntimas buvo sėkmingas!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automatizuoti Atnaujinimai"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Pasirinkite jūsų geografinę padėtį"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Taip, aš noriu automatinių atnaujinimų"
+
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Skaitau nustatymus\n"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Atšaukti"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
 msgstr ""
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Tikrai Nutraukti ? - MandrakeOnline"
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Baigti"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Baigti vedlį\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Sujungimo klaida"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Sujungimo klaida"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
 msgstr ""
+"MandrakeUpdate negali prisijungti prie tarnybinės stoties, pabandysime "
+"vėliau."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Neteisingas slaptažodis"
 
-#: ../mdkonline:576
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Uždaryti"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Skaitau nustatymus\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -373,3 +303,57 @@ msgstr "Negaliu sukurti mdkupdate šaltinio. \n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Negaliu atnaujinti paketų sarašo iš mdkupdate šaltinio. \n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Azija"
+
+#~ msgid "Australia"
+#~ msgstr "Australija"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "Šiaurės Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Pietų Amerika"
+
+#~ msgid "Next"
+#~ msgstr "Sekantis"
+
+#~ msgid "Quit"
+#~ msgstr "Išeiti"
+
+#~ msgid "Back"
+#~ msgstr "Atgal"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Ispėjimas: Nenurodyta naršyklė"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Siusti jūsų nustatymus"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Klaida siunčiant informacija"
+
+#~ msgid "Finished"
+#~ msgstr "Baigta"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Pasirinkite jūsų geografinę padėtį"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Atšaukti"
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Tikrai Nutraukti ? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Uždaryti"
diff --git a/po/lv.po b/po/lv.po
index 217c422d..600a11da 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2002-09-25 19:04+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -15,119 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Āfrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Āzija"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Austrālija"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Eiropa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Ziemeļamerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Dienvidamerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Tālāk"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Beigt"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Iziet"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Atpakaļ"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Man nav Mandrake Online konta, un es vēlos "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Parakstīties"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Jā, es vēlos automātiskus jauninājumus"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Izeju no vedņa\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Brīdinājums: Nav norādīts pārlūks"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Pieslēguma problēma"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Pieslēguma problēma"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate nevar pieslēgties serverim, mēģināsim vēlāk"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Nepareiza parole"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Jūsu lietotājvārds vai parole bija nepareizi.\n"
-"Jums tie jāievada vēlreiz, vai arī jāizveido MandrakeOnline lietotāja "
-"konts.\n"
-"Jebkurā gadījumā jums jāiet atpakaļ uz pirmo soli, lai pieslēgtos "
-"MandrakeOnline.\n"
-"Ievērojiet, ka jums jānorāda arī datora nosaukums \n"
-"(atļauti tikai latīņu alfabēta burti)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Laipni lūdzam MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -141,36 +37,54 @@ msgstr ""
 "uz centralizētu datubāzi, šis viss tiek darīts ar mērķi, lai Jūs tiktu\n"
 "informēts par drošības uzlabojumiem un citiem vērtīgiem jaunumiem.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Laipni lūdzam MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Man nav Mandrake Online konta, un es vēlos "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Parakstīties"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Lietotājs:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Parole:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Parole:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake privātuma politika"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Autentifikācija"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "Ievadiet jūsu MandrakeOnline lietotājvārdu, paroli un datora nosaukumu:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Lietotājs:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Datora nosaukums:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Parole:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Sūtu jūsu konfigurāciju"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -205,25 +119,7 @@ msgstr ""
 "Visbeidzot, jums tiks izveidota e-pasta pāradresācijas adrese\n"
 "lietotājs@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Kļūda nosūtot informāciju"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Atgadījās kļūda, sūtot jūsu personisko informācinu.\n"
-"\n"
-"Uzspiediet Tālāk, lai pamēģinātu sūtīt vēlreiz."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Pabeigts"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -231,7 +127,7 @@ msgstr ""
 "Tagad pateicoties MandrakeOnline jūs saņemsit\n"
 "paziņojumus par drošības un citiem jauninājumiem."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -239,111 +135,139 @@ msgstr ""
 "MandrakeOnline piedāvā iespēju automatizēt jauninājumus.\n"
 "Jūsu sistēma regulāri palaidīs programmu, kas gaidīs jauninājumus\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Nosūtīšana bija veiksmīga!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automatizēta uzlabošana"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Norādiet savu ģeogrāfisko atrašanās vietu"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Jā, es vēlos automātiskus jauninājumus"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Nolasu konfigurāciju\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "Labi"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Atcelt"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
-"Tiešām vēlaties pārtraukt Mandrake Online?\n"
-"Lai atgrieztos vednī, spiediet 'Atcelt',\n"
-"lai tiešām izietu, spiediet 'Iziet'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Tiešām pārtraukt? - Mandrake Online"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Beigt"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Izeju no vedņa\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Pieslēguma problēma"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Pieslēguma problēma"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate nevar pieslēgties serverim, mēģināsim vēlāk"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Nepareiza parole"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Jūsu lietotājvārds vai parole bija nepareizi.\n"
+"Jums tie jāievada vēlreiz, vai arī jāizveido MandrakeOnline lietotāja "
+"konts.\n"
+"Jebkurā gadījumā jums jāiet atpakaļ uz pirmo soli, lai pieslēgtos "
+"MandrakeOnline.\n"
+"Ievērojiet, ka jums jānorāda arī datora nosaukums \n"
+"(atļauti tikai latīņu alfabēta burti)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Aizvērt"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Nolasu konfigurāciju\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -406,3 +330,75 @@ msgstr ""
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
+
+#~ msgid "Africa"
+#~ msgstr "Āfrika"
+
+#~ msgid "Asia"
+#~ msgstr "Āzija"
+
+#~ msgid "Australia"
+#~ msgstr "Austrālija"
+
+#~ msgid "Europe"
+#~ msgstr "Eiropa"
+
+#~ msgid "North America"
+#~ msgstr "Ziemeļamerika"
+
+#~ msgid "South America"
+#~ msgstr "Dienvidamerika"
+
+#~ msgid "Next"
+#~ msgstr "Tālāk"
+
+#~ msgid "Quit"
+#~ msgstr "Iziet"
+
+#~ msgid "Back"
+#~ msgstr "Atpakaļ"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Brīdinājums: Nav norādīts pārlūks"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Sūtu jūsu konfigurāciju"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Kļūda nosūtot informāciju"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Atgadījās kļūda, sūtot jūsu personisko informācinu.\n"
+#~ "\n"
+#~ "Uzspiediet Tālāk, lai pamēģinātu sūtīt vēlreiz."
+
+#~ msgid "Finished"
+#~ msgstr "Pabeigts"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Norādiet savu ģeogrāfisko atrašanās vietu"
+
+#~ msgid "OK"
+#~ msgstr "Labi"
+
+#~ msgid "Cancel"
+#~ msgstr "Atcelt"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Tiešām vēlaties pārtraukt Mandrake Online?\n"
+#~ "Lai atgrieztos vednī, spiediet 'Atcelt',\n"
+#~ "lai tiešām izietu, spiediet 'Iziet'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Tiešām pārtraukt? - Mandrake Online"
+
+#~ msgid "Close"
+#~ msgstr "Aizvērt"
diff --git a/po/mdkonline.pot b/po/mdkonline.pot
index 90da75f8..05e6a32a 100644
--- a/po/mdkonline.pot
+++ b/po/mdkonline.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,293 +16,221 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:65
-msgid "Asia"
-msgstr ""
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr ""
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr ""
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr ""
-
-#: ../mdkonline:69
-msgid "South America"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
 msgstr ""
 
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:88
-msgid "Finish"
+#: ../mdkonline:101
+msgid "Create a MandrakeOnline Account"
 msgstr ""
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
 msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
+#: ../mdkonline:103
+msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:93
-msgid "Subscribe"
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
 msgstr ""
 
 #: ../mdkonline:109
-msgid "Yes I want automated updates"
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:117
+msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
+#: ../mdkonline:123
+msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
+#: ../mdkonline:124
+msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:273
-msgid "Connecting ...\n"
+#: ../mdkonline:129
+msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
+#: ../mdkonline:135
+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"
+"1) the list of packages you have installed on your system,\n"
+"2) your hardware configuration.\n"
+"\n"
+"If you feel uncomfortable by that idea, or do not want to benefit from this "
+"service,\n"
+"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+"informed\n"
+"about security updates and useful upgrades via personalized email alerts.\n"
+"Furthermore, you benefit from discounted paid support services on\n"
+"www.mandrakeexpert.com.\n"
+"Finally, an email alias with your username@mandrakeonline.net will be "
+"provided to you."
 msgstr ""
 
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
+#: ../mdkonline:141
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:294
-msgid "Wrong password"
+#: ../mdkonline:141
+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 ""
 
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:141
+msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:142
+msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:147
+msgid "Country:"
 msgstr ""
 
-#: ../mdkonline:374
-msgid "Mandrake Privacy Policy"
+#: ../mdkonline:172
+msgid "Creation"
 msgstr ""
 
-#: ../mdkonline:379
-msgid "Authentification"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
 msgstr ""
 
-#: ../mdkonline:380
-msgid "Enter your MandrakeOnline login, password and machine name:"
+#: ../mdkonline:173
+msgid "Special Characters"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Login:"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Machine name:"
+#: ../mdkonline:174
+msgid "Empty Fields"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
 msgstr ""
 
-#: ../mdkonline:387
-msgid "Sending your Configuration"
+#: ../mdkonline:175
+msgid "Email"
 msgstr ""
 
-#: ../mdkonline:388
-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"
-"1) the list of packages you have installed on your system,\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrakeexpert.com.\n"
-"Finally, an email alias with your username@mandrakeonline.net will be "
-"provided to you."
+#: ../mdkonline:175
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
+#: ../mdkonline:176
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
 
-#: ../mdkonline:403
-msgid "Finished"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkonline:404
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to MandrakeOnline."
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
 
-#: ../mdkonline:404
-msgid ""
-"MandrakeOnline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
 msgstr ""
 
-#: ../mdkonline:404
-msgid "Your upload was successful!"
+#: ../mdkonline:186
+msgid "Please provide a login"
 msgstr ""
 
-#: ../mdkonline:409
-msgid "automated Upgrades"
+#: ../mdkonline:188
+msgid ""
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
+#: ../mdkonline:210
+msgid "Finish"
 msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
 msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
+#: ../mdkonline:252
+msgid "Connecting ...\n"
 msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
 msgstr ""
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
 msgstr ""
 
-#: ../mdkonline:567
-msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+#: ../mdkonline:273
+msgid "Wrong password"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkupdate:43
diff --git a/po/mk.po b/po/mk.po
index 1ecfd655..988d81b0 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-07 14:27+0100\n"
 "Last-Translator: Danko Ilik <danko@mindless.com>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -15,296 +15,224 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:65
-msgid "Asia"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
 msgstr ""
 
-#: ../mdkonline:66
-msgid "Australia"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:67
-msgid "Europe"
+#: ../mdkonline:101
+msgid "Create a MandrakeOnline Account"
 msgstr ""
 
-#: ../mdkonline:68
-msgid "North America"
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
 msgstr ""
 
-#: ../mdkonline:69
-msgid "South America"
+#: ../mdkonline:103
+msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:88
-msgid "Finish"
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
 msgstr ""
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
+#: ../mdkonline:109
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
+#: ../mdkonline:117
+msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:93
-msgid "Subscribe"
+#: ../mdkonline:123
+msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
+#: ../mdkonline:124
+msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
+#: ../mdkonline:129
+msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:135
+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"
+"1) the list of packages you have installed on your system,\n"
+"2) your hardware configuration.\n"
+"\n"
+"If you feel uncomfortable by that idea, or do not want to benefit from this "
+"service,\n"
+"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+"informed\n"
+"about security updates and useful upgrades via personalized email alerts.\n"
+"Furthermore, you benefit from discounted paid support services on\n"
+"www.mandrakeexpert.com.\n"
+"Finally, an email alias with your username@mandrakeonline.net will be "
+"provided to you."
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
+#: ../mdkonline:141
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
+#: ../mdkonline:141
+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 ""
 
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Проблем со конектирање"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Проблем со конектирање"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
+#: ../mdkonline:141
+msgid "Your upload was successful!"
 msgstr ""
-"MandrakeUpdate не можеше да го контактира сајтот, ќе се обидеме повторно"
 
-#: ../mdkonline:294
-msgid "Wrong password"
+#: ../mdkonline:142
+msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:147
+msgid "Country:"
 msgstr ""
 
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
+#: ../mdkonline:172
+msgid "Creation"
 msgstr ""
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
 msgstr ""
 
-#: ../mdkonline:374
-msgid "Mandrake Privacy Policy"
+#: ../mdkonline:173
+msgid "Special Characters"
 msgstr ""
 
-#: ../mdkonline:379
-msgid "Authentification"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline:380
-msgid "Enter your MandrakeOnline login, password and machine name:"
+#: ../mdkonline:174
+msgid "Empty Fields"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Login:"
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Machine name:"
+#: ../mdkonline:175
+msgid "Email"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
+#: ../mdkonline:175
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline:387
-msgid "Sending your Configuration"
+#: ../mdkonline:176
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline:388
-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"
-"1) the list of packages you have installed on your system,\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrakeexpert.com.\n"
-"Finally, an email alias with your username@mandrakeonline.net will be "
-"provided to you."
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
 
-#: ../mdkonline:403
-msgid "Finished"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
 msgstr ""
 
-#: ../mdkonline:404
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to MandrakeOnline."
+#: ../mdkonline:186
+msgid "Please provide a login"
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:188
 msgid ""
-"MandrakeOnline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:404
-msgid "Your upload was successful!"
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:409
-msgid "automated Upgrades"
-msgstr ""
-
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr ""
-
-#: ../mdkonline:435
-msgid "Reading configuration\n"
+#: ../mdkonline:210
+msgid "Finish"
 msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
 msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr ""
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Проблем со конектирање"
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
-msgstr ""
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Проблем со конектирање"
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
 msgstr ""
+"MandrakeUpdate не можеше да го контактира сајтот, ќе се обидеме повторно"
 
-#: ../mdkonline:567
-msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+#: ../mdkonline:273
+msgid "Wrong password"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkupdate:43
diff --git a/po/mn.po b/po/mn.po
index 25c74489..a04b9cf8 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-21 00:17+0100\n"
 "Last-Translator: Sanlig Badral <badral@chinggis.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
@@ -15,148 +15,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:65
-msgid "Asia"
-msgstr ""
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr ""
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr ""
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr ""
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr ""
-
-#: ../mdkonline:88
-msgid "Finish"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
 msgstr ""
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
+#: ../mdkonline:101
+msgid "Create a MandrakeOnline Account"
 msgstr ""
 
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr ""
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr ""
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr ""
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Холболтын асуудлууд"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Холболтын асуудлууд"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate вэб хуудас руу хүрч чадахгүй байна, бид дахин оролдоё."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr ""
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
 msgstr ""
 
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
+#: ../mdkonline:109
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr ""
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr ""
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr ""
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -176,134 +95,143 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr ""
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr ""
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 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 ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
+#: ../mdkonline:147
+msgid "Country:"
 msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
+#: ../mdkonline:172
+msgid "Creation"
 msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
 msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr ""
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr ""
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Холболтын асуудлууд"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Холболтын асуудлууд"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate вэб хуудас руу хүрч чадахгүй байна, бид дахин оролдоё."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr ""
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkupdate:43
diff --git a/po/ms.po b/po/ms.po
index 32466c43..1494dc6f 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.01\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-20 03:30--730\n"
 "Last-Translator: Yuzz <yuzz@likom.com.my>\n"
 "Language-Team: Bahasa Melayu <yuzz@emasonline.com>\n"
@@ -15,118 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Eropa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Amerika Utara"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Amerika Selatan"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Lanjut"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Selesai"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Keluar"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Kembali"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Saya tak punya account MandrakeOnline dan saya ingin "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Ikut"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Ya saya ingin upgrade automatik"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Keluar Wizard\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Awas: Tiada browser spesifik"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Masalah perhubungan"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Masalah perhubungan"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate gagal dihubungi, sila cuba sekali lagi."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Salah katalaluan"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Login atau katalaluan Anda salah.\n"
-" Anda harus taip sekali lagi, atau membuat akaun di MandrakeOnline.\n"
-" Pada kes terakhir, kembali ke langkah pertama utk menghubungi "
-"MandrakeOnline.\n"
-" Ingat, Anda juga harus memberikan nama Mesin \n"
-" (hanya karektor alfabet sahaj dibenarkan)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Selamat Datang di MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -138,35 +35,53 @@ msgstr ""
 "(pakej, konfigurasi peekakasan) ke pangkalan data pusat agar Anda selalu\n"
 "diberitahu kemaskini sekuriti dan upgrade yang berguna.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Selamat Datang di MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Saya tak punya account MandrakeOnline dan saya ingin "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Ikut"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Login:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Katalaluan:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Katalaluan:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Polisi Peribadi Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Otentifikasi"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Masukkan login, katalaluan, dan nama mesin  MandrakeOnline Anda:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Login:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Nama mesin:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Katalaluan:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Mengirim Konfigurasi Anda"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -200,25 +115,7 @@ msgstr ""
 "Tambahan pula, Anda akan mendapat diskaun servis di www.mandrakeexpert.com.\n"
 "Terakhir, Anda akan mendapatkan alias email namaanda@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Error semasa mengirim informasi"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Ada error semasa mengirim info personal Anda.\n"
-"\n"
-"Tekan Lanjut untuk mencuba dan mengirim konfigurasi Anda lagi."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Selesai"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -226,7 +123,7 @@ msgstr ""
 "Mulai saat ini Anda akan menerima pengumuman sekuriti dan upgrade\n"
 "dari MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -234,111 +131,138 @@ msgstr ""
 "MandrakeOnline memberi Anda kemampuan update automatik.\n"
 "Sebuah program akan berjalan secara periodik menunggu untuk kemaskini baru\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Upload Anda berjaya!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "upgrade automatik"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Pilih letak geografi Anda"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Ya saya ingin upgrade automatik"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Membaca konfigurasi\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Batal"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
-"Anda ingin keluar dari MandrakeOnline?\n"
-"Untuk kembali ke Wizard tekan 'Batal',\n"
-"untuk benar-benar keluar tekan 'Keluar'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Benar ingin keluar? - MandrakeOnline"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Selesai"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Keluar Wizard\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Masalah perhubungan"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Masalah perhubungan"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate gagal dihubungi, sila cuba sekali lagi."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Salah katalaluan"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Login atau katalaluan Anda salah.\n"
+" Anda harus taip sekali lagi, atau membuat akaun di MandrakeOnline.\n"
+" Pada kes terakhir, kembali ke langkah pertama utk menghubungi "
+"MandrakeOnline.\n"
+" Ingat, Anda juga harus memberikan nama Mesin \n"
+" (hanya karektor alfabet sahaj dibenarkan)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Tutup"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Membaca konfigurasi\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -399,3 +323,75 @@ msgstr "Gagal mencipta media mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Gagal mengemaskini pakej dari media mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Asia"
+
+#~ msgid "Australia"
+#~ msgstr "Australia"
+
+#~ msgid "Europe"
+#~ msgstr "Eropa"
+
+#~ msgid "North America"
+#~ msgstr "Amerika Utara"
+
+#~ msgid "South America"
+#~ msgstr "Amerika Selatan"
+
+#~ msgid "Next"
+#~ msgstr "Lanjut"
+
+#~ msgid "Quit"
+#~ msgstr "Keluar"
+
+#~ msgid "Back"
+#~ msgstr "Kembali"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Awas: Tiada browser spesifik"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Mengirim Konfigurasi Anda"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Error semasa mengirim informasi"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Ada error semasa mengirim info personal Anda.\n"
+#~ "\n"
+#~ "Tekan Lanjut untuk mencuba dan mengirim konfigurasi Anda lagi."
+
+#~ msgid "Finished"
+#~ msgstr "Selesai"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Pilih letak geografi Anda"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Batal"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Anda ingin keluar dari MandrakeOnline?\n"
+#~ "Untuk kembali ke Wizard tekan 'Batal',\n"
+#~ "untuk benar-benar keluar tekan 'Keluar'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Benar ingin keluar? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Tutup"
diff --git a/po/mt.po b/po/mt.po
index 52d32990..4aea5fb3 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-08-19 07:28+0200\n"
 "Last-Translator: Ramon Casha <rcasha@waldonet.net.mt>\n"
 "Language-Team:  <mt@li.org>\n"
@@ -16,117 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asja"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Awstralja"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Ewropa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Amerika ta' Fuq"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Amerika t'Isfel"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Li Jmiss"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Spiċċa"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Oħroġ"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Lura"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "M'għandix kont fuq MandrakeOnline u nixtieq "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Nabbona"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Iva, rrid aġġornamenti awtomatiċi"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Ħiereġ is-saħħar\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Twissija: Ebda browser speċifikat"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Problema fil-konnessjoni"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problema fil-konnessjoni"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate ma setax jikkuntattja s-sajt, se nerġgħu nipprovaw."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Password ħażina"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Il-login jew password kien ħażin.\n"
-"Jew erġa' ttajpjaha, jew trid toħloq kont ieħor ma' MandrakeOnline.\n"
-"F'dak il-każ, mur lura fl-ewwel pass biex taqbad ma' MandrakeOnline.\n"
-"Innota li trid tipprovdi wkoll isem ta' kompjuter (karattri alfabetiċi biss "
-"aċċettati)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Merħba għal MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -138,35 +36,53 @@ msgstr ""
 "(pakketti, konfigurazzjoni tal-magna) lill database ċentrali sabiex\n"
 "tinżamm infurmat dwar aġġornamenti ta' sigurtà u oħrajn utli.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Merħba għal MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "M'għandix kont fuq MandrakeOnline u nixtieq "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Nabbona"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Login:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Password:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Password:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Polza ta' privatezza Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Awtentikazzjoni"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Daħħal il-login, password u isem tal-kompjuter għal MandrakeOnline:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Login:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Isem tal-kompjuter:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Password:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Qed tintbagħat il-konfigurazzjoni tiegħek"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -202,25 +118,7 @@ msgstr ""
 "minn skonti fuq servizzi oħra bil-ħlas minn www.mandrakeexpert.com.\n"
 "Finalment, jinħoloqlok indirizz tal-imejl username@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Problema waqt li kienu qed tintbagħat l-informazzjoni"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Kien hemm problema waqt li kienet qed tintbagħat l-informazzjoni personali.\n"
-"\n"
-"Agħfas \"Li Jmiss\" biex terġa' tipprova."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Lest"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -228,7 +126,7 @@ msgstr ""
 "Minn issa 'l quddiem int tirċievi notifiki dwar \n"
 "sigurtà u aġġornamenti minngħand MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -237,111 +135,137 @@ msgstr ""
 "awtomatikament.\n"
 "Regularment jitħaddem programm fuq is-sistema biex jistenna aġġornamenti.\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "It-trasferiment tal-informazzjoni rnexxa."
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "Aġġornamenti awtomatiċi"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Agħżel fejn qiegħed ġeografikament"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Iva, rrid aġġornamenti awtomatiċi"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Qed tinqara' l-konfigurazzjoni\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Ikkanċella"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
 msgstr ""
-"Żgur li trid twaqqaf MandrakeOnline?\n"
-"Biex terġa' lura agħfas \"Ikkanċella\",\n"
-"biex toħroġ agħfas \"Oħroġ\"."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Żgur trid tieqaf? - MandrakeOnline"
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Spiċċa"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Ħiereġ is-saħħar\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Problema fil-konnessjoni"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problema fil-konnessjoni"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate ma setax jikkuntattja s-sajt, se nerġgħu nipprovaw."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Password ħażina"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Il-login jew password kien ħażin.\n"
+"Jew erġa' ttajpjaha, jew trid toħloq kont ieħor ma' MandrakeOnline.\n"
+"F'dak il-każ, mur lura fl-ewwel pass biex taqbad ma' MandrakeOnline.\n"
+"Innota li trid tipprovdi wkoll isem ta' kompjuter (karattri alfabetiċi biss "
+"aċċettati)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Agħlaq"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Qed tinqara' l-konfigurazzjoni\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -400,3 +324,76 @@ msgstr "Ma setax jinħoloq is-sors mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "ma stajtx naġġorna l-pakketti mis-sors mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Asja"
+
+#~ msgid "Australia"
+#~ msgstr "Awstralja"
+
+#~ msgid "Europe"
+#~ msgstr "Ewropa"
+
+#~ msgid "North America"
+#~ msgstr "Amerika ta' Fuq"
+
+#~ msgid "South America"
+#~ msgstr "Amerika t'Isfel"
+
+#~ msgid "Next"
+#~ msgstr "Li Jmiss"
+
+#~ msgid "Quit"
+#~ msgstr "Oħroġ"
+
+#~ msgid "Back"
+#~ msgstr "Lura"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Twissija: Ebda browser speċifikat"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Qed tintbagħat il-konfigurazzjoni tiegħek"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Problema waqt li kienu qed tintbagħat l-informazzjoni"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Kien hemm problema waqt li kienet qed tintbagħat l-informazzjoni "
+#~ "personali.\n"
+#~ "\n"
+#~ "Agħfas \"Li Jmiss\" biex terġa' tipprova."
+
+#~ msgid "Finished"
+#~ msgstr "Lest"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Agħżel fejn qiegħed ġeografikament"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Ikkanċella"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Żgur li trid twaqqaf MandrakeOnline?\n"
+#~ "Biex terġa' lura agħfas \"Ikkanċella\",\n"
+#~ "biex toħroġ agħfas \"Oħroġ\"."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Żgur trid tieqaf? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Agħlaq"
diff --git a/po/nb.po b/po/nb.po
index c0f953bf..9b1d4a8a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-09 23:33+0100\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
@@ -18,119 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Nord Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Sør Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Neste"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Finsk"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Avslutt"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Tilbake"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Jeg har ingen MandrakeOnline-konto og jeg ønsker å "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Abonnere"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Ja, jeg ønsker automatiserte oppdateringer"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Avslutter veiviser\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Tomt speil"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "Tomt speil. Vennligst velg et sted."
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Advarsel: Ingen nettleser spesifisert"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Kobler til ...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Tilkoblingsproblem"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"MandrakeOnline kunne ikke bli kontaktet, vennligst prøv igjen på et senere "
-"tidspunkt"
 
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Feil passord"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Ditt brukernavn eller passord var feil.\n"
-" Enten så må du skrive det på nytt, eller så må du opprette en konto på "
-"MandrakeOnline.\n"
-" I det siste tilfellet, gå tilbake til det første steget for å koble til "
-"MandrakeOnline.\n"
-" Vær oppmerksom på at du også må oppgi maskinnavn \n"
-" (bare alfabetiske tegn er tillatt)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "Sender konfigurasjon..."
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Velkommen til MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -142,35 +38,53 @@ msgstr ""
 "(pakker, maskinvarekonfigurasjon) til en sentral database for å holde\n"
 "deg informert om sikkerhetsoppdatering og verdifulle oppgraderinger\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Velkommen til MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Jeg har ingen MandrakeOnline-konto og jeg ønsker å "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Abonnere"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Brukernavn:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Passord:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Passord:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake retningslinjer for personvern"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Autentisering"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Tast inn ditt MandrakeOnline-brukernavn, passord og maskinnavn:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Brukernavn:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Maskinnavn:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Passord:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Sender din konfigurasjon:"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -207,25 +121,7 @@ msgstr ""
 "Til slutt så vil et epostalaias med ditt brukernavn@mandrakeline.net bli "
 "tilbudt til deg."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Feil under sending av informasjon"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Det var en feil under sending av din personlige informasjon.\n"
-"\n"
-"Press Neste og prøv å sende din konfigurasjon på nytt."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Ferdig"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -233,7 +129,7 @@ msgstr ""
 "Fra nå av vil du motta sikkerhets- og oppdateringsannonseringer \n"
 "takket være MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -242,173 +138,139 @@ msgstr ""
 "Et program vil kjøre regelmessig på ditt system i vente på nye "
 "oppdateringer\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Din opplasting var vellykket!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automatiserte oppgraderinger"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Velg din geografiske lokasjon"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Ja, jeg ønsker automatiserte oppdateringer"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Leser konfigurasjon\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "oK"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Avbryt"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
 msgstr ""
-"Vil du virkelig avbryte MandrakeOnline?\n"
-"For å fortsette veiviseren trykk 'Avbryt',\n"
-"for å virkelig avslutt, trykk 'Avslutt'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Virkelig avbryt? - MandrakeOnline"
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
-" Du er på vei til å starte våre Frie Mandrake Linux Download Edition for "
-"første gang. \n"
-"\n"
-"Det er nå over tre millioner Mandrake Linux-brukere over hele verden!\n"
-"\n"
-"Vennligst bruk noen få sekunder på å fylle ut et kjapt spørreskjema. Dataen "
-"fra dette \n"
-"spørreskjemaet vi bli brukt får bruksmessige markedsundersøkelser.\n"
-"Teksten nedenfor er personvernsrettningslinjer hos MandrakeSoft om dine "
-"personlige data."
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Finsk"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Avslutter veiviser\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Kobler til ...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Tilkoblingsproblem"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"MandrakeOnline kunne ikke bli kontaktet, vennligst prøv igjen på et senere "
+"tidspunkt"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Feil passord"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
-"Hva slags personlige data samler vi?         \n"
-"                               \n"
-"Diverse informasjon er samlet i forskjellige områder på nettstedet;\n"
-"hva somm følger nedenfor er en oversikt over dataen vi beholder:\n"
-"\n"
-"Først så tar vi vare på din epostadresse, navn og postadresse.\n"
-"Så gir vi deg et unikt kundenummer. Dette nummeret vil bli brukt fo å \n"
-"legge til ekstra informasjon relatert til din Mandrake-konto som:\n"
-"    - Ditt abonnement til mailinglister.\n"
-"    - Når du registrerer et kjøpt produkt så spør vi etter personlig\n"
-"informasjon så vel som system/maskinvare-detaljer så vi kan levere\n"
-"de beste kundestøttetjenester skreddersydd for dine behov.\n"
-"    - På vår donasjonsside og vår nettbutikk (MandrakeStore), tar vi vare\n"
-"på data for faktureringsårsaker (vi lagrer ikke noe kredittkortdata).\n"
-"    \n"
-"Hva gjør vi med denne informasjonen?\n"
-"\n"
-"Vi deler aldri personlig informasjon med andre personer eller firmaer -\n"
-"vi bruker dataene kun for de følgende årsaker:\n"
-"    - Hvis du har abonnert på en mailingliste, så beholver vi denne "
-"epostadressen\n"
-"i vår database for å tilby deg tilpasset informasjon\n"
-"og/eller for å la deg delta i diskusjoner på diverse mailinglister.\n"
-"Hvis du sender en melding til en slik liste, så vil andre folk se\n"
-"din epostadresse, men ingen eksterne partier vil ha tilgang til vår "
-"database\n"
-"med abonnenter. Til enhver tid så kan du slutte å abonnere på hvilken som "
-"helst\n"
-"liste ved hjelp av riktig skjema,\n"
-"    - Hvis du gir informasjon når du registrerer et kjøpt produkt\n"
-"for å motta kundestøtte, så beholver vi denne informasjonen privat med "
-"mindre\n"
-"informasjonen trengs av en av våre partnere for å tilby kundestøtten\n"
-"du trenger.\n"
-"    - Hvis du bruker MandrakeStore så trenger vi også ditt kundenummer for "
-"å\n"
-"din ordre og levere dine produkter.\n"
-"    - Hvis du gir oss markedsinformasjon så beholder vi den bare for \n"
-"intern bruk for å forbedre våre produkter så de kan bedre passe dine behov\n"
-"(uavhengig om du har kjøpt produktet eller ei.), Hvordan endre / rette dine "
-"personlige data?\n"
-"\n"
-"Franske lover gir folk rett til å ha tilgang til, rette, modifisere eller \n"
-"fjerne deres egne personlige data som vi måtte ha lagret. Vi tilbyr dette \n"
-"som et verdensomspennende privilegie. Du kan bruke denne retten til \n"
-"enhver tid ved å logge inn på din konto med ditt kundenummer og redigere\n"
-"dine personlige data. Du kan logge på denne siden: http://www.mandrakeonline."
-"net French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
-
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
-
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Lukk"
+"Ditt brukernavn eller passord var feil.\n"
+" Enten så må du skrive det på nytt, eller så må du opprette en konto på "
+"MandrakeOnline.\n"
+" I det siste tilfellet, gå tilbake til det første steget for å koble til "
+"MandrakeOnline.\n"
+" Vær oppmerksom på at du også må oppgi maskinnavn \n"
+" (bare alfabetiske tegn er tillatt)"
+
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Sender konfigurasjon..."
+
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Leser konfigurasjon\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -468,3 +330,210 @@ msgstr "Kunne ikke opprette mdkupdate media.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Kunne ikke oppdatere pakker fra mdkupdate media.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Asia"
+
+#~ msgid "Australia"
+#~ msgstr "Australia"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "Nord Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Sør Amerika"
+
+#~ msgid "Next"
+#~ msgstr "Neste"
+
+#~ msgid "Quit"
+#~ msgstr "Avslutt"
+
+#~ msgid "Back"
+#~ msgstr "Tilbake"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Tomt speil"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "Tomt speil. Vennligst velg et sted."
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Advarsel: Ingen nettleser spesifisert"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Sender din konfigurasjon:"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Feil under sending av informasjon"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Det var en feil under sending av din personlige informasjon.\n"
+#~ "\n"
+#~ "Press Neste og prøv å sende din konfigurasjon på nytt."
+
+#~ msgid "Finished"
+#~ msgstr "Ferdig"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Velg din geografiske lokasjon"
+
+#~ msgid "OK"
+#~ msgstr "oK"
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Vil du virkelig avbryte MandrakeOnline?\n"
+#~ "For å fortsette veiviseren trykk 'Avbryt',\n"
+#~ "for å virkelig avslutt, trykk 'Avslutt'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Virkelig avbryt? - MandrakeOnline"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ " Du er på vei til å starte våre Frie Mandrake Linux Download Edition for "
+#~ "første gang. \n"
+#~ "\n"
+#~ "Det er nå over tre millioner Mandrake Linux-brukere over hele verden!\n"
+#~ "\n"
+#~ "Vennligst bruk noen få sekunder på å fylle ut et kjapt spørreskjema. "
+#~ "Dataen fra dette \n"
+#~ "spørreskjemaet vi bli brukt får bruksmessige markedsundersøkelser.\n"
+#~ "Teksten nedenfor er personvernsrettningslinjer hos MandrakeSoft om dine "
+#~ "personlige data."
+
+#~ msgid ""
+#~ "What personal data do we collect ?         \n"
+#~ "                               \n"
+#~ "Various information is collected in different areas of the website;\n"
+#~ "what follows is an overview of the data we keep:\n"
+#~ "\n"
+#~ "Firstly, we record your email address, name and postal address.\n"
+#~ "Secondly we give you a unique customer ID. This ID will be used to \n"
+#~ "add additional information related to your Mandrake account such as:\n"
+#~ "    - Your subscription to mailling lists.\n"
+#~ "    - When registering a purchased product, we ask for personal\n"
+#~ "information as well as system/hardware details so that we may deliver\n"
+#~ "the best support services customized to your needs.\n"
+#~ "    - On our donation page and on our online store (MandrakeStore), we\n"
+#~ "record data for billing purpose (we do not store any credit card data).\n"
+#~ "    \n"
+#~ "What do we do with this information?\n"
+#~ "\n"
+#~ "We never share personal information with other persons or companies -\n"
+#~ "we use this data strictly for the following purposes:\n"
+#~ "    - If you have subscribed to a mailing list, we keep this email\n"
+#~ "address in our database to provide you with customized information\n"
+#~ "and/or to enable you to participate in discussions in various mailing\n"
+#~ "lists. If you send a message to such a list, other people will see\n"
+#~ "your email address but no external parties have access to our database\n"
+#~ "of subscribers. At any time you may unsubscribe to any list by using\n"
+#~ "the appropriate form.\n"
+#~ "    - If you provide information when registering a purchased product\n"
+#~ "to receive support, we keep this information private unless the\n"
+#~ "information is required by one of our partners to deliver the support\n"
+#~ "you require.\n"
+#~ "    - If you use MandrakeStore, we also use your Customer ID to track\n"
+#~ "your order and deliver your products.\n"
+#~ "    - If you provide us with marketing information, we keep it for \n"
+#~ "internal use only in order to improve our products so that they can \n"
+#~ "better fit your needs whether you have purchased a product or not.), How "
+#~ "to change / correct your personal data?\n"
+#~ "\n"
+#~ "French law gives individuals the right to access, correct, modify or \n"
+#~ "remove their own personal data that we have on record. We offer this \n"
+#~ "as a worldwide privilege. You may execute this right at any time by \n"
+#~ "logging to your account with your customer ID and editing your\n"
+#~ "personnal data. You can log on to this page: http://www.mandrakeonline.net"
+#~ msgstr ""
+#~ "Hva slags personlige data samler vi?         \n"
+#~ "                               \n"
+#~ "Diverse informasjon er samlet i forskjellige områder på nettstedet;\n"
+#~ "hva somm følger nedenfor er en oversikt over dataen vi beholder:\n"
+#~ "\n"
+#~ "Først så tar vi vare på din epostadresse, navn og postadresse.\n"
+#~ "Så gir vi deg et unikt kundenummer. Dette nummeret vil bli brukt fo å \n"
+#~ "legge til ekstra informasjon relatert til din Mandrake-konto som:\n"
+#~ "    - Ditt abonnement til mailinglister.\n"
+#~ "    - Når du registrerer et kjøpt produkt så spør vi etter personlig\n"
+#~ "informasjon så vel som system/maskinvare-detaljer så vi kan levere\n"
+#~ "de beste kundestøttetjenester skreddersydd for dine behov.\n"
+#~ "    - På vår donasjonsside og vår nettbutikk (MandrakeStore), tar vi "
+#~ "vare\n"
+#~ "på data for faktureringsårsaker (vi lagrer ikke noe kredittkortdata).\n"
+#~ "    \n"
+#~ "Hva gjør vi med denne informasjonen?\n"
+#~ "\n"
+#~ "Vi deler aldri personlig informasjon med andre personer eller firmaer -\n"
+#~ "vi bruker dataene kun for de følgende årsaker:\n"
+#~ "    - Hvis du har abonnert på en mailingliste, så beholver vi denne "
+#~ "epostadressen\n"
+#~ "i vår database for å tilby deg tilpasset informasjon\n"
+#~ "og/eller for å la deg delta i diskusjoner på diverse mailinglister.\n"
+#~ "Hvis du sender en melding til en slik liste, så vil andre folk se\n"
+#~ "din epostadresse, men ingen eksterne partier vil ha tilgang til vår "
+#~ "database\n"
+#~ "med abonnenter. Til enhver tid så kan du slutte å abonnere på hvilken som "
+#~ "helst\n"
+#~ "liste ved hjelp av riktig skjema,\n"
+#~ "    - Hvis du gir informasjon når du registrerer et kjøpt produkt\n"
+#~ "for å motta kundestøtte, så beholver vi denne informasjonen privat med "
+#~ "mindre\n"
+#~ "informasjonen trengs av en av våre partnere for å tilby kundestøtten\n"
+#~ "du trenger.\n"
+#~ "    - Hvis du bruker MandrakeStore så trenger vi også ditt kundenummer "
+#~ "for å\n"
+#~ "din ordre og levere dine produkter.\n"
+#~ "    - Hvis du gir oss markedsinformasjon så beholder vi den bare for \n"
+#~ "intern bruk for å forbedre våre produkter så de kan bedre passe dine "
+#~ "behov\n"
+#~ "(uavhengig om du har kjøpt produktet eller ei.), Hvordan endre / rette "
+#~ "dine personlige data?\n"
+#~ "\n"
+#~ "Franske lover gir folk rett til å ha tilgang til, rette, modifisere "
+#~ "eller \n"
+#~ "fjerne deres egne personlige data som vi måtte ha lagret. Vi tilbyr "
+#~ "dette \n"
+#~ "som et verdensomspennende privilegie. Du kan bruke denne retten til \n"
+#~ "enhver tid ved å logge inn på din konto med ditt kundenummer og redigere\n"
+#~ "dine personlige data. Du kan logge på denne siden: http://www."
+#~ "mandrakeonline.net French law gives individuals the right to access, "
+#~ "correct, modify or \n"
+#~ "remove their own personal data that we have on record. We offer this \n"
+#~ "as a worldwide privilege. You may execute this right at any time by \n"
+#~ "logging to your account with your customer ID and editing your\n"
+#~ "personnal data. You can log on to this page: http://www.mandrakeonline.net"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Lukk"
diff --git a/po/nl.po b/po/nl.po
index 516f8c83..91c34d11 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-21 19:58+0100\n"
 "Last-Translator: Hendrik-Jan Heins <hjh@passys.nl>\n"
 "Language-Team: (nl) Dutch team <>\n"
@@ -16,121 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Azië"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australië"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Noord Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Zuid Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Volgende"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Voltooien"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Afsluiten"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Vorige"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Ik heb geen MandrakeOnline account en wil er een"
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Aanmelden"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Ja, ik wil automatische updates"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Bezig met afsluiten wizard\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Waarschuwing: geen browser aangegeven"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Verbindingsprobleem"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Verbindingsprobleem"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"MandrakeUpdate kon geen verbinding krijgen met de website, op een later "
-"tijdstip wordt het opnieuw geprobeerd."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Wachtwoord onjuist"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Uw gebruikersnaam of wachtwoord was onjuist.\n"
-" U kunt het opnieuw proberen, of u moet zich nog registreren bij "
-"MandrakeOnline.\n"
-" In het laatste geval dient u terug te gaan naar de eerste stap om "
-"verbinding te maken metMandrakeOnline.\n"
-" Weest u zich ervan bewust dat u ook een Computernaam moet invoeren \n"
-" (alleen letters zijn toegestaan)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Welkom bij MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -143,35 +37,53 @@ msgstr ""
 "u op de hoogte te houden van beveiligingsvernieuwingen en nuttige "
 "opwaarderingen.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Welkom bij MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Ik heb geen MandrakeOnline account en wil er een"
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Aanmelden"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Gebruikersnaam:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Wachtwoord:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Wachtwoord:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake Privacy-beleid"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Verificatie"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Voor uw MandrakeOnline gebruikersnaam, wachtwoord en computernaam in:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Gebruikersnaam:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Computernaam:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Bezig met versturen van configuratie"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -207,25 +119,7 @@ msgstr ""
 "www.mandrakeexpert.com.\n"
 "Tot slot krijg u een e-mailadres met 'uw gebruikersnaam'@mandrakeonline.net ."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Er is een fout opgetreden bij het versturen van informatie"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Er is een fout opgetreden bij het versturen van uw persoonlijke informatie.\n"
-"\n"
-"Druk op 'volgende' om opnieuw te proberen uw configuratie te versturen."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Voltooid"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -233,7 +127,7 @@ msgstr ""
 "Vanaf nu ontvangt u beveiliging- en\n"
 "update-aankondigingen aangeboden door MandrakeOnline"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -242,111 +136,141 @@ msgstr ""
 "Een programma dat regelmatig zal worden gestart, kijkt of er nieuwe updates "
 "zijn\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Het versturen is gelukt!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "geautomatiseerde vernieuwingen"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Kies uw geografische locatie"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Ja, ik wil automatische updates"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Lezen instellingen\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Annuleren"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
 msgstr ""
-"Wilt u werkelijk MandrakeOnline afbreken?\n"
-"Druk op 'Annuleren' om naar de Wizard terug te keren,\n"
-"druk op 'Afsluiten' om werkelijk af te sluiten."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Wilt u echt stoppen? - MandrakeOnline"
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Voltooien"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Bezig met afsluiten wizard\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Verbindingsprobleem"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Verbindingsprobleem"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
 msgstr ""
+"MandrakeUpdate kon geen verbinding krijgen met de website, op een later "
+"tijdstip wordt het opnieuw geprobeerd."
 
-#: ../mdkonline:576
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Wachtwoord onjuist"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Uw gebruikersnaam of wachtwoord was onjuist.\n"
+" U kunt het opnieuw proberen, of u moet zich nog registreren bij "
+"MandrakeOnline.\n"
+" In het laatste geval dient u terug te gaan naar de eerste stap om "
+"verbinding te maken metMandrakeOnline.\n"
+" Weest u zich ervan bewust dat u ook een Computernaam moet invoeren \n"
+" (alleen letters zijn toegestaan)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Sluiten"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Lezen instellingen\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -411,3 +335,76 @@ msgstr "Kan geen mdkupdate medium aanmaken.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Kan geen pakketten bijwerken vanaf het mdkupdate medium.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Azië"
+
+#~ msgid "Australia"
+#~ msgstr "Australië"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "Noord Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Zuid Amerika"
+
+#~ msgid "Next"
+#~ msgstr "Volgende"
+
+#~ msgid "Quit"
+#~ msgstr "Afsluiten"
+
+#~ msgid "Back"
+#~ msgstr "Vorige"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Waarschuwing: geen browser aangegeven"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Bezig met versturen van configuratie"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Er is een fout opgetreden bij het versturen van informatie"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Er is een fout opgetreden bij het versturen van uw persoonlijke "
+#~ "informatie.\n"
+#~ "\n"
+#~ "Druk op 'volgende' om opnieuw te proberen uw configuratie te versturen."
+
+#~ msgid "Finished"
+#~ msgstr "Voltooid"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Kies uw geografische locatie"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuleren"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Wilt u werkelijk MandrakeOnline afbreken?\n"
+#~ "Druk op 'Annuleren' om naar de Wizard terug te keren,\n"
+#~ "druk op 'Afsluiten' om werkelijk af te sluiten."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Wilt u echt stoppen? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Sluiten"
diff --git a/po/pl.po b/po/pl.po
index 060eb21c..13d7c1d4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonlie\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2002-10-17 17:53+0200\n"
 "Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
 "Language-Team: polish <pl@li.org>\n"
@@ -14,117 +14,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afryka"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Azja"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Ameryka Północna"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Ameryka Południowa"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Dalej"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Zakończ"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Zakończ"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Cofnij"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Nie posiadam konta MandrakeOnline i chcę je otrzymać "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Zasubskrybuj"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Tak, chcę automatyczne uaktualnienia"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Opuszczanie druida\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Ostrzeżenie: Nie zdefiniowano przeglądarki"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Problem z połączeniem"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problem z połączeniem"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "Nie można nawiązać połączenia ze stroną, spróbujemy zrobić to później."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Niepoprawne hasło"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Twój login lub hasło zostały niepoprawnie wprowadzone.\n"
-" Możesz spróbować ponownie lub też utworzyć nowe konto na MandrakeOnline.\n"
-" W tym drugim przypadku, wróć do pierwszego kroku nawiązywania połączenia\n"
-" z MandrakeOnline. Zauważ, że należy także podać nazwę komputera\n"
-" (przyjmowane są tylko znaki alfanumeryczne)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Witaj w MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -136,35 +34,53 @@ msgstr ""
 "(pakiety, konfiguracja sprzętowa) do centralnej bazy danych aby\n"
 "móc lepiej informować cię o odpowiednich uaktualnieniach.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Witaj w MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Nie posiadam konta MandrakeOnline i chcę je otrzymać "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Zasubskrybuj"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Login:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Hasło:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Hasło:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Zastrzeżenie prywatności Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Wprowadź swój login MandrakeOnline, hasło i nazwę komputera:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Login:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Nazwa komputera:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Hasło:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Przesyłanie konfiguracji systemu"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -198,25 +114,7 @@ msgstr ""
 "na www.mandrakeexpert.com.\n"
 "Zostanie Ci przypisany także alias z loginem@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Błąd w trakcie wysyłania informacji"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Wystąpił błąd w trakcie wysyłania informacji osobistych.\n"
-"\n"
-"Kliknij \"Dalej\", aby spróbować wysłać je ponownie."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Zakończono"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -224,7 +122,7 @@ msgstr ""
 "Od tej chwili będziesz otrzymywać informacje\n"
 "o wykrytych błedach i uaktualnieniach dzięki MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -232,111 +130,137 @@ msgstr ""
 "MandrakeOnline oferuje ci możliwość automatyzacji uaktualnień.\n"
 "Program będzie uruchamiał się regulanie i oczekiwał na uaktualnienia\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Informacje zostały pomyślnie przesłane!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automatyczne uaktualnienia"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Wybierz swoje położenie geograficzne"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Tak, chcę automatyczne uaktualnienia"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Wczytywanie konfiguracji\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Anuluj"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
-"Czy na pewno chcesz wyjść z MandrakeOnline?\n"
-"Aby powrócić do Druida naciśnij \"Anuluj\",\n"
-"aby opuścić program naciśnij \"Wyjdź\"."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Czy na pewno chcesz przerwać? - MandrakeOnline"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Zakończ"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Opuszczanie druida\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Problem z połączeniem"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problem z połączeniem"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "Nie można nawiązać połączenia ze stroną, spróbujemy zrobić to później."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Niepoprawne hasło"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Twój login lub hasło zostały niepoprawnie wprowadzone.\n"
+" Możesz spróbować ponownie lub też utworzyć nowe konto na MandrakeOnline.\n"
+" W tym drugim przypadku, wróć do pierwszego kroku nawiązywania połączenia\n"
+" z MandrakeOnline. Zauważ, że należy także podać nazwę komputera\n"
+" (przyjmowane są tylko znaki alfanumeryczne)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Zamknij"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Wczytywanie konfiguracji\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -396,3 +320,75 @@ msgstr "Nie można utworzyć nośnika mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Nie można zaktualizować pakietów z nośnika mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afryka"
+
+#~ msgid "Asia"
+#~ msgstr "Azja"
+
+#~ msgid "Australia"
+#~ msgstr "Australia"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "Ameryka Północna"
+
+#~ msgid "South America"
+#~ msgstr "Ameryka Południowa"
+
+#~ msgid "Next"
+#~ msgstr "Dalej"
+
+#~ msgid "Quit"
+#~ msgstr "Zakończ"
+
+#~ msgid "Back"
+#~ msgstr "Cofnij"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Ostrzeżenie: Nie zdefiniowano przeglądarki"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Przesyłanie konfiguracji systemu"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Błąd w trakcie wysyłania informacji"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Wystąpił błąd w trakcie wysyłania informacji osobistych.\n"
+#~ "\n"
+#~ "Kliknij \"Dalej\", aby spróbować wysłać je ponownie."
+
+#~ msgid "Finished"
+#~ msgstr "Zakończono"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Wybierz swoje położenie geograficzne"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Anuluj"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Czy na pewno chcesz wyjść z MandrakeOnline?\n"
+#~ "Aby powrócić do Druida naciśnij \"Anuluj\",\n"
+#~ "aby opuścić program naciśnij \"Wyjdź\"."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Czy na pewno chcesz przerwać? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Zamknij"
diff --git a/po/pt.po b/po/pt.po
index 02cde6ac..daefda02 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-09 01:36+0100\n"
 "Last-Translator: Fernando Ribeiro <fa.ribeiro(at)gmx.net>\n"
 "Language-Team: Portugal\n"
@@ -18,150 +18,70 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "África"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Ásia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Austrália"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "América do Norte"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "América do Sul"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Seguinte"
+#: ../mdkonline:85
+msgid "Skip Wizard"
+msgstr ""
 
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Acabar"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
+msgstr "Bem-vindo a MandrakeOnline"
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Sair"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
+msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Regressar"
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Bem-vindo a MandrakeOnline"
 
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr "Eu não tenho uma conta MandrakeOnline e quero "
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr "Inscrever-me"
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Sim desejo instalar as novidades automáticamente"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Saindo de Assistente\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr ""
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Problema na ligação"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Identificador:"
 
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problema na ligação"
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Senha:"
 
-#: ../mdkonline:282 ../mdkonline:347
+#: ../mdkonline:109
 #, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"MandrakeUpdate não conseguiu contactar o servidor, vai tentar outra vez."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Senha errada"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
-msgstr "Bem-vindo a MandrakeOnline"
+msgid "Confirm Password:"
+msgstr "Senha:"
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Regras de privacidade Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "Escreva o seu identificador MandrakeOnline, a senha e o nome da máquina:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Identificador:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Senha:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Enviando a sua Configuração"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -181,135 +101,145 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Erro ao enviar as informações"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Acabou"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 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 ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "O seu envio conseguiu!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Escolha a sua situação geográfica"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Sim desejo instalar as novidades automáticamente"
+
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "A ler a configuração\n"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Anular"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:174
+msgid "Empty Fields"
 msgstr ""
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Sair mesmo? - MandrakeOnline"
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Acabar"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Saindo de Assistente\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Problema na ligação"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problema na ligação"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"MandrakeUpdate não conseguiu contactar o servidor, vai tentar outra vez."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Senha errada"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Fechar"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "A ler a configuração\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -371,3 +301,54 @@ msgstr "Impossível criar um média de actualização.\n"
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
 "Impossível actualizar pacotes a partir do média de actualização mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "África"
+
+#~ msgid "Asia"
+#~ msgstr "Ásia"
+
+#~ msgid "Australia"
+#~ msgstr "Austrália"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "América do Norte"
+
+#~ msgid "South America"
+#~ msgstr "América do Sul"
+
+#~ msgid "Next"
+#~ msgstr "Seguinte"
+
+#~ msgid "Quit"
+#~ msgstr "Sair"
+
+#~ msgid "Back"
+#~ msgstr "Regressar"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Enviando a sua Configuração"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Erro ao enviar as informações"
+
+#~ msgid "Finished"
+#~ msgstr "Acabou"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Escolha a sua situação geográfica"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Anular"
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Sair mesmo? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Fechar"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 73db24c8..51a214eb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-19 17:46-0300\n"
 "Last-Translator: Andrei Bosco Bezerra Torres <andrei_bosco@yahoo.com.br>\n"
 "Language-Team: Português Brasileiro <linux_pt_BR@yahoogrupos.com.br>\n"
@@ -16,116 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "África"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Ásia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Austrália"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "América do Norte"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "América do Sul"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Próximo"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Fim"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Sair"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Voltar"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Eu não tenho uma conta MandrakeOnLine e desejo abrir uma"
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Subscrever"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Sim, eu desejo atualizações automáticas"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Saindo do assistente\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Espelho vazio"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "Espelho vazio. Por favor, escolha um local"
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Aviso: Nenhum browser especificado"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Conectando ...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problema de conexão"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"MandrakeOnline não pôde ser contactado, por favor tente novamente mais tarde."
 
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Senha incorreta"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Seu login ou senha estão errados \n"
-" Você terá que digitá-los novamente ou criar uma conta no MandrakeOnLine, \n"
-" nesse caso, volte ao passo inicial para se conectar ao MandrakeOnLine.\n"
-" Será necessário fornecer um nome da máquina \n"
-" (somente caracteres afabéticos são permitidos)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "Enviando configuração..."
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Benvindo ao MandrakeOnLine."
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -138,35 +37,53 @@ msgstr ""
 "de dados centralizada com o intuito de mantê-lo informado sobre\n"
 "atualizações de segurança e melhorias úteis.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Benvindo ao MandrakeOnLine."
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Eu não tenho uma conta MandrakeOnLine e desejo abrir uma"
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Subscrever"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Login: "
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Senha:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Senha:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Política de Privacidade Mandrake."
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Autenticação"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Digite seu login do MandrakeOnLine, senha e o nome da máquina: "
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Login: "
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Nome da máquina:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Senha:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Enviando sua configuração"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -201,25 +118,7 @@ msgstr ""
 "Também um email com o seu nome de usuário@mandrakeonline.net \n"
 "será criado para você."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Erro enquanto enviava informações."
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Houve um erro enquanto enviava suas informações pessoais.\n"
-"\n"
-"Clique em 'próximo' para tentar novamente."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Fim"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -227,7 +126,7 @@ msgstr ""
 "A partir de agora você receberá atualizações sobre segurança\n"
 "anúncios da MandrakeOnLine."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -236,164 +135,136 @@ msgstr ""
 "atualizações. Um programa instalado no seu sistema verificará\n"
 "regularmente as novas atualizações.\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "O envio teve êxito."
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "Atualizações automáticas."
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Escolha sua região geográfica."
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Sim, eu desejo atualizações automáticas"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Lendo configuração\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Cancelar"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:174
+msgid "Empty Fields"
 msgstr ""
-"Você deseja mesmo concelar MandrakeOnLine?\n"
-"Para retornar ao assistente, clique em 'Cancelar',\n"
-"para sair, clique em 'Sair'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Você deseja realmente sair? - MandrakeOnLine."
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
-" Você está iniciando pela primeira vez a versão Mandrake Linux Download "
-"Edition e Livre. \n"
-"\n"
-"São mais de três milhões de usuários Mandrake Linux em todo o mundo!\n"
-"\n"
-"Por favor, utilize alguns segundos para responder um pequeno formulário.\n"
-"Os dados serão usados somente para estudos agregados de mercado.\n"
-"O texto abaixo é a política de privacidade da MandrakeSoft sobre seus dados "
-"pessoais."
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Fim"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Saindo do assistente\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Conectando ...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problema de conexão"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"MandrakeOnline não pôde ser contactado, por favor tente novamente mais tarde."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Senha incorreta"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
-"Quais dados pessoais nós coletamos ?         \n"
-"                               \n"
-"Várias informações são coletadas em diferentes áreas do site web;\n"
-"e o que segue abaixo é uma visão geral do que mantemos:\n"
-"\n"
-"Primeiro, gravamos seu e-mail, nome e endereço postal.\n"
-"Após identificamos você com um número único de cliente (ID). Usamos esse\n"
-"ID para identificar informação adicional relacionada à sua conta Mandrake:\n"
-"    - Suas assinaturas em listas de e-mail.\n"
-"    - Quando registrar a aquisição de um produto, pediremos suas\n"
-"informações como detalhes de sistema/hardware para que possamos prover\n"
-"os melhores serviços de suporte, adequados às suas necessidades.\n"
-"    - Em nossa página de contribuições ou em nossa loja online\n"
-"(MandrakeStore), gravamos dados para o faturamento (não gravamos\n"
-"qualquer dado de cartão de crédito).\n"
-"    \n"
-"O que fazemos com essas informações?\n"
-"\n"
-"Nunca compartilhamos dados pessoais com outras orgganizações ou pessoas -\n"
-"nós usamos esses dados estritamente para:\n"
-"    - Se você assinar uma lista de e-mails, mantemos seu endereço de\n"
-"em nossa base de dados para fornecer a informação solicitada e/ou\n"
-"para permitir que você participe nas discussões das várias listas que\n"
-"assinar. Se você enviar mensagens para uma lista, os assinantes verão\n"
-"seu email; mas ninguém externamente terá acesso à nossa base de dados\n"
-"de assinantes. A qualquer tempo você pode sair de qualquer de nossas\n"
-"lista utilizando o formulário apropriado.\n"
-"    - Se você informar dados ao registar a aquisição de um produto para\n"
-"receber suporte, mantemos esta informação confidencial a menos que a\n"
-"informação seja requerida pora que um de nossos parceiros possa entregar\n"
-"o suporte que você solicitar.\n"
-"    - Se você usar a MandrakeStore, usamos seu ID de cliente para\n"
-"registrar sua compra e entregar seus produtos.\n"
-"    - Se você informar dados para nosso marketing, mantemos somente para\n"
-"o uso interno com o intuito de melhorar nossos produtos e que possamos\n"
-"ajustá-los às suas necessidades (quer você compre um produto ou não)\n"
-"\n"
-"Como mudar/corrigir seus dados pessoais?\n"
-"A lei francesa dá aos indivíduos o direito de  alcançar, corrigir,\n"
-"modificar ou remover seus dados pessoais que acaso tenhamos registro.\n"
-"Nós oferecemos isto como um privilégio mundial.  Você pode exercer este\n"
-"direito, editando ou removendo seus dados, em qualquer lugar que tenha se\n"
-"registrado ou informado seu ID de cliente. Para isso, basta você acessar\n"
-"esta página:  http://www.mandrakeonline.net"
-
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
-
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Fechar"
+"Seu login ou senha estão errados \n"
+" Você terá que digitá-los novamente ou criar uma conta no MandrakeOnLine, \n"
+" nesse caso, volte ao passo inicial para se conectar ao MandrakeOnLine.\n"
+" Será necessário fornecer um nome da máquina \n"
+" (somente caracteres afabéticos são permitidos)"
+
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Enviando configuração..."
+
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Lendo configuração\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -454,3 +325,199 @@ msgstr "Incapaz de criar a mídia mdkupdate\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Incapaz de atualizar os pacotes a partir da mídia mdkupdate\n"
+
+#~ msgid "Africa"
+#~ msgstr "África"
+
+#~ msgid "Asia"
+#~ msgstr "Ásia"
+
+#~ msgid "Australia"
+#~ msgstr "Austrália"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "América do Norte"
+
+#~ msgid "South America"
+#~ msgstr "América do Sul"
+
+#~ msgid "Next"
+#~ msgstr "Próximo"
+
+#~ msgid "Quit"
+#~ msgstr "Sair"
+
+#~ msgid "Back"
+#~ msgstr "Voltar"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Espelho vazio"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "Espelho vazio. Por favor, escolha um local"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Aviso: Nenhum browser especificado"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Enviando sua configuração"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Erro enquanto enviava informações."
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Houve um erro enquanto enviava suas informações pessoais.\n"
+#~ "\n"
+#~ "Clique em 'próximo' para tentar novamente."
+
+#~ msgid "Finished"
+#~ msgstr "Fim"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Escolha sua região geográfica."
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Você deseja mesmo concelar MandrakeOnLine?\n"
+#~ "Para retornar ao assistente, clique em 'Cancelar',\n"
+#~ "para sair, clique em 'Sair'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Você deseja realmente sair? - MandrakeOnLine."
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ " Você está iniciando pela primeira vez a versão Mandrake Linux Download "
+#~ "Edition e Livre. \n"
+#~ "\n"
+#~ "São mais de três milhões de usuários Mandrake Linux em todo o mundo!\n"
+#~ "\n"
+#~ "Por favor, utilize alguns segundos para responder um pequeno formulário.\n"
+#~ "Os dados serão usados somente para estudos agregados de mercado.\n"
+#~ "O texto abaixo é a política de privacidade da MandrakeSoft sobre seus "
+#~ "dados pessoais."
+
+#~ msgid ""
+#~ "What personal data do we collect ?         \n"
+#~ "                               \n"
+#~ "Various information is collected in different areas of the website;\n"
+#~ "what follows is an overview of the data we keep:\n"
+#~ "\n"
+#~ "Firstly, we record your email address, name and postal address.\n"
+#~ "Secondly we give you a unique customer ID. This ID will be used to \n"
+#~ "add additional information related to your Mandrake account such as:\n"
+#~ "    - Your subscription to mailling lists.\n"
+#~ "    - When registering a purchased product, we ask for personal\n"
+#~ "information as well as system/hardware details so that we may deliver\n"
+#~ "the best support services customized to your needs.\n"
+#~ "    - On our donation page and on our online store (MandrakeStore), we\n"
+#~ "record data for billing purpose (we do not store any credit card data).\n"
+#~ "    \n"
+#~ "What do we do with this information?\n"
+#~ "\n"
+#~ "We never share personal information with other persons or companies -\n"
+#~ "we use this data strictly for the following purposes:\n"
+#~ "    - If you have subscribed to a mailing list, we keep this email\n"
+#~ "address in our database to provide you with customized information\n"
+#~ "and/or to enable you to participate in discussions in various mailing\n"
+#~ "lists. If you send a message to such a list, other people will see\n"
+#~ "your email address but no external parties have access to our database\n"
+#~ "of subscribers. At any time you may unsubscribe to any list by using\n"
+#~ "the appropriate form.\n"
+#~ "    - If you provide information when registering a purchased product\n"
+#~ "to receive support, we keep this information private unless the\n"
+#~ "information is required by one of our partners to deliver the support\n"
+#~ "you require.\n"
+#~ "    - If you use MandrakeStore, we also use your Customer ID to track\n"
+#~ "your order and deliver your products.\n"
+#~ "    - If you provide us with marketing information, we keep it for \n"
+#~ "internal use only in order to improve our products so that they can \n"
+#~ "better fit your needs whether you have purchased a product or not.), How "
+#~ "to change / correct your personal data?\n"
+#~ "\n"
+#~ "French law gives individuals the right to access, correct, modify or \n"
+#~ "remove their own personal data that we have on record. We offer this \n"
+#~ "as a worldwide privilege. You may execute this right at any time by \n"
+#~ "logging to your account with your customer ID and editing your\n"
+#~ "personnal data. You can log on to this page: http://www.mandrakeonline.net"
+#~ msgstr ""
+#~ "Quais dados pessoais nós coletamos ?         \n"
+#~ "                               \n"
+#~ "Várias informações são coletadas em diferentes áreas do site web;\n"
+#~ "e o que segue abaixo é uma visão geral do que mantemos:\n"
+#~ "\n"
+#~ "Primeiro, gravamos seu e-mail, nome e endereço postal.\n"
+#~ "Após identificamos você com um número único de cliente (ID). Usamos esse\n"
+#~ "ID para identificar informação adicional relacionada à sua conta "
+#~ "Mandrake:\n"
+#~ "    - Suas assinaturas em listas de e-mail.\n"
+#~ "    - Quando registrar a aquisição de um produto, pediremos suas\n"
+#~ "informações como detalhes de sistema/hardware para que possamos prover\n"
+#~ "os melhores serviços de suporte, adequados às suas necessidades.\n"
+#~ "    - Em nossa página de contribuições ou em nossa loja online\n"
+#~ "(MandrakeStore), gravamos dados para o faturamento (não gravamos\n"
+#~ "qualquer dado de cartão de crédito).\n"
+#~ "    \n"
+#~ "O que fazemos com essas informações?\n"
+#~ "\n"
+#~ "Nunca compartilhamos dados pessoais com outras orgganizações ou pessoas "
+#~ "-\n"
+#~ "nós usamos esses dados estritamente para:\n"
+#~ "    - Se você assinar uma lista de e-mails, mantemos seu endereço de\n"
+#~ "em nossa base de dados para fornecer a informação solicitada e/ou\n"
+#~ "para permitir que você participe nas discussões das várias listas que\n"
+#~ "assinar. Se você enviar mensagens para uma lista, os assinantes verão\n"
+#~ "seu email; mas ninguém externamente terá acesso à nossa base de dados\n"
+#~ "de assinantes. A qualquer tempo você pode sair de qualquer de nossas\n"
+#~ "lista utilizando o formulário apropriado.\n"
+#~ "    - Se você informar dados ao registar a aquisição de um produto para\n"
+#~ "receber suporte, mantemos esta informação confidencial a menos que a\n"
+#~ "informação seja requerida pora que um de nossos parceiros possa entregar\n"
+#~ "o suporte que você solicitar.\n"
+#~ "    - Se você usar a MandrakeStore, usamos seu ID de cliente para\n"
+#~ "registrar sua compra e entregar seus produtos.\n"
+#~ "    - Se você informar dados para nosso marketing, mantemos somente para\n"
+#~ "o uso interno com o intuito de melhorar nossos produtos e que possamos\n"
+#~ "ajustá-los às suas necessidades (quer você compre um produto ou não)\n"
+#~ "\n"
+#~ "Como mudar/corrigir seus dados pessoais?\n"
+#~ "A lei francesa dá aos indivíduos o direito de  alcançar, corrigir,\n"
+#~ "modificar ou remover seus dados pessoais que acaso tenhamos registro.\n"
+#~ "Nós oferecemos isto como um privilégio mundial.  Você pode exercer este\n"
+#~ "direito, editando ou removendo seus dados, em qualquer lugar que tenha "
+#~ "se\n"
+#~ "registrado ou informado seu ID de cliente. Para isso, basta você acessar\n"
+#~ "esta página:  http://www.mandrakeonline.net"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Fechar"
diff --git a/po/ro.po b/po/ro.po
index b4a89d77..945bfa11 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-02 14:50+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu.constantin@gmx.net>\n"
 "Language-Team: Romanian Translators for Free Software <rtfs-project@lists."
@@ -16,119 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Africa"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "America de nord"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "America de sud"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Înainte"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Terminare"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Ieşire"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Înapoi"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Nu am un cont la MandrakeOnline şi vreau să"
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Mă înscriu"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Da, doresc actualizări automate"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Terminare asistent\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Atenţie: Nici un navigator specificat"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Problemă la conectare"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problemă la conectare"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate nu a putut contacta situl, vom încerca din nou."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Parolă greşită"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Contul de utilizator sau parola au fost greşite.\n"
-" Va trebui să le tastaţi din nou, sau va trebui să creaţi un cont la "
-"MandrakeOnline.\n"
-" În acest ultim caz, mergeţi înapoi la primul pas pentru a vă conecta la "
-"MandrakeOnline.\n"
-" Va trebui de asemenea să furnizaţi un nume al maşinii \n"
-" (doar caracterele alfabetice sunt permise)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Bun venit la MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -140,36 +36,54 @@ msgstr ""
 "(pachete, configuraţie hardware) la o bază de date centralizată pentru\n"
 "a vă ţine la curent cu actualizările de securitate şi noutăţi utile.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Bun venit la MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Nu am un cont la MandrakeOnline şi vreau să"
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Mă înscriu"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Cont:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Parolă:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Parolă:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Politica de protejare a intimităţii"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "- Autentificare"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "Introduceţi contul utilizator MandrakeOnline, parola şi numele maşinii:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Cont:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Nume maşină:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Parolă:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Trimitere configuraţie"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -206,25 +120,7 @@ msgstr ""
 "În fine, un alias email cu numeutilizator@mandrakeonline.net vă va fi "
 "furnizat."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Eroare la trimiterea informaţiilor"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"A avut loc o eroare la trimiterea informaţiilor personale.\n"
-"\n"
-"Apăsaţi Înainte pentru a încerca să trimiteţi configuraţia din nou."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Terminat"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -232,7 +128,7 @@ msgstr ""
 "De acum veţi primi anunţuri despre securitare\n"
 "şi actualizări cu ajutorul MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -240,111 +136,139 @@ msgstr ""
 "MandrakeOnline vă oferă posibilitatea să automatizaţi actualizările.\n"
 "Un program va rula regulat pe sistemul dumneavoastră aşteptând actualizări\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Trimiterea a fost reuşită!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "Actualizări automate"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Alegeţi locaţia dumneavoastră geografică"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Da, doresc actualizări automate"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Citire configuraţie\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Renunţă"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
-"Chiar doriţi să părăsiţi MandrakeOnline?\n"
-"Pentru a reveni la asistent apăsaţi 'Renunţă',\n"
-"pentru a ieşi într-adevăr apăsaţi 'Ieşire'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Într-adevăr abandonaţi? - MandrakeOnline"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Terminare"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Terminare asistent\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Problemă la conectare"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problemă la conectare"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate nu a putut contacta situl, vom încerca din nou."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Parolă greşită"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Contul de utilizator sau parola au fost greşite.\n"
+" Va trebui să le tastaţi din nou, sau va trebui să creaţi un cont la "
+"MandrakeOnline.\n"
+" În acest ultim caz, mergeţi înapoi la primul pas pentru a vă conecta la "
+"MandrakeOnline.\n"
+" Va trebui de asemenea să furnizaţi un nume al maşinii \n"
+" (doar caracterele alfabetice sunt permise)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Închide"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Citire configuraţie\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -405,3 +329,75 @@ msgstr "Nu pot crea mediul mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Nu pot actualiza pachetele de pe mediul mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Africa"
+
+#~ msgid "Asia"
+#~ msgstr "Asia"
+
+#~ msgid "Australia"
+#~ msgstr "Australia"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "America de nord"
+
+#~ msgid "South America"
+#~ msgstr "America de sud"
+
+#~ msgid "Next"
+#~ msgstr "Înainte"
+
+#~ msgid "Quit"
+#~ msgstr "Ieşire"
+
+#~ msgid "Back"
+#~ msgstr "Înapoi"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Atenţie: Nici un navigator specificat"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Trimitere configuraţie"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Eroare la trimiterea informaţiilor"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "A avut loc o eroare la trimiterea informaţiilor personale.\n"
+#~ "\n"
+#~ "Apăsaţi Înainte pentru a încerca să trimiteţi configuraţia din nou."
+
+#~ msgid "Finished"
+#~ msgstr "Terminat"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Alegeţi locaţia dumneavoastră geografică"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Renunţă"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Chiar doriţi să părăsiţi MandrakeOnline?\n"
+#~ "Pentru a reveni la asistent apăsaţi 'Renunţă',\n"
+#~ "pentru a ieşi într-adevăr apăsaţi 'Ieşire'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Într-adevăr abandonaţi? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Închide"
diff --git a/po/ru.po b/po/ru.po
index 76cfd601..bea8e08c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-25 20:23+0200\n"
 "Last-Translator: Alice Lafox <alice@lafox.com.ua>\n"
 "Language-Team: russian <cooker-i18n@linux-mandrake.com >\n"
@@ -16,119 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Африка"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Азия"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Австралия"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Европа"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Северная Америка"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "ЮАР"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Дальше"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Завершить"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Выход"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Назад"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "У меня нет учетной записи MandrakeOnline и я хочу ее получить"
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Подписаться"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Да, я хочу автоматически получать обновления"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Завершения работы мастера\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Предупреждение: Не указан броузер"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Проблема соединения"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Проблема соединения"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate не может связаться с сайтом, попытаемся снова."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Неверный пароль"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Ваш логин или пароль были неверны.\n"
-"Или вы должны ввести его снова, или вам необходимо создать учетную запись в "
-"MandrakeOnline.\n"
-" В последнем случае вернитесь назад к первому шагу для соединения с "
-"MandrakeOnline.\n"
-" Обратите внимание, что вы также должны указать имя машины \n"
-" (допускаются только буквенные символы)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Добро пожаловать в MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -141,35 +37,53 @@ msgstr ""
 "чтобы держать вас в курсе при появлении обновлений по безопасности \n"
 "и полезных апгрейдов.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Добро пожаловать в MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "У меня нет учетной записи MandrakeOnline и я хочу ее получить"
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Подписаться"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Логин:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Пароль:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Пароль:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Политика безопасности Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Введите свой MandrakeOnline логин, пароль и имя машины:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Логин:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Имя машины:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Пароль:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Отправление вашей конфигурации"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -206,25 +120,7 @@ msgstr ""
 "И, наконец, вам будет предоставлен почтовый ящик с вашим именем\n"
 " на @mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Ошибка при отправлении информации"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Произошла ошибка при отправке вашей личной информации.\n"
-"\n"
-"Нажмите Дальше, чтобы попытаться снова отправить вашу конфигурацию."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Завершено"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -232,7 +128,7 @@ msgstr ""
 "С этого момента вы будете получать уведомления\n"
 "по безопасности и обновлениям, благодаря MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -241,111 +137,139 @@ msgstr ""
 "Программа будет регулярно запускаться в вашей системе, ожидая новых "
 "обновлений\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Закачка произведена успешно!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "автоматизированные апгрейды"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Выберите ваше географическое расположение"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Да, я хочу автоматически получать обновления"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Чтение конфигурации\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Отмена"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
-"Вы действительно хотите прервать MandrakeOnline?\n"
-"Чтобы вернуться в Мастер, нажмите на 'Отмену',\n"
-"чтобы действительно выйти из него, нажмите 'Выход'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Действительно прервать? - MandrakeOnline"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Завершить"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Завершения работы мастера\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Проблема соединения"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Проблема соединения"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate не может связаться с сайтом, попытаемся снова."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Неверный пароль"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Ваш логин или пароль были неверны.\n"
+"Или вы должны ввести его снова, или вам необходимо создать учетную запись в "
+"MandrakeOnline.\n"
+" В последнем случае вернитесь назад к первому шагу для соединения с "
+"MandrakeOnline.\n"
+" Обратите внимание, что вы также должны указать имя машины \n"
+" (допускаются только буквенные символы)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Закрыть"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Чтение конфигурации\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -408,3 +332,75 @@ msgstr "Невозможно создать носитель mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Невозможно обновить пакеты с носителя mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Африка"
+
+#~ msgid "Asia"
+#~ msgstr "Азия"
+
+#~ msgid "Australia"
+#~ msgstr "Австралия"
+
+#~ msgid "Europe"
+#~ msgstr "Европа"
+
+#~ msgid "North America"
+#~ msgstr "Северная Америка"
+
+#~ msgid "South America"
+#~ msgstr "ЮАР"
+
+#~ msgid "Next"
+#~ msgstr "Дальше"
+
+#~ msgid "Quit"
+#~ msgstr "Выход"
+
+#~ msgid "Back"
+#~ msgstr "Назад"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Предупреждение: Не указан броузер"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Отправление вашей конфигурации"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Ошибка при отправлении информации"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Произошла ошибка при отправке вашей личной информации.\n"
+#~ "\n"
+#~ "Нажмите Дальше, чтобы попытаться снова отправить вашу конфигурацию."
+
+#~ msgid "Finished"
+#~ msgstr "Завершено"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Выберите ваше географическое расположение"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Отмена"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Вы действительно хотите прервать MandrakeOnline?\n"
+#~ "Чтобы вернуться в Мастер, нажмите на 'Отмену',\n"
+#~ "чтобы действительно выйти из него, нажмите 'Выход'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Действительно прервать? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Закрыть"
diff --git a/po/sk.po b/po/sk.po
index 2eedcd1d..282c8c26 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-11 01:53+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandrake.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -13,117 +13,15 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Ázia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Austrália"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Európa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Severná Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Južná Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Ďalej"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Dokončiť"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Koniec"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Späť"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Nemám konto na MandrakeOnline, ale chcem ho"
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Prihlásiť"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Áno, želám si automatizovanú aktualizáciu"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Ukončujem sprievodcu\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Prázdny mirror"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "Prázdny mirror. Vyberte si prosím umiestnenie."
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Varovanie: Nie je špecifikovaný prehliadač"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Pripájanie...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problém s pripojením"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"MandrakeOnline nie je možné skontaktovať, prosím skúste to neskôr znova"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Zlé heslo"
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"Vaše prihlasovacie meno alebo heslo je nesprávne.\n"
-" Predtým ako sa ich pokúsite zadať znova, mali by ste si vytvoriť účet na "
-"MandrakeOnline.\n"
-" V opačnom prípade sa vráťte na prvý krok v pripojení k MandrakeOnline.\n"
-" Buďte si vedomí toho, že je potrebné zadať meno počítača \n"
-" (akceptované sú iba abecedné znaky)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "Zasielanie konfigurácie..."
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Vítajte v Mandrake Online"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -135,35 +33,53 @@ msgstr ""
 "(balíky, hardverová konfigurácia) do centrálnej databázy aby ste mohli\n"
 "byť informovaní o bezpečnostných aktualizáciách a zaujímavých balíkoch.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Vítajte v Mandrake Online"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Nemám konto na MandrakeOnline, ale chcem ho"
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Prihlásiť"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Prihlasovacie meno:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Heslo:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Heslo:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Bezpečnostná politika Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Authentikácia"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Zadajte vaše prihlasovacie meno, heslo a názov počítača:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Prihlasovacie meno:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Meno počítača:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Heslo:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Zasiela sa vaša konfigurácia"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -199,25 +115,7 @@ msgstr ""
 "www.mandrakeexpert.com.\n"
 "Nakoniec, môžete získať emailový alias meno@mandrakeonline.net."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Počas zasielania informácií nastala chyba"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Vykytla sa chyba pri zasielaní vašich osobných informácií.\n"
-"\n"
-"Kliknite na Ďalej a pokúste sa odoslať vašu konfiguráciu znova."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Úspešne ukončenie"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -225,7 +123,7 @@ msgstr ""
 "Odteraz budete môcť získavať oznámenia o bezpečnostných\n"
 "a dunkčných aktualizáciách vďaka MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -233,178 +131,137 @@ msgstr ""
 "MandrakeOnline vám prináša možnosť ako vykonávať aktualizácie.\n"
 "Program môže bežať na vašom systéme a čakať na nové aktualizácie\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Zaslanie bolo úspešné!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automatické aktualizácie"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Zvoľte si vašu geografickú pozíciu"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Áno, želám si automatizovanú aktualizáciu"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Načítavanie konfigurácie\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Zrušiť"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
 msgstr ""
-"Naozaj si želáte ukončiť MandrakeOnline?\n"
-"Pre návrat k sprievodcovi kliknite na 'Zrušiť',\n"
-"ak naozaj chcete skončiť kliknite na 'Koniec'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Naozaj prerušiť? - Mandrake Online"
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
-" Spustili ste si našu voľnú Mandrake Linux download edíciu po prvý krát.\n"
-"\n"
-"Momentálne sú asi tri milóny používateľov Mandrake Linux distribúcie po "
-"celom svete!\n"
-"\n"
-"Prosíme vás, venujte pár sekúnd vypneniu krátkeho dotazníka. Údaje z tohto\n"
-"dotazníka budú použité iba pre marketingové štúdie.\n"
-"Nasledujúci text obsahuje pravidlá pre nakladanie s osobnými informáciami "
-"spoločnosťou\n"
-"MandrakeSoft."
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Dokončiť"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Ukončujem sprievodcu\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Pripájanie...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problém s pripojením"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"MandrakeOnline nie je možné skontaktovať, prosím skúste to neskôr znova"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Zlé heslo"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
-"Aké osobné údaje zbierame?         \n"
-"                               \n"
-"Na rôznych miestach websajtu sú zbierané rôzne informácie;\n"
-"nasleduje popis ktoré údaje sú uchovávané:\n"
-"\n"
-"Po prvé, zaznamenávame vašu emailovú adresu, meno a poštovú adresu.\n"
-"Po druhé, poskytujeme vám unikátne zákaznícke ID. Toto ID je možné\n"
-"použiť pri pridávaní doplňujúcich informácií pre váš Mandrake účet, ako "
-"napríklad:\n"
-"    - vaše prihlásenie do mailing listov    - ak si zaregistrujete zakúpený "
-"produkt, budeme sa od vás snažiť zistiť informácie\n"
-"ako napríklad systémové/hardvérové podrobnosti aby sme vám mohli poskytovať\n"
-"čo najlepšie služby, podľa vašich potrieb.\n"
-"    - na našej stránke pre darovanie a v našom online obchode "
-"(MandrakeStore)\n"
-"zaznamenávame platobné údaje pre potreby účtovania (neukladáme žiadne údaje\n"
-"o kreditných kartách).\n"
-"    \n"
-"Čo robíme s týmito informáciami?\n"
-"\n"
-"Nikdy nezdieľame tieto informácie s inými osobami alebo spoločnosťami -\n"
-"používame tieto údaje na na tieto striktne určené potreby:\n"
-"    - ak ste prihlásení do mailing listu, uchovávame túto adresu v našej "
-"databáze\n"
-"aby bolo možné poskytovať personalizované informácie a/alebo bolo možné "
-"povoliť\n"
-"zúčastňovanie sa na diskusiách v rôznych mailing listoch. Ak pošlete správu "
-"do\n"
-"niektorého listu, ostatní členovia listu budú vidieť vašu adresu, ale žiadne "
-"tretie\n"
-"strany nemajú prístup k našej databáze prihlásených. Kedykoľvek sa môžete "
-"odhlásiť\n"
-"použitím zodpovedajúceho formuláru na web stránkach.\n"
-"    - ak nám poskytnete určité informácie počas registrácie zakúpeného "
-"produktu\n"
-"aby ste mohli používať podporné služby, držíme tieto informácie v bezpečí, s "
-"výnimkou\n"
-"keď sú vyžadované niektorým z našich partnerov pri doručení podpory, ktorú "
-"ste žiadali.\n"
-"    - ak používate MandrakeStore, používame tiež vaše zákaznícke ID pre "
-"zisťovanie\n"
-"vašich objednávok a doručení našich produktov.\n"
-"    - ak ste nám poskytli marketingové informácie, uchovávame ich iba za "
-"účelom\n"
-"interného použitia pre zlepšenie našich produktov podľa vašich želaní.\n"
-"\n"
-"Ako zmeniť upraviť vaše osobné údaje?\n"
-"\n"
-"Francúzske právo dáva jeho požívateľom prvávo na možnosť prístupu, úprave, "
-"modifikácii\n"
-"alebo odstráneniu vašich osobných údajov ktoré sú zozbieravané. Toto "
-"ponúkame ako\n"
-"celosvetové privilégium. Môžete si uplatniť toto právo kedykoľvek sa "
-"prihlásite k vášmu\n"
-"účtu s vašim používateľským ID a upravíte si poľa želaní vaše osobné "
-"informácie. Môžete\n"
-"sa prihlásiť pomocou stránky http://www.mandrakeonline.net"
-
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
-
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Zatvoriť"
+"Vaše prihlasovacie meno alebo heslo je nesprávne.\n"
+" Predtým ako sa ich pokúsite zadať znova, mali by ste si vytvoriť účet na "
+"MandrakeOnline.\n"
+" V opačnom prípade sa vráťte na prvý krok v pripojení k MandrakeOnline.\n"
+" Buďte si vedomí toho, že je potrebné zadať meno počítača \n"
+" (akceptované sú iba abecedné znaky)"
+
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Zasielanie konfigurácie..."
+
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Načítavanie konfigurácie\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -466,3 +323,213 @@ msgstr "Nemôžem vytvoriť mdkupdate medium.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Nemôžem aktualizovať balíčky z mdkupdate média.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Ázia"
+
+#~ msgid "Australia"
+#~ msgstr "Austrália"
+
+#~ msgid "Europe"
+#~ msgstr "Európa"
+
+#~ msgid "North America"
+#~ msgstr "Severná Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Južná Amerika"
+
+#~ msgid "Next"
+#~ msgstr "Ďalej"
+
+#~ msgid "Quit"
+#~ msgstr "Koniec"
+
+#~ msgid "Back"
+#~ msgstr "Späť"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Prázdny mirror"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "Prázdny mirror. Vyberte si prosím umiestnenie."
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Varovanie: Nie je špecifikovaný prehliadač"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Zasiela sa vaša konfigurácia"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Počas zasielania informácií nastala chyba"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Vykytla sa chyba pri zasielaní vašich osobných informácií.\n"
+#~ "\n"
+#~ "Kliknite na Ďalej a pokúste sa odoslať vašu konfiguráciu znova."
+
+#~ msgid "Finished"
+#~ msgstr "Úspešne ukončenie"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Zvoľte si vašu geografickú pozíciu"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Zrušiť"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Naozaj si želáte ukončiť MandrakeOnline?\n"
+#~ "Pre návrat k sprievodcovi kliknite na 'Zrušiť',\n"
+#~ "ak naozaj chcete skončiť kliknite na 'Koniec'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Naozaj prerušiť? - Mandrake Online"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ " Spustili ste si našu voľnú Mandrake Linux download edíciu po prvý krát.\n"
+#~ "\n"
+#~ "Momentálne sú asi tri milóny používateľov Mandrake Linux distribúcie po "
+#~ "celom svete!\n"
+#~ "\n"
+#~ "Prosíme vás, venujte pár sekúnd vypneniu krátkeho dotazníka. Údaje z "
+#~ "tohto\n"
+#~ "dotazníka budú použité iba pre marketingové štúdie.\n"
+#~ "Nasledujúci text obsahuje pravidlá pre nakladanie s osobnými informáciami "
+#~ "spoločnosťou\n"
+#~ "MandrakeSoft."
+
+#~ msgid ""
+#~ "What personal data do we collect ?         \n"
+#~ "                               \n"
+#~ "Various information is collected in different areas of the website;\n"
+#~ "what follows is an overview of the data we keep:\n"
+#~ "\n"
+#~ "Firstly, we record your email address, name and postal address.\n"
+#~ "Secondly we give you a unique customer ID. This ID will be used to \n"
+#~ "add additional information related to your Mandrake account such as:\n"
+#~ "    - Your subscription to mailling lists.\n"
+#~ "    - When registering a purchased product, we ask for personal\n"
+#~ "information as well as system/hardware details so that we may deliver\n"
+#~ "the best support services customized to your needs.\n"
+#~ "    - On our donation page and on our online store (MandrakeStore), we\n"
+#~ "record data for billing purpose (we do not store any credit card data).\n"
+#~ "    \n"
+#~ "What do we do with this information?\n"
+#~ "\n"
+#~ "We never share personal information with other persons or companies -\n"
+#~ "we use this data strictly for the following purposes:\n"
+#~ "    - If you have subscribed to a mailing list, we keep this email\n"
+#~ "address in our database to provide you with customized information\n"
+#~ "and/or to enable you to participate in discussions in various mailing\n"
+#~ "lists. If you send a message to such a list, other people will see\n"
+#~ "your email address but no external parties have access to our database\n"
+#~ "of subscribers. At any time you may unsubscribe to any list by using\n"
+#~ "the appropriate form.\n"
+#~ "    - If you provide information when registering a purchased product\n"
+#~ "to receive support, we keep this information private unless the\n"
+#~ "information is required by one of our partners to deliver the support\n"
+#~ "you require.\n"
+#~ "    - If you use MandrakeStore, we also use your Customer ID to track\n"
+#~ "your order and deliver your products.\n"
+#~ "    - If you provide us with marketing information, we keep it for \n"
+#~ "internal use only in order to improve our products so that they can \n"
+#~ "better fit your needs whether you have purchased a product or not.), How "
+#~ "to change / correct your personal data?\n"
+#~ "\n"
+#~ "French law gives individuals the right to access, correct, modify or \n"
+#~ "remove their own personal data that we have on record. We offer this \n"
+#~ "as a worldwide privilege. You may execute this right at any time by \n"
+#~ "logging to your account with your customer ID and editing your\n"
+#~ "personnal data. You can log on to this page: http://www.mandrakeonline.net"
+#~ msgstr ""
+#~ "Aké osobné údaje zbierame?         \n"
+#~ "                               \n"
+#~ "Na rôznych miestach websajtu sú zbierané rôzne informácie;\n"
+#~ "nasleduje popis ktoré údaje sú uchovávané:\n"
+#~ "\n"
+#~ "Po prvé, zaznamenávame vašu emailovú adresu, meno a poštovú adresu.\n"
+#~ "Po druhé, poskytujeme vám unikátne zákaznícke ID. Toto ID je možné\n"
+#~ "použiť pri pridávaní doplňujúcich informácií pre váš Mandrake účet, ako "
+#~ "napríklad:\n"
+#~ "    - vaše prihlásenie do mailing listov    - ak si zaregistrujete "
+#~ "zakúpený produkt, budeme sa od vás snažiť zistiť informácie\n"
+#~ "ako napríklad systémové/hardvérové podrobnosti aby sme vám mohli "
+#~ "poskytovať\n"
+#~ "čo najlepšie služby, podľa vašich potrieb.\n"
+#~ "    - na našej stránke pre darovanie a v našom online obchode "
+#~ "(MandrakeStore)\n"
+#~ "zaznamenávame platobné údaje pre potreby účtovania (neukladáme žiadne "
+#~ "údaje\n"
+#~ "o kreditných kartách).\n"
+#~ "    \n"
+#~ "Čo robíme s týmito informáciami?\n"
+#~ "\n"
+#~ "Nikdy nezdieľame tieto informácie s inými osobami alebo spoločnosťami -\n"
+#~ "používame tieto údaje na na tieto striktne určené potreby:\n"
+#~ "    - ak ste prihlásení do mailing listu, uchovávame túto adresu v našej "
+#~ "databáze\n"
+#~ "aby bolo možné poskytovať personalizované informácie a/alebo bolo možné "
+#~ "povoliť\n"
+#~ "zúčastňovanie sa na diskusiách v rôznych mailing listoch. Ak pošlete "
+#~ "správu do\n"
+#~ "niektorého listu, ostatní členovia listu budú vidieť vašu adresu, ale "
+#~ "žiadne tretie\n"
+#~ "strany nemajú prístup k našej databáze prihlásených. Kedykoľvek sa môžete "
+#~ "odhlásiť\n"
+#~ "použitím zodpovedajúceho formuláru na web stránkach.\n"
+#~ "    - ak nám poskytnete určité informácie počas registrácie zakúpeného "
+#~ "produktu\n"
+#~ "aby ste mohli používať podporné služby, držíme tieto informácie v "
+#~ "bezpečí, s výnimkou\n"
+#~ "keď sú vyžadované niektorým z našich partnerov pri doručení podpory, "
+#~ "ktorú ste žiadali.\n"
+#~ "    - ak používate MandrakeStore, používame tiež vaše zákaznícke ID pre "
+#~ "zisťovanie\n"
+#~ "vašich objednávok a doručení našich produktov.\n"
+#~ "    - ak ste nám poskytli marketingové informácie, uchovávame ich iba za "
+#~ "účelom\n"
+#~ "interného použitia pre zlepšenie našich produktov podľa vašich želaní.\n"
+#~ "\n"
+#~ "Ako zmeniť upraviť vaše osobné údaje?\n"
+#~ "\n"
+#~ "Francúzske právo dáva jeho požívateľom prvávo na možnosť prístupu, "
+#~ "úprave, modifikácii\n"
+#~ "alebo odstráneniu vašich osobných údajov ktoré sú zozbieravané. Toto "
+#~ "ponúkame ako\n"
+#~ "celosvetové privilégium. Môžete si uplatniť toto právo kedykoľvek sa "
+#~ "prihlásite k vášmu\n"
+#~ "účtu s vašim používateľským ID a upravíte si poľa želaní vaše osobné "
+#~ "informácie. Môžete\n"
+#~ "sa prihlásiť pomocou stránky http://www.mandrakeonline.net"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Zatvoriť"
diff --git a/po/sl.po b/po/sl.po
index 7aafc3b7..6b8cd53b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-11 12:29+0100\n"
 "Last-Translator: Gregor Pirnaver <gregor.pirnaver@email.si>\n"
 "Language-Team: Slovenščina <lugos-slo@lugos.si>\n"
@@ -16,118 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Azija"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Avstralija"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Evropa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Severna Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Južna Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Naprej"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Končaj"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Izhod"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Nazaj"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Računa MandrakeOnline še nimam in se želim "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Prijava"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Nadgradnje želim avtomatizirati"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Zapuščam čarovnika\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Prazen zrcalni strežnik"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "Prazen zrcalni strežnik. Prosim izberite prostor."
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Pozor: brskalnik ni naveden"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Povezovanje ...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problemi pri povezavi"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"Povezovanje z MandrakeOnline je bilo neuspešno, prosim poskusite kasneje"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Napačno geslo"
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"Uporabniško ime ali geslo je bilo napačno.\n"
-" Poskusite oboje vtipkati ponovno ali pa ustvarite nov račun "
-"MandrakeOnline.\n"
-" Če želite slednje, pojdite nazaj na prvi korak za povezavo z "
-"MandrakeOnline.\n"
-" Zavedajte se, da morate vnesti tudi ime računalnika\n"
-" (samo črke so sprejete)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "Pošiljanje nastavitev ..."
 
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "POzdravljeni v MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -139,36 +36,54 @@ msgstr ""
 "(paketov, sestava strojne opreme) v centralno bazo, tako da boste\n"
 "obveščeni o varnostnih in drugih uporabnih nadgradnjah.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "POzdravljeni v MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Računa MandrakeOnline še nimam in se želim "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Prijava"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Uporabnik:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Geslo:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Geslo:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake pravilo zasebosti"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Prijava v sistem"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "Vnesite vaše MandrakeOnline uporabniško ime in geslo ter ime računalnika:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Uporabnik:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Ime računalnika:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Geslo:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Pošiljanje vaših nastavitev"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -204,25 +119,7 @@ msgstr ""
 "Nenazadnje, dodelljen ti bo elektronski naslov s tvojim "
 "uporabniškimimenom@mandrakeonline.net. "
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Napaka pri pošiljanju informacij"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Med pošiljanjem vaših osebnih nastavitev se je pojavila napaka.\n"
-"\n"
-"Pritisnite naprej, če želite poskusiti poslati nastavitve še enkrat."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Končano"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -230,7 +127,7 @@ msgstr ""
 "Od zdaj naprej boš prejemal varnostna\n"
 "in druga obvestila o nadgrajevanju zahvaljujoč MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -238,164 +135,138 @@ msgstr ""
 "MandrakeOnline ti omogoča, da avtomatiziraš nadgradnje.\n"
 "Program bo tekel redno v vašem sistemu čakajoč na nove nadgradnje\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Pošiljanje je bilo uspešno!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "avtomatiziranje Nadgradnje"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Izberi svojo geografsko lokacijo"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Nadgradnje želim avtomatizirati"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Berem nastavitve\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "V redu"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Prekliči"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
 msgstr ""
-"Res hočeš prekiniti MandrakeOnline?\n"
-"Če se hočeš vrnitni do čarovnika pritisni 'Prekliči',\n"
-"če pa hočeš zares končati pritisni 'Končaj'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Resnično prekini? - MandrakeOnline"
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
-"Prvič zaganjate prosto distribucijo Mandrake Linux Download Edition.\n"
-"\n"
-"Po vsem svetu je zdaj že več kot tri milijione uporabnikov Mandrake Linuxa!\n"
-"\n"
-"Prosim vzemite si nekaj sekund, da izpolnete kratek vprašalnik. Podatki iz\n"
-"tega vprašalnika bodo uporabljeni le za splošne tržne raziskave.\n"
-"Spodaj lahko preberete MandrakeSoftovo politiko zasebnosti o vaših osebnih "
-"podatkih."
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Končaj"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Zapuščam čarovnika\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Povezovanje ...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problemi pri povezavi"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"Povezovanje z MandrakeOnline je bilo neuspešno, prosim poskusite kasneje"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Napačno geslo"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
-"Katere osebne podatke zbiramo?         \n"
-"                               \n"
-"Na različnih delih spletne strani zbiramo razne podatke;\n"
-"sledi pregled podatkov, ki jih hranimo:\n"
-"\n"
-"Najprej shranimo epoštni naslov, ime in naslov.\n"
-"Nadalje vam dodelimo edinstveno številko kupca ID. Ta ID bo uporabljen\n"
-"za dodajanje dodatnih podatkov o vašem računu Mandrake, kot so:\n"
-"    - Vaše prijave na poštne sezname.\n"
-"    - Ko registrirate kupljen izdelek, vas vprašamo po osebnih podatkih,\n"
-"kot tudi po programski in strojni opremi, tako da vam lahko nudimo\n"
-"najboljše podporne storitve prilagojene vašim potrebam.\n"
-"    - Na naši strani za donacije in v naši internetni trgovini "
-"(MandrakeStore)\n"
-"shranimo podatke za zaračunavanje (podatkov o kreditni kartici ne hranimo).\n"
-"    \n"
-"Kaj naredimo s temi podatki?\n"
-"\n"
-"Nikoli ne delimo osebnih podatkov z drugimi osebami ali podjetji -\n"
-"te podatke uporabljamo izključno za naslednje namene:\n"
-"    - Če ste se prijavili na poštni seznam, obdržimo ta poštni\n"
-"naslov v naši bazi, da vam lahko nudimo vam prilagojene podatke\n"
-"in/ali vam omogočimo, da sodelujete v raznih poštnih seznamih za\n"
-"razpravo. Če pošljete sporočilo na tak seznam, bodo drugi ljudje videli\n"
-"vaš epoštni naslov, toda nihče od zunaj nima dostopa do naše baze\n"
-"prijavljenih. Kadarkoli se lahko s pomočjo ustreznega spletnega\n"
-"obrazca odjavite s kateregakoli seznama\n"
-".\n"
-"    - Če podatke podatke, ko registrirate kupljen izdelek, da bi prejeli\n"
-"tehnično podporo, hranimo podatke v zasebnosti, razen v preimeru, ko\n"
-"podatke potrebujejo naši partnerji, da vam lahko nudijo pomoč,\n"
-"ki jo terjate.\n"
-"    - Če uporabljate MandrakeStore, uporabimo vašo številko kupca ID, da\n"
-"sledimo vašemu naročilu in dostavimo izdelke.\n"
-"    - Če nam podate podatke za trženje, jih obdžimo le za interno\n"
-"uporabo, da lahko izboljšamo naše izdelke, tako da bolje\n"
-"ustrezajo vašim potrebam, ne glede, ali ste kupili izdelek, ali ne.),\n"
-"\n"
-"Kako lahko spremenite / popravite vaše osebne podatke?\n"
-"\n"
-"Francoski zakon daje posamezniku pravico do dostopanja, popravljanja,\n"
-"spreminjanja in brisanja njihovih lastnih podatkov, ki so shranjeni. To\n"
-"možnost ponujamo vsem po svetu. Pravico lahko izvršite kadarkoli, tako da\n"
-"se prijavite v vaš račun z vašo številko kupca ID in uredite vaše osebne \n"
-"podatke. Lahko se prijavite na tej strani: http://www.mandrakeonline.net"
+"Uporabniško ime ali geslo je bilo napačno.\n"
+" Poskusite oboje vtipkati ponovno ali pa ustvarite nov račun "
+"MandrakeOnline.\n"
+" Če želite slednje, pojdite nazaj na prvi korak za povezavo z "
+"MandrakeOnline.\n"
+" Zavedajte se, da morate vnesti tudi ime računalnika\n"
+" (samo črke so sprejete)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Pošiljanje nastavitev ..."
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Zapri"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Berem nastavitve\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -454,3 +325,201 @@ msgstr "Ni mogoče ustvariti mdkupdate medija.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Ni mogoče obnoviti paketov z mdkupdate medija.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Azija"
+
+#~ msgid "Australia"
+#~ msgstr "Avstralija"
+
+#~ msgid "Europe"
+#~ msgstr "Evropa"
+
+#~ msgid "North America"
+#~ msgstr "Severna Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Južna Amerika"
+
+#~ msgid "Next"
+#~ msgstr "Naprej"
+
+#~ msgid "Quit"
+#~ msgstr "Izhod"
+
+#~ msgid "Back"
+#~ msgstr "Nazaj"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Prazen zrcalni strežnik"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "Prazen zrcalni strežnik. Prosim izberite prostor."
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Pozor: brskalnik ni naveden"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Pošiljanje vaših nastavitev"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Napaka pri pošiljanju informacij"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Med pošiljanjem vaših osebnih nastavitev se je pojavila napaka.\n"
+#~ "\n"
+#~ "Pritisnite naprej, če želite poskusiti poslati nastavitve še enkrat."
+
+#~ msgid "Finished"
+#~ msgstr "Končano"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Izberi svojo geografsko lokacijo"
+
+#~ msgid "OK"
+#~ msgstr "V redu"
+
+#~ msgid "Cancel"
+#~ msgstr "Prekliči"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Res hočeš prekiniti MandrakeOnline?\n"
+#~ "Če se hočeš vrnitni do čarovnika pritisni 'Prekliči',\n"
+#~ "če pa hočeš zares končati pritisni 'Končaj'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Resnično prekini? - MandrakeOnline"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ "Prvič zaganjate prosto distribucijo Mandrake Linux Download Edition.\n"
+#~ "\n"
+#~ "Po vsem svetu je zdaj že več kot tri milijione uporabnikov Mandrake "
+#~ "Linuxa!\n"
+#~ "\n"
+#~ "Prosim vzemite si nekaj sekund, da izpolnete kratek vprašalnik. Podatki "
+#~ "iz\n"
+#~ "tega vprašalnika bodo uporabljeni le za splošne tržne raziskave.\n"
+#~ "Spodaj lahko preberete MandrakeSoftovo politiko zasebnosti o vaših "
+#~ "osebnih podatkih."
+
+#~ msgid ""
+#~ "What personal data do we collect ?         \n"
+#~ "                               \n"
+#~ "Various information is collected in different areas of the website;\n"
+#~ "what follows is an overview of the data we keep:\n"
+#~ "\n"
+#~ "Firstly, we record your email address, name and postal address.\n"
+#~ "Secondly we give you a unique customer ID. This ID will be used to \n"
+#~ "add additional information related to your Mandrake account such as:\n"
+#~ "    - Your subscription to mailling lists.\n"
+#~ "    - When registering a purchased product, we ask for personal\n"
+#~ "information as well as system/hardware details so that we may deliver\n"
+#~ "the best support services customized to your needs.\n"
+#~ "    - On our donation page and on our online store (MandrakeStore), we\n"
+#~ "record data for billing purpose (we do not store any credit card data).\n"
+#~ "    \n"
+#~ "What do we do with this information?\n"
+#~ "\n"
+#~ "We never share personal information with other persons or companies -\n"
+#~ "we use this data strictly for the following purposes:\n"
+#~ "    - If you have subscribed to a mailing list, we keep this email\n"
+#~ "address in our database to provide you with customized information\n"
+#~ "and/or to enable you to participate in discussions in various mailing\n"
+#~ "lists. If you send a message to such a list, other people will see\n"
+#~ "your email address but no external parties have access to our database\n"
+#~ "of subscribers. At any time you may unsubscribe to any list by using\n"
+#~ "the appropriate form.\n"
+#~ "    - If you provide information when registering a purchased product\n"
+#~ "to receive support, we keep this information private unless the\n"
+#~ "information is required by one of our partners to deliver the support\n"
+#~ "you require.\n"
+#~ "    - If you use MandrakeStore, we also use your Customer ID to track\n"
+#~ "your order and deliver your products.\n"
+#~ "    - If you provide us with marketing information, we keep it for \n"
+#~ "internal use only in order to improve our products so that they can \n"
+#~ "better fit your needs whether you have purchased a product or not.), How "
+#~ "to change / correct your personal data?\n"
+#~ "\n"
+#~ "French law gives individuals the right to access, correct, modify or \n"
+#~ "remove their own personal data that we have on record. We offer this \n"
+#~ "as a worldwide privilege. You may execute this right at any time by \n"
+#~ "logging to your account with your customer ID and editing your\n"
+#~ "personnal data. You can log on to this page: http://www.mandrakeonline.net"
+#~ msgstr ""
+#~ "Katere osebne podatke zbiramo?         \n"
+#~ "                               \n"
+#~ "Na različnih delih spletne strani zbiramo razne podatke;\n"
+#~ "sledi pregled podatkov, ki jih hranimo:\n"
+#~ "\n"
+#~ "Najprej shranimo epoštni naslov, ime in naslov.\n"
+#~ "Nadalje vam dodelimo edinstveno številko kupca ID. Ta ID bo uporabljen\n"
+#~ "za dodajanje dodatnih podatkov o vašem računu Mandrake, kot so:\n"
+#~ "    - Vaše prijave na poštne sezname.\n"
+#~ "    - Ko registrirate kupljen izdelek, vas vprašamo po osebnih podatkih,\n"
+#~ "kot tudi po programski in strojni opremi, tako da vam lahko nudimo\n"
+#~ "najboljše podporne storitve prilagojene vašim potrebam.\n"
+#~ "    - Na naši strani za donacije in v naši internetni trgovini "
+#~ "(MandrakeStore)\n"
+#~ "shranimo podatke za zaračunavanje (podatkov o kreditni kartici ne "
+#~ "hranimo).\n"
+#~ "    \n"
+#~ "Kaj naredimo s temi podatki?\n"
+#~ "\n"
+#~ "Nikoli ne delimo osebnih podatkov z drugimi osebami ali podjetji -\n"
+#~ "te podatke uporabljamo izključno za naslednje namene:\n"
+#~ "    - Če ste se prijavili na poštni seznam, obdržimo ta poštni\n"
+#~ "naslov v naši bazi, da vam lahko nudimo vam prilagojene podatke\n"
+#~ "in/ali vam omogočimo, da sodelujete v raznih poštnih seznamih za\n"
+#~ "razpravo. Če pošljete sporočilo na tak seznam, bodo drugi ljudje videli\n"
+#~ "vaš epoštni naslov, toda nihče od zunaj nima dostopa do naše baze\n"
+#~ "prijavljenih. Kadarkoli se lahko s pomočjo ustreznega spletnega\n"
+#~ "obrazca odjavite s kateregakoli seznama\n"
+#~ ".\n"
+#~ "    - Če podatke podatke, ko registrirate kupljen izdelek, da bi prejeli\n"
+#~ "tehnično podporo, hranimo podatke v zasebnosti, razen v preimeru, ko\n"
+#~ "podatke potrebujejo naši partnerji, da vam lahko nudijo pomoč,\n"
+#~ "ki jo terjate.\n"
+#~ "    - Če uporabljate MandrakeStore, uporabimo vašo številko kupca ID, da\n"
+#~ "sledimo vašemu naročilu in dostavimo izdelke.\n"
+#~ "    - Če nam podate podatke za trženje, jih obdžimo le za interno\n"
+#~ "uporabo, da lahko izboljšamo naše izdelke, tako da bolje\n"
+#~ "ustrezajo vašim potrebam, ne glede, ali ste kupili izdelek, ali ne.),\n"
+#~ "\n"
+#~ "Kako lahko spremenite / popravite vaše osebne podatke?\n"
+#~ "\n"
+#~ "Francoski zakon daje posamezniku pravico do dostopanja, popravljanja,\n"
+#~ "spreminjanja in brisanja njihovih lastnih podatkov, ki so shranjeni. To\n"
+#~ "možnost ponujamo vsem po svetu. Pravico lahko izvršite kadarkoli, tako "
+#~ "da\n"
+#~ "se prijavite v vaš račun z vašo številko kupca ID in uredite vaše "
+#~ "osebne \n"
+#~ "podatke. Lahko se prijavite na tej strani: http://www.mandrakeonline.net"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Zapri"
diff --git a/po/sq.po b/po/sq.po
index 563eb36f..c7041357 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2002-09-24 15:30+0100\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -15,120 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Azia"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australia"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Evropa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Amerika Veriore"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Amerika Jugore"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Tjetër"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Mbaro"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Dalje"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Mbrapa"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Nuk e posedon llogarin MandrakeOnline dhe dëshiroj të "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Nënshkrurje"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Po unë dëshiroj azhurmim automatikë"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Mbyllja e Asistentit\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Kujdes: Asnjë browser i specifikuar"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Lidhje e ballafaquar"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Lidhje e ballafaquar"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"MandrakeUpdate nuk mund të kontaktoj sitin, ne do të mundohemi edhe një herë."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Parulla e gabuar"
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"Logini apo parulla juaj janë të pa sakta.\n"
-"Ju duhet të shtypni përsëri apo të krijoni një llogarie tjetër në "
-"MandrakeOnline.\n"
-"Në këtë pjesë të dytë, ju duhet të ktheheni në pikën e parë të kyqjes "
-"MandrakeOnline.\n"
-"Shënoni se ju duhet ta shkruani emrin e Makinës suaj \n"
-"(vetëm shkronjat alfabetike janë të autorizuara)"
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Mirë se Vini në MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -141,35 +36,53 @@ msgstr ""
 "qendrore\n"
 "që në fund të ju informon për azhurnimin e sigurisë.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Mirë se Vini në MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Nuk e posedon llogarin MandrakeOnline dhe dëshiroj të "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Nënshkrurje"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Login:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Parulla:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Parulla:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake dhe jeta e juaj private"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Hyni loginin, parullën dhe emrin e makinës suaj në MandrakeOnline:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Login:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Emri i Makinës:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Parulla:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Dërgim i Konfigurimit tuaj"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -206,25 +119,7 @@ msgstr ""
 "Më ne fund, një alias i adresës elektronike në formë të emrit "
 "tuaj@mandrakeonline..net do të furnizohet për ju"
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Gabim gjatë dërgimit të informacioneve"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Një gabim është paraqitur gjatë dërgimit të infomacioneve personale.\n"
-"\n"
-"Shtypni Tjetri për ti ridërguar konfiguracionet edhe një herë."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Mbaruar"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -232,7 +127,7 @@ msgstr ""
 "Prej ketij momenti MandrakeOnline do të ju dërgon azhurnimet\n"
 "e reja të sigurisë."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -241,111 +136,140 @@ msgstr ""
 "Një program do të starton rregulisht në makinën tuaj për pritjen e "
 "azhurnimeve të reja.\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Dërgesa e juaj ishte me sukses!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "Azhurnim automatikë"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Caktoni lokalitetin tuaj gjeografik"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Po unë dëshiroj azhurmim automatikë"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Lexim i konfiguracionit\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Anulo"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
 msgstr ""
-"Dëshironi që të lini anash MandrakeOnline?\n"
-"Për tu kthyer mbrapa tek asistenti, shtypni 'Anulo',\n"
-"për të hjekur dorë shtypni 'Braktise'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Lereni anash me të vërtet? - MandrakeOnline"
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Mbaro"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Mbyllja e Asistentit\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Lidhje e ballafaquar"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Lidhje e ballafaquar"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"MandrakeUpdate nuk mund të kontaktoj sitin, ne do të mundohemi edhe një herë."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Parulla e gabuar"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Logini apo parulla juaj janë të pa sakta.\n"
+"Ju duhet të shtypni përsëri apo të krijoni një llogarie tjetër në "
+"MandrakeOnline.\n"
+"Në këtë pjesë të dytë, ju duhet të ktheheni në pikën e parë të kyqjes "
+"MandrakeOnline.\n"
+"Shënoni se ju duhet ta shkruani emrin e Makinës suaj \n"
+"(vetëm shkronjat alfabetike janë të autorizuara)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Mbylle"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Lexim i konfiguracionit\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -406,3 +330,75 @@ msgstr "I pa mundur krijimi i mdkupdate mesatare.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "I pa mundur azhurnimi i pakove nga mdkupdate mesatar.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Azia"
+
+#~ msgid "Australia"
+#~ msgstr "Australia"
+
+#~ msgid "Europe"
+#~ msgstr "Evropa"
+
+#~ msgid "North America"
+#~ msgstr "Amerika Veriore"
+
+#~ msgid "South America"
+#~ msgstr "Amerika Jugore"
+
+#~ msgid "Next"
+#~ msgstr "Tjetër"
+
+#~ msgid "Quit"
+#~ msgstr "Dalje"
+
+#~ msgid "Back"
+#~ msgstr "Mbrapa"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Kujdes: Asnjë browser i specifikuar"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Dërgim i Konfigurimit tuaj"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Gabim gjatë dërgimit të informacioneve"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Një gabim është paraqitur gjatë dërgimit të infomacioneve personale.\n"
+#~ "\n"
+#~ "Shtypni Tjetri për ti ridërguar konfiguracionet edhe një herë."
+
+#~ msgid "Finished"
+#~ msgstr "Mbaruar"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Caktoni lokalitetin tuaj gjeografik"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Anulo"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Dëshironi që të lini anash MandrakeOnline?\n"
+#~ "Për tu kthyer mbrapa tek asistenti, shtypni 'Anulo',\n"
+#~ "për të hjekur dorë shtypni 'Braktise'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Lereni anash me të vërtet? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Mbylle"
diff --git a/po/sr.po b/po/sr.po
index 9fa47aed..da1f48ef 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-15 09:31+0100\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -16,297 +16,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:65
-msgid "Asia"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
 msgstr ""
 
-#: ../mdkonline:66
-msgid "Australia"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:67
-msgid "Europe"
+#: ../mdkonline:101
+msgid "Create a MandrakeOnline Account"
 msgstr ""
 
-#: ../mdkonline:68
-msgid "North America"
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
 msgstr ""
 
-#: ../mdkonline:69
-msgid "South America"
+#: ../mdkonline:103
+msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:88
-msgid "Finish"
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
 msgstr ""
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
+#: ../mdkonline:109
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
+#: ../mdkonline:117
+msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:93
-msgid "Subscribe"
+#: ../mdkonline:123
+msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
+#: ../mdkonline:124
+msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
+#: ../mdkonline:129
+msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:135
+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"
+"1) the list of packages you have installed on your system,\n"
+"2) your hardware configuration.\n"
+"\n"
+"If you feel uncomfortable by that idea, or do not want to benefit from this "
+"service,\n"
+"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
+"informed\n"
+"about security updates and useful upgrades via personalized email alerts.\n"
+"Furthermore, you benefit from discounted paid support services on\n"
+"www.mandrakeexpert.com.\n"
+"Finally, an email alias with your username@mandrakeonline.net will be "
+"provided to you."
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
+#: ../mdkonline:141
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
+#: ../mdkonline:141
+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 ""
 
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "аŸб€аОаБаЛаЕаМ баА аПаОаВаЕаЗаИаВаАбšаЕаМ"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "аŸб€аОаБаЛаЕаМ баА аПаОаВаЕаЗаИаВаАбšаЕаМ"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
+#: ../mdkonline:141
+msgid "Your upload was successful!"
 msgstr ""
-"MandrakeUpdate аНаЕ аМаОаЖаЕ аДаА аКаОаНб‚аАаКб‚аИб€аА баАб˜б‚, аПаОаКбƒбˆаАб›аЕаМаО "
-"аПаОаНаОаВаО."
 
-#: ../mdkonline:294
-msgid "Wrong password"
+#: ../mdkonline:142
+msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:147
+msgid "Country:"
 msgstr ""
 
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
+#: ../mdkonline:172
+msgid "Creation"
 msgstr ""
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
 msgstr ""
 
-#: ../mdkonline:374
-msgid "Mandrake Privacy Policy"
+#: ../mdkonline:173
+msgid "Special Characters"
 msgstr ""
 
-#: ../mdkonline:379
-msgid "Authentification"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline:380
-msgid "Enter your MandrakeOnline login, password and machine name:"
+#: ../mdkonline:174
+msgid "Empty Fields"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Login:"
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Machine name:"
+#: ../mdkonline:175
+msgid "Email"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
+#: ../mdkonline:175
+msgid "Email not valid\n"
 msgstr ""
 
-#: ../mdkonline:387
-msgid "Sending your Configuration"
+#: ../mdkonline:176
+msgid "Account already exist\n"
 msgstr ""
 
-#: ../mdkonline:388
-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"
-"1) the list of packages you have installed on your system,\n"
-"2) your hardware configuration.\n"
-"\n"
-"If you feel uncomfortable by that idea, or do not want to benefit from this "
-"service,\n"
-"please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-"informed\n"
-"about security updates and useful upgrades via personalized email alerts.\n"
-"Furthermore, you benefit from discounted paid support services on\n"
-"www.mandrakeexpert.com.\n"
-"Finally, an email alias with your username@mandrakeonline.net will be "
-"provided to you."
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
+#: ../mdkonline:181
+msgid "Server Problem"
 msgstr ""
 
-#: ../mdkonline:403
-msgid "Finished"
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
 msgstr ""
 
-#: ../mdkonline:404
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to MandrakeOnline."
+#: ../mdkonline:186
+msgid "Please provide a login"
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:188
 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 ""
-
-#: ../mdkonline:404
-msgid "Your upload was successful!"
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:409
-msgid "automated Upgrades"
-msgstr ""
-
-#: ../mdkonline:417
-msgid "Choose your geographical location"
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
+#: ../mdkonline:210
+msgid "Finish"
 msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
 msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr ""
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "аŸб€аОаБаЛаЕаМ баА аПаОаВаЕаЗаИаВаАбšаЕаМ"
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
-msgstr ""
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "аŸб€аОаБаЛаЕаМ баА аПаОаВаЕаЗаИаВаАбšаЕаМ"
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
 msgstr ""
+"MandrakeUpdate аНаЕ аМаОаЖаЕ аДаА аКаОаНб‚аАаКб‚аИб€аА баАб˜б‚, аПаОаКбƒбˆаАб›аЕаМаО "
+"аПаОаНаОаВаО."
 
-#: ../mdkonline:567
-msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+#: ../mdkonline:273
+msgid "Wrong password"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkupdate:43
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 2e25743b..80cd21b8 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-15 09:31+0100\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -16,148 +16,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:65
-msgid "Asia"
-msgstr ""
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr ""
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr ""
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr ""
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr ""
-
-#: ../mdkonline:88
-msgid "Finish"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
 msgstr ""
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
+#: ../mdkonline:101
+msgid "Create a MandrakeOnline Account"
 msgstr ""
 
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr ""
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr ""
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr ""
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Problem sa povezivanjem"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Problem sa povezivanjem"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate ne može da kontaktira sajt, pokušaćemo ponovo."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr ""
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
 msgstr ""
 
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
+#: ../mdkonline:109
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr ""
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr ""
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr ""
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -177,134 +96,143 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr ""
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr ""
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 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 ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
+#: ../mdkonline:147
+msgid "Country:"
 msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
+#: ../mdkonline:172
+msgid "Creation"
 msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
 msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr ""
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr ""
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Problem sa povezivanjem"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Problem sa povezivanjem"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate ne može da kontaktira sajt, pokušaćemo ponovo."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr ""
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkupdate:43
diff --git a/po/sv.po b/po/sv.po
index 48718bc4..c7374951 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-01 14:47+0100\n"
 "Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
 "Language-Team: svenska <sv@li.org>\n"
@@ -19,119 +19,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asien"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Australien"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Europa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Nordamerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Sydamerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Nästa"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Klar"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Avsluta"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Tillbaka"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Jag har inget Mandrake Online-konto och jag vill "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Prenumerera"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Ja, jag vill ha automatiska uppdateringar"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Avslutar guiden\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Varning: Ingen webbläsare specificerad"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Anslutningsproblem"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Anslutningsproblem"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate kunde inte kontakta platsen, kommer att försöka igen"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Felaktigt lösenord"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Ditt användarnamn eller lösenord var felaktigt.\n"
-" Antingen behöver du ange det igen eller så behöver du skapa ett konto på "
-"MandrakeOnline.\n"
-" I det senare fallet måste du gå tillbaks till första steget för att ansluta "
-"till MandrakeOnline.\n"
-" Var medveten om att du måste ange ett datornamn \n"
-" (bara alfabetiska tecken är tillåtna)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Välkommen till Mandrake Online"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -144,35 +40,53 @@ msgstr ""
 "databas för att kunna hålla dig informerad om säkerhetsuppdateringar\n"
 "och andra användbara uppdateringar.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Välkommen till Mandrake Online"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Jag har inget Mandrake Online-konto och jag vill "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Prenumerera"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Användarnamn:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Lösenord:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrakes integritetspolicy"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Autentisering"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Ange ditt MandrakeOnline-konto, lösenord och datornamn:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Användarnamn:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Datornamn:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Lösenord:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Skickar konfiguration"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -209,25 +123,7 @@ msgstr ""
 "Slutligen kommer ett e-postalias med ditt användarnamn@mandrakeonline.net "
 "att tillhandahållas dig."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Fel vid sändning av information"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Det uppstod ett fel när din personliga information skulle skickas.\n"
-"\n"
-"Klicka på \"Nästa\" för att försöka skicka den igen."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Klar"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -235,7 +131,7 @@ msgstr ""
 "Från och med nu kommer du att få säkerhets-\n"
 "och uppdateringsannonseringar tack vare Mandrake Online."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -244,111 +140,139 @@ msgstr ""
 "Ett program kommer regelbundet att köras på systemet och vänta på nya "
 "uppdateringar.\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Uppladdningen lyckades!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "automatiska uppdateringar"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Välj din geografiska placering"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Ja, jag vill ha automatiska uppdateringar"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Läser konfiguration\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Avbryt"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
 msgstr ""
-"Vill du verkligen avbryta Mandrake Online?\n"
-"För att återgå till guiden, klicka på \"Avbryt\",\n"
-"för att verkligen avsluta klicka på \"Avsluta\"."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Verkligen avbryta? - Mandrake Online"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Klar"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Avslutar guiden\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Anslutningsproblem"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Anslutningsproblem"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate kunde inte kontakta platsen, kommer att försöka igen"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Felaktigt lösenord"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Ditt användarnamn eller lösenord var felaktigt.\n"
+" Antingen behöver du ange det igen eller så behöver du skapa ett konto på "
+"MandrakeOnline.\n"
+" I det senare fallet måste du gå tillbaks till första steget för att ansluta "
+"till MandrakeOnline.\n"
+" Var medveten om att du måste ange ett datornamn \n"
+" (bara alfabetiska tecken är tillåtna)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Stäng"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Läser konfiguration\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -407,3 +331,75 @@ msgstr "Kunde inte skapa mdkupdate-medium.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Kunde inte uppdatera paket från mdkupdate-medium.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Asien"
+
+#~ msgid "Australia"
+#~ msgstr "Australien"
+
+#~ msgid "Europe"
+#~ msgstr "Europa"
+
+#~ msgid "North America"
+#~ msgstr "Nordamerika"
+
+#~ msgid "South America"
+#~ msgstr "Sydamerika"
+
+#~ msgid "Next"
+#~ msgstr "Nästa"
+
+#~ msgid "Quit"
+#~ msgstr "Avsluta"
+
+#~ msgid "Back"
+#~ msgstr "Tillbaka"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Varning: Ingen webbläsare specificerad"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Skickar konfiguration"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Fel vid sändning av information"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Det uppstod ett fel när din personliga information skulle skickas.\n"
+#~ "\n"
+#~ "Klicka på \"Nästa\" för att försöka skicka den igen."
+
+#~ msgid "Finished"
+#~ msgstr "Klar"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Välj din geografiska placering"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Vill du verkligen avbryta Mandrake Online?\n"
+#~ "För att återgå till guiden, klicka på \"Avbryt\",\n"
+#~ "för att verkligen avsluta klicka på \"Avsluta\"."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Verkligen avbryta? - Mandrake Online"
+
+#~ msgid "Close"
+#~ msgstr "Stäng"
diff --git a/po/ta.po b/po/ta.po
index 147291b1..3c67934b 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2002-08-23 20:02-0400\n"
 "Last-Translator: prabu <prabu_anand2000@yahoo.com>\n"
 "Language-Team: Tamil\n"
@@ -15,166 +15,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "ஆப்ரிக்கா"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "ஆசியா"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "ஆஸ்திரேலியா"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "ஐரோப்பா"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "வட அமெரிக்கா"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "தென் அமெரிக்கா"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "அடுத்து"
+#: ../mdkonline:85
+msgid "Skip Wizard"
+msgstr ""
 
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "முடிந்தது"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
+msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "வெளிச்செல்"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
+msgstr ""
+"இப்போது மாண்டிரேக் இணையத்தளத்தில் உங்கள் பயனர்கணக்கு\n"
+" வேலைச் செய்ய வேண்டும்.இது உங்கள் கணிணிக்குத் தேவையான \n"
+"புதிய நிரல்களை அனுப்ப வடிவமைப்பு விவரங்களை ஓர் தரவுத்தளத்திற்கு\n"
+"அனுப்பி வைக்கும்.\n"
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "பின்னால்"
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
 
 # inserted a \n because mdkonline has a bug, it doens't wrap long
 # lines and the end of the line is not visible on the window...
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr ""
 "மாண்டிரேக் இணையத்தளத்ளத்தில் எனக்கு\n"
 "பயனர்கணக்கு இல்லை.எனக்கொன்று "
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr "வேண்டும்"
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "ஆம், எனக்கு நிரல்கள் தானகவே மேம்படுத்தப்பட வேண்டும்"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "மாயாவியை விட்டு வெளிச்செல்\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "எச்சரிக்கை: நீங்கள் எந்த மேலோடியையும் தேர்வுச் செய்யவில்லை"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "பயனர்கணக்கின் பெயர்"
 
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "கடவுச்சொல்"
 
-#: ../mdkonline:282 ../mdkonline:347
+#: ../mdkonline:109
 #, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"மாண்ட்ேரக்புதுப்பி  இணையத்தளத்துடன் தொடர்பு \n"
-"கொள்ள முடியவில்லை,பிறகு முயலுங்கள்"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "தவறான கடவுச்சொல்"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"உங்கள்  பயனர்கணக்கு அல்லது கடவுச்சொல் தவறானது.\n"
-"மீண்டும் முயன்று பார்க்கலாம், அல்லது மாண்டிரேக் இணையத்தளத்தில்\n"
-"புதிய பயனர்கணக்கு துவக்கலாம்.\n"
-"மாண்டிரேக் இணையத்தளத்தில் பயனர்கணக்கு துவக்க, முதல் பக்கத்திற்குச்\n"
-"செல்லவும் ஆனால் ஆங்கில்த்தில் கணிணிக்குப் பெயரிட வேண்டும்\n"
-"எழுத்துகள் மடடுமே பயனிக்கலாம்"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
-msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
+msgid "Confirm Password:"
+msgstr "கடவுச்சொல்"
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
-"இப்போது மாண்டிரேக் இணையத்தளத்தில் உங்கள் பயனர்கணக்கு\n"
-" வேலைச் செய்ய வேண்டும்.இது உங்கள் கணிணிக்குத் தேவையான \n"
-"புதிய நிரல்களை அனுப்ப வடிவமைப்பு விவரங்களை ஓர் தரவுத்தளத்திற்கு\n"
-"அனுப்பி வைக்கும்.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "மாண்டிரேக் கொள்கை"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "நல்குாிமை"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "உங்கள் மாண்டிரேக் இணையத்தள பயனர்கணக்கின்\n"
 "பெயர்,கடவுச்சொல்லை அடிக்கவும்"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "பயனர்கணக்கின் பெயர்"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "கணிணியின் பெயர்"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "கடவுச்சொல்"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "உங்கள்  வடிவமைப்புகள் அனுப்பப்படுகின்றன"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -207,25 +120,7 @@ msgstr ""
 "சென்று உதவி பெறலாம்\n"
 "கடைசியாக பயனர்கணக்கின் பெயர்@mandrakeonline.net உங்களுக்கு அளிக்கப்படும்"
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "அனுப்பப்படுவதில் பிழை நேர்ந்துள்ளது"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"அனுப்பப்படுவதில் பிழை நேர்ந்துள்ளது.\n"
-"\n"
-"தயவுசெய்து காத்திருந்து பின்னர் அனுப்பவும்"
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "முடிந்தது"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -233,7 +128,7 @@ msgstr ""
 "இப்போது முதல் நீங்கள் மாண்டிரேக் இணையத்தளத்திலிருந்து\n"
 "பாதுகாப்பு, புதிய நிரல் பற்றி அறியலாம்"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -241,111 +136,140 @@ msgstr ""
 "மாண்டிரேக் இணையம் உங்கள் கணிணியில் புதிய நிரல்களை நிறுவும்\n"
 "புதிய நிரல் பற்றி அறிய உங்கள் கணிணியில் நிரல் ஓடிக்கொண்டிருக்கும்\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "உங்கள் மேலேற்றுதல் வெற்றியடைந்தது"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "புதிய நிரல்களை நிறுவ"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr " உங்கள் பகுதியை தேர்ந்தெடுக்க"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "ஆம், எனக்கு நிரல்கள் தானகவே மேம்படுத்தப்பட வேண்டும்"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "சரி"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "நீக்கு"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
 msgstr ""
-"நீங்கள் நிச்சயமாக மாண்டிரேக்இணையத்தை பயன்படுத்த விரும்பவில்லையா ?\n"
-"மாயாவியை தொடர நீக்கு பொத்தானை அழுத்துங்கள்,\n"
-"நிச்சயமாக வெளியேர வெளிச்செல் பாத்தானை அழுத்துங்கள்"
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "நீங்கள் நிச்சயமாக மாண்டிரேக்இணையத்தை முடிக்கவேண்டுமா"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "முடிந்தது"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "மாயாவியை விட்டு வெளிச்செல்\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
 msgstr ""
+"மாண்ட்ேரக்புதுப்பி  இணையத்தளத்துடன் தொடர்பு \n"
+"கொள்ள முடியவில்லை,பிறகு முயலுங்கள்"
 
-#: ../mdkonline:576
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "தவறான கடவுச்சொல்"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"உங்கள்  பயனர்கணக்கு அல்லது கடவுச்சொல் தவறானது.\n"
+"மீண்டும் முயன்று பார்க்கலாம், அல்லது மாண்டிரேக் இணையத்தளத்தில்\n"
+"புதிய பயனர்கணக்கு துவக்கலாம்.\n"
+"மாண்டிரேக் இணையத்தளத்தில் பயனர்கணக்கு துவக்க, முதல் பக்கத்திற்குச்\n"
+"செல்லவும் ஆனால் ஆங்கில்த்தில் கணிணிக்குப் பெயரிட வேண்டும்\n"
+"எழுத்துகள் மடடுமே பயனிக்கலாம்"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "மூடு"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -405,3 +329,75 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்திலிருந்து ெமன்ெபாருைள புதுப்பிக்க முடியவில்ைல\n"
+
+#~ msgid "Africa"
+#~ msgstr "ஆப்ரிக்கா"
+
+#~ msgid "Asia"
+#~ msgstr "ஆசியா"
+
+#~ msgid "Australia"
+#~ msgstr "ஆஸ்திரேலியா"
+
+#~ msgid "Europe"
+#~ msgstr "ஐரோப்பா"
+
+#~ msgid "North America"
+#~ msgstr "வட அமெரிக்கா"
+
+#~ msgid "South America"
+#~ msgstr "தென் அமெரிக்கா"
+
+#~ msgid "Next"
+#~ msgstr "அடுத்து"
+
+#~ msgid "Quit"
+#~ msgstr "வெளிச்செல்"
+
+#~ msgid "Back"
+#~ msgstr "பின்னால்"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "எச்சரிக்கை: நீங்கள் எந்த மேலோடியையும் தேர்வுச் செய்யவில்லை"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "உங்கள்  வடிவமைப்புகள் அனுப்பப்படுகின்றன"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "அனுப்பப்படுவதில் பிழை நேர்ந்துள்ளது"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "அனுப்பப்படுவதில் பிழை நேர்ந்துள்ளது.\n"
+#~ "\n"
+#~ "தயவுசெய்து காத்திருந்து பின்னர் அனுப்பவும்"
+
+#~ msgid "Finished"
+#~ msgstr "முடிந்தது"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr " உங்கள் பகுதியை தேர்ந்தெடுக்க"
+
+#~ msgid "OK"
+#~ msgstr "சரி"
+
+#~ msgid "Cancel"
+#~ msgstr "நீக்கு"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "நீங்கள் நிச்சயமாக மாண்டிரேக்இணையத்தை பயன்படுத்த விரும்பவில்லையா ?\n"
+#~ "மாயாவியை தொடர நீக்கு பொத்தானை அழுத்துங்கள்,\n"
+#~ "நிச்சயமாக வெளியேர வெளிச்செல் பாத்தானை அழுத்துங்கள்"
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "நீங்கள் நிச்சயமாக மாண்டிரேக்இணையத்தை முடிக்கவேண்டுமா"
+
+#~ msgid "Close"
+#~ msgstr "மூடு"
diff --git a/po/tg.po b/po/tg.po
index 38cad9e0..b0f2d019 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-01-28 17:26+0500\n"
 "Last-Translator: Dilshod Marupov <dma165@hotmail.com>\n"
 "Language-Team: Tajik\n"
@@ -16,118 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:65
-msgid "Asia"
-msgstr ""
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr ""
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr ""
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr ""
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Hавбатӣ"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Итмом"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Баромадан"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Қафо"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Ман ҳисоботи MandrakeOline надорам ва доштан мехоҳам "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Обуна шудан"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr ""
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Баромад аз Устод\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Огоҳӣ:Барраси муайяншуда нест"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Муаммои пайвастагӣ"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Муаммои пайвастагӣ"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate бо пойгоҳ пайваста нашуд, боз кӯшиш мекунем."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Гузарвожаи нодуруст"
-
-#: ../mdkonline:294
-#, fuzzy
-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)"
-msgstr ""
-"Номи дохилӣ ё гузарвожаи Шумо хато буд.\n"
-"Ё Шумо онро боз ҳуруфчини мекунед, ё Шумо бояд дар MandrakeOnline ҳисобот "
-"офаред.\n"
-"Дар ҳолати 2-юм, барои алоқа шудан бо MandrakeOnline ба қафо ба қадами 1-ум "
-"равед."
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Марҳамат ба MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -141,36 +38,54 @@ msgstr ""
 "барои шуморо хабардор доштан оид ба навигариҳои бехатарӣ\n"
 "ва афзоишҳои фоиданок ёрӣ хоҳад расонд.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Марҳамат ба MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Ман ҳисоботи MandrakeOline надорам ва доштан мехоҳам "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Обуна шудан"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Номи дохилӣ:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Гузарвожа:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Гузарвожа:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Сиёсати Шахсии Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Саҳеҳӣ"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 #, fuzzy
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Номи дохилӣ ва гузарвожаи MandrakeOnline-и худро дохил кунед:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Номи дохилӣ:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Гузарвожа:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Фиристодани Танзимдарории шумо"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -206,25 +121,7 @@ msgstr ""
 "”“Охирин, пости электронӣ бо номи корванди@mandrakeonline.net шумо ба““шумо "
 "таъмин карда мешавад.”"
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Хатогӣ ҳангоми фиристодани маълумотҳо"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"“Ҳангоми фиристодани маълумотҳои шахсии шумо хатогӣ рӯй дод.\n"
-"”“\n"
-"”“Барои кӯшиш ва боз фиристодани танзимдарории худ Навбатӣ-ро пахш кунед.”"
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Тамом шуд"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 #, fuzzy
 msgid ""
 "From now you will receive on security and updates \n"
@@ -234,118 +131,145 @@ msgstr ""
 "Акнун шумо бо кӯмаки MandrakeOnline\n"
 "эълонҳо оид ба бехатарӣ ва афзоиш хоҳед гирифт."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 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 ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:435
-#, fuzzy
-msgid "Reading configuration\n"
-msgstr "Фиристодани Танзимдарории шумо"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Бекор кардан"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
 msgstr ""
-"Шумо ҳақиқатан MandrakeOnline-ро партофтан мехоҳед?\n"
-"Барои ба Устод баргаштан ’Бекор кардан’-ро пахш кунед,\n"
-"барои ҳақиқатан баромадан ’Баромадан’-ро пахш кунед."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Ҳақиқатан партоем? - MandrakeOnline"
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Итмом"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Баромад аз Устод\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Муаммои пайвастагӣ"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Муаммои пайвастагӣ"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate бо пойгоҳ пайваста нашуд, боз кӯшиш мекунем."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Гузарвожаи нодуруст"
+
+#: ../mdkonline:273
+#, fuzzy
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Номи дохилӣ ё гузарвожаи Шумо хато буд.\n"
+"Ё Шумо онро боз ҳуруфчини мекунед, ё Шумо бояд дар MandrakeOnline ҳисобот "
+"офаред.\n"
+"Дар ҳолати 2-юм, барои алоқа шудан бо MandrakeOnline ба қафо ба қадами 1-ум "
+"равед."
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Пӯшидан"
+#: ../mdkonline:335
+#, fuzzy
+msgid "Reading configuration\n"
+msgstr "Фиристодани Танзимдарории шумо"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -406,3 +330,54 @@ msgstr "Офаридани муҳити mdkupdate номумкин.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Нав кардани қуттиҳо аз муҳити mdkupdate номумкин.\n"
+
+#~ msgid "Next"
+#~ msgstr "Hавбатӣ"
+
+#~ msgid "Quit"
+#~ msgstr "Баромадан"
+
+#~ msgid "Back"
+#~ msgstr "Қафо"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Огоҳӣ:Барраси муайяншуда нест"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Фиристодани Танзимдарории шумо"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Хатогӣ ҳангоми фиристодани маълумотҳо"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "“Ҳангоми фиристодани маълумотҳои шахсии шумо хатогӣ рӯй дод.\n"
+#~ "”“\n"
+#~ "”“Барои кӯшиш ва боз фиристодани танзимдарории худ Навбатӣ-ро пахш кунед.”"
+
+#~ msgid "Finished"
+#~ msgstr "Тамом шуд"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Бекор кардан"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Шумо ҳақиқатан MandrakeOnline-ро партофтан мехоҳед?\n"
+#~ "Барои ба Устод баргаштан ’Бекор кардан’-ро пахш кунед,\n"
+#~ "барои ҳақиқатан баромадан ’Баромадан’-ро пахш кунед."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Ҳақиқатан партоем? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Пӯшидан"
diff --git a/po/th.po b/po/th.po
index 3a806623..1de63d4a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-02-28 05:55+0900\n"
 "Last-Translator: Pramote Khuwijitjaru <kmote@hotmail.com>\n"
 "Language-Team: Thai <en@li.org>\n"
@@ -16,148 +16,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkonline:64
-msgid "Africa"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:65
-msgid "Asia"
-msgstr ""
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr ""
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr ""
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr ""
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr ""
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr ""
-
-#: ../mdkonline:88
-msgid "Finish"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
 msgstr ""
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
+#: ../mdkonline:101
+msgid "Create a MandrakeOnline Account"
 msgstr ""
 
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr ""
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr ""
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr ""
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "ปัญหาการคอนเน็ค"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "ปัญหาการคอนเน็ค"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate ไม่สามารถติดต่อกับไซต์ จะลองพยายามอีกครั้ง"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr ""
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
 msgstr ""
 
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
+#: ../mdkonline:109
+msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr ""
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr ""
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr ""
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -177,134 +96,143 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr ""
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr ""
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 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 ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
+#: ../mdkonline:147
+msgid "Country:"
 msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
+#: ../mdkonline:172
+msgid "Creation"
 msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
 msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
 msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr ""
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr ""
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "ปัญหาการคอนเน็ค"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "ปัญหาการคอนเน็ค"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate ไม่สามารถติดต่อกับไซต์ จะลองพยายามอีกครั้ง"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr ""
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkupdate:43
diff --git a/po/tr.po b/po/tr.po
index 3ab7c80d..fe1ebc8c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-01-12 11:41+0200\n"
 "Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -19,120 +19,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Asya"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Avusturalya"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Avrupa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Kuzey Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Güney Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "İleri"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Son"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Çıkış"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Geri"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "MandrakeOnline hesabım yok ve yeni hesap açtırmak istiyorum "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Kayıt Ol"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Evet otomatik güncellemeleri istiyorum"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Sihirbaz Kapatılıyor\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Uyarı: İnternet tarayıcısı tanımlanmamış"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Bağlantı problemi"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Bağlantı problemi"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"MandrakeUpdate sitesine bağlantı sağlanamadı, sonra tekrar deneyeceğiz."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Yanlış parola"
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"Kullanıcıadı veya parolanız yanlış.\n"
-" Parolanızı kontrollü şekilde tekrar girin, veya MandrakeOnline 'dan bir "
-"yeni hesap açtırın.\n"
-" O halde Şimdi Geri tuşuna basın ve MandrakeOnline a bağlanmak için\n"
-"talimatları izleyin!. \n"
-" Bir Makine adı tanımladığınıza emin olun. \n"
-" ( sadece karakter bazlı makine adları geçerlidir)"
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "MandrakeOnline'na Hoşgeldiniz"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -145,35 +40,53 @@ msgstr ""
 "oluşturulacak ve sisteminiz hakkında güvenlik yamaları ve güncellemelerden\n"
 "her an haberdar olacaksınız.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "MandrakeOnline'na Hoşgeldiniz"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "MandrakeOnline hesabım yok ve yeni hesap açtırmak istiyorum "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Kayıt Ol"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Giriş:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Parola:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Parola:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake Gizlilik Politikası"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "MandrakeOnline kullanıcıadınızı , parolanızı ve makine adını giriniz:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Giriş:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Makine adı:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Parola:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Yapılandırmanız yollanıyor"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -206,25 +119,7 @@ msgstr ""
 "Sisteminiz hakkında yeni çıkan güncellemelerden haberdar olacaksınız.Bunun "
 "sonucunda kullanıcıadınız@mandrakeonline.net size ayrılacaktır."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Bilgi yollama esnasında HATA"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Kişisel Bilgileriniz yollanırken bir hata ile karşılaşıldı\n"
-"\n"
-"İleri tuşuna basarak yapılandırmanızı göndermeyi tekrar deneyiniz."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Bitti"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -233,7 +128,7 @@ msgstr ""
 "hakkında ki tüm gelişmeler ve güvenlik açıkları size bildirilecektir.\n"
 "MandrakeSoft teşekkürlerini sunar..."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -242,111 +137,140 @@ msgstr ""
 "Sistemizde belirli aralıklarla çalışacak ve\n"
 "güncellemeleri takip edecek olan bir programdır\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Göndermeniz tamamlanmıştır!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "otomatik Güncellemeler"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Coğrafik konumunuzu seçin"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Evet otomatik güncellemeleri istiyorum"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Yapılandırmanız okunuyor\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "TAMAM"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Vazgeç"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
 msgstr ""
-"Mandrake Online'ı gerçekten iptal etmek istiyor musunuz?\n"
-"Sihirbaza dönmek için 'Vazgeç'i tıklayın,\n"
-"Çıkmak istediğinizden eminseniz 'Çıkış' tuşuna basınız."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Gerçekten iptal etmek istiyor musumuz? - MandrakeOnline"
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Son"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Sihirbaz Kapatılıyor\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Bağlantı problemi"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Bağlantı problemi"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"MandrakeUpdate sitesine bağlantı sağlanamadı, sonra tekrar deneyeceğiz."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Yanlış parola"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Kullanıcıadı veya parolanız yanlış.\n"
+" Parolanızı kontrollü şekilde tekrar girin, veya MandrakeOnline 'dan bir "
+"yeni hesap açtırın.\n"
+" O halde Şimdi Geri tuşuna basın ve MandrakeOnline a bağlanmak için\n"
+"talimatları izleyin!. \n"
+" Bir Makine adı tanımladığınıza emin olun. \n"
+" ( sadece karakter bazlı makine adları geçerlidir)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Kapat"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Yapılandırmanız okunuyor\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -410,3 +334,75 @@ msgstr "mdkupdate medyası oluşturulamıyor.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "mdkupdate medyasından paketler güncellenemiyor.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Asya"
+
+#~ msgid "Australia"
+#~ msgstr "Avusturalya"
+
+#~ msgid "Europe"
+#~ msgstr "Avrupa"
+
+#~ msgid "North America"
+#~ msgstr "Kuzey Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Güney Amerika"
+
+#~ msgid "Next"
+#~ msgstr "İleri"
+
+#~ msgid "Quit"
+#~ msgstr "Çıkış"
+
+#~ msgid "Back"
+#~ msgstr "Geri"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Uyarı: İnternet tarayıcısı tanımlanmamış"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Yapılandırmanız yollanıyor"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Bilgi yollama esnasında HATA"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Kişisel Bilgileriniz yollanırken bir hata ile karşılaşıldı\n"
+#~ "\n"
+#~ "İleri tuşuna basarak yapılandırmanızı göndermeyi tekrar deneyiniz."
+
+#~ msgid "Finished"
+#~ msgstr "Bitti"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Coğrafik konumunuzu seçin"
+
+#~ msgid "OK"
+#~ msgstr "TAMAM"
+
+#~ msgid "Cancel"
+#~ msgstr "Vazgeç"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Mandrake Online'ı gerçekten iptal etmek istiyor musunuz?\n"
+#~ "Sihirbaza dönmek için 'Vazgeç'i tıklayın,\n"
+#~ "Çıkmak istediğinizden eminseniz 'Çıkış' tuşuna basınız."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Gerçekten iptal etmek istiyor musumuz? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Kapat"
diff --git a/po/uk.po b/po/uk.po
index c8a0313a..86c613d0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-08-26 08:38+0300\n"
 "Last-Translator: Taras Boychuk <btr1@torba.com>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -17,148 +17,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Африка"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Азія"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Австралія"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Європа"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Північна Америка"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Південна Америка"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Наступна"
+#: ../mdkonline:85
+msgid "Skip Wizard"
+msgstr ""
 
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Завершити"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
+msgstr "Ласкаво просимо до MandrakeOnline"
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Вихід"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
+msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Назад"
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Ласкаво просимо до MandrakeOnline"
 
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr "В мене немає рахунку MandrakeOnline і я хочу "
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr "Підписатися"
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Так, я хочу автоматизованого поновлення"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Вийти з Менеджеру\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr ""
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Проблеми зі з'єднанням"
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Ім'я:"
 
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Проблеми зі з'єднанням"
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Пароль:"
 
-#: ../mdkonline:282 ../mdkonline:347
+#: ../mdkonline:109
 #, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate не може зв'язатися з сайтом, ми спробуємо ще раз."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Невірний пароль"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
-msgstr "Ласкаво просимо до MandrakeOnline"
+msgid "Confirm Password:"
+msgstr "Пароль:"
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake Privacy Policy"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Введіть ваше ім'я на MandrakeOnline, пароль і ім'я машини: "
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Ім'я:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Пароль:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Відсилаю ваші дані"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -178,135 +99,144 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Помилка під час відсилання інформації"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Завершено"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 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 ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Закачка пройшла успішно!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Виберіть ваше географічне розташування"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Так, я хочу автоматизованого поновлення"
+
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Зчитую конфігурацію\n"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "Гаразд"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Скасувати"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
 msgstr ""
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Дійсно вийти? - MandrakeOnline"
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Завершити"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Вийти з Менеджеру\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Проблеми зі з'єднанням"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Проблеми зі з'єднанням"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate не може зв'язатися з сайтом, ми спробуємо ще раз."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Невірний пароль"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Закрити"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Зчитую конфігурацію\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -366,3 +296,54 @@ msgstr "Не можу створити носія mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Не можу поновити пакунки з носія mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Африка"
+
+#~ msgid "Asia"
+#~ msgstr "Азія"
+
+#~ msgid "Australia"
+#~ msgstr "Австралія"
+
+#~ msgid "Europe"
+#~ msgstr "Європа"
+
+#~ msgid "North America"
+#~ msgstr "Північна Америка"
+
+#~ msgid "South America"
+#~ msgstr "Південна Америка"
+
+#~ msgid "Next"
+#~ msgstr "Наступна"
+
+#~ msgid "Quit"
+#~ msgstr "Вихід"
+
+#~ msgid "Back"
+#~ msgstr "Назад"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Відсилаю ваші дані"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Помилка під час відсилання інформації"
+
+#~ msgid "Finished"
+#~ msgstr "Завершено"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Виберіть ваше географічне розташування"
+
+#~ msgid "OK"
+#~ msgstr "Гаразд"
+
+#~ msgid "Cancel"
+#~ msgstr "Скасувати"
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Дійсно вийти? - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "Закрити"
diff --git a/po/uz.po b/po/uz.po
index 9aeb5f03..29f566ee 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-15 20:00+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -16,147 +16,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Африка"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Осиё"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Австралия"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Ойропа"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Шимолий Америка"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Жанубий  Америка"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Кейингиси"
+#: ../mdkonline:85
+msgid "Skip Wizard"
+msgstr ""
 
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Тайёр"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
+msgstr "MandrakeOnline'га марҳамат"
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Чиқиш"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
+msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Орқага"
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "MandrakeOnline'га марҳамат"
 
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr ""
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr "Аъзо бўлиш"
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr ""
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Ёрдамчидан чиқилмоқда\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Бўш ойна"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Диққат: Ҳеч қандай браузер кўрсатилмаган"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Алоқа ўрнатилмоқда...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Алоқа ўрнатишда муаммо"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"MandrakeOnline билан алоқа ўрнатиб бўлмади. Илтимос кейинроқ уриниб кўринг"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Махфий сўз нотўғри"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Фойдаланувчи:"
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "Мосламалар жўнатилмоқда..."
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Махфий сўз:"
 
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
-msgstr "MandrakeOnline'га марҳамат"
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Махфий сўз:"
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Тасдиқлаш"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Фойдаланувчи:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Компютернинг номи:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Махфий сўз:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr ""
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -176,135 +98,143 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr ""
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Тугади"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 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 ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
+#: ../mdkonline:147
+msgid "Country:"
 msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "Ок"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Бекор қилиш"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
 msgstr ""
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Тайёр"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Ёрдамчидан чиқилмоқда\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Алоқа ўрнатилмоқда...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Алоқа ўрнатишда муаммо"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"MandrakeOnline билан алоқа ўрнатиб бўлмади. Илтимос кейинроқ уриниб кўринг"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Махфий сўз нотўғри"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Мосламалар жўнатилмоқда..."
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Ёпиш"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr ""
 
 #: ../mdkupdate:43
 #, perl-format
@@ -362,3 +292,51 @@ msgstr ""
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
+
+#~ msgid "Africa"
+#~ msgstr "Африка"
+
+#~ msgid "Asia"
+#~ msgstr "Осиё"
+
+#~ msgid "Australia"
+#~ msgstr "Австралия"
+
+#~ msgid "Europe"
+#~ msgstr "Ойропа"
+
+#~ msgid "North America"
+#~ msgstr "Шимолий Америка"
+
+#~ msgid "South America"
+#~ msgstr "Жанубий  Америка"
+
+#~ msgid "Next"
+#~ msgstr "Кейингиси"
+
+#~ msgid "Quit"
+#~ msgstr "Чиқиш"
+
+#~ msgid "Back"
+#~ msgstr "Орқага"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Бўш ойна"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Диққат: Ҳеч қандай браузер кўрсатилмаган"
+
+#~ msgid "Finished"
+#~ msgstr "Тугади"
+
+#~ msgid "OK"
+#~ msgstr "Ок"
+
+#~ msgid "Cancel"
+#~ msgstr "Бекор қилиш"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Ёпиш"
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index 8807f69a..d3640535 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-15 20:00+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -16,147 +16,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrika"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Osiyo"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Avstraliya"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Oyropa"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Shimoliy Amerika"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Janubiy  Amerika"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Keyingisi"
+#: ../mdkonline:85
+msgid "Skip Wizard"
+msgstr ""
 
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Tayyor"
+#: ../mdkonline:99
+msgid "Welcome to MandrakeOnline"
+msgstr "MandrakeOnline'ga marhamat"
 
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Chiqish"
+#: ../mdkonline:100
+msgid ""
+"At this step You are supposed to have an account on MandrakeOnline.\n"
+"This assistant will help you to upload your configuration\n"
+"(packages, hardware configuration) to a centralized database in\n"
+"order to keep you informed about security updates and useful upgrades.\n"
+msgstr ""
 
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Orqaga"
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "MandrakeOnline'ga marhamat"
 
-#: ../mdkonline:92
+#: ../mdkonline:103
 msgid "I don't have a MandrakeOnline account and I want to "
 msgstr ""
 
-#: ../mdkonline:93
+#: ../mdkonline:103
 msgid "Subscribe"
 msgstr "A'zo bo'lish"
 
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr ""
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Yordamchidan chiqilmoqda\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Bo'sh oyna"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Diqqat: Hech qanday brauzer ko'rsatilmagan"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Aloqa o'rnatilmoqda...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Aloqa o'rnatishda muammo"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"MandrakeOnline bilan aloqa o'rnatib bo'lmadi. Iltimos keyinroq urinib ko'ring"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Maxfiy so'z noto'g'ri"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Foydalanuvchi:"
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "Moslamalar jo'natilmoqda..."
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Maxfiy so'z:"
 
-#: ../mdkonline:356
-msgid "Welcome to MandrakeOnline"
-msgstr "MandrakeOnline'ga marhamat"
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Maxfiy so'z:"
 
-#: ../mdkonline:357
-msgid ""
-"At this step You are supposed to have an account on MandrakeOnline.\n"
-"This assistant will help you to upload your configuration\n"
-"(packages, hardware configuration) to a centralized database in\n"
-"order to keep you informed about security updates and useful upgrades.\n"
+#: ../mdkonline:110
+msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:374
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Tasdiqlash"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Foydalanuvchi:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Kompyuterning nomi:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Maxfiy so'z:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr ""
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -176,135 +98,143 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr ""
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Tugadi"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
 msgstr ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 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 ""
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
 msgstr ""
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
+#: ../mdkonline:147
+msgid "Country:"
 msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "Ok"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Bekor qilish"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
 msgstr ""
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
 msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Tayyor"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Yordamchidan chiqilmoqda\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Aloqa o'rnatilmoqda...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Aloqa o'rnatishda muammo"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr ""
+"MandrakeOnline bilan aloqa o'rnatib bo'lmadi. Iltimos keyinroq urinib ko'ring"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Maxfiy so'z noto'g'ri"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Moslamalar jo'natilmoqda..."
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Yopish"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr ""
 
 #: ../mdkupdate:43
 #, perl-format
@@ -362,3 +292,51 @@ msgstr ""
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr ""
+
+#~ msgid "Africa"
+#~ msgstr "Afrika"
+
+#~ msgid "Asia"
+#~ msgstr "Osiyo"
+
+#~ msgid "Australia"
+#~ msgstr "Avstraliya"
+
+#~ msgid "Europe"
+#~ msgstr "Oyropa"
+
+#~ msgid "North America"
+#~ msgstr "Shimoliy Amerika"
+
+#~ msgid "South America"
+#~ msgstr "Janubiy  Amerika"
+
+#~ msgid "Next"
+#~ msgstr "Keyingisi"
+
+#~ msgid "Quit"
+#~ msgstr "Chiqish"
+
+#~ msgid "Back"
+#~ msgstr "Orqaga"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Bo'sh oyna"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Diqqat: Hech qanday brauzer ko'rsatilmagan"
+
+#~ msgid "Finished"
+#~ msgstr "Tugadi"
+
+#~ msgid "OK"
+#~ msgstr "Ok"
+
+#~ msgid "Cancel"
+#~ msgstr "Bekor qilish"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Yopish"
diff --git a/po/vi.po b/po/vi.po
index b1f00cfe..a665a353 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-01-21 17:01+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Gnome-Vi <Gnomevi-list@lists.sourceforge.net>\n"
@@ -14,119 +14,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Châu Phi"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Châu Á"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Châu Úc"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Châu Âu"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Bắc Mỹ"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Nam Mỹ"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Tiếp theo"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Kết thúc"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Thoát"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "Quay lại"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Tôi không có tài khoản Mandrake Online và muốn lập một cái "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "Đăng ký"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Vâng, tôi muốn tự động cập nhật"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Đang thoát khỏi Đồ Thuật\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr ""
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Cảnh báo: Bạn chưa chỉ định trình duyệt"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "Trục trặc kết nối"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Trục trặc kết nối"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate không thể liên lạc với site, xin thực hiện lại sau."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Sai mật khẩu"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Tên đăng nhập hoặc mật khẩu của bạn không đúng.\n"
-"Hoặc là bạn phải nhập lại, hoặc bạn cần tạo một tài khoản cho Mandrake "
-"Online.\n"
-" Trong trường hợp sau, hãy quay về bước đầu tiên để kết nối tới Mandrake "
-"Online.\n"
-" Cần biết là bạn cũng phải cung cấp tên máy tính \n"
-" (chỉ chấp nhận các ký tự trong bảng chữ cái)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Chào Mừng MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -138,35 +34,53 @@ msgstr ""
 "(các gói, cấu hình phần cứng) đến cơ sở dữ liệu tập chung nhằm\n"
 "duy trì thông báo cho bạn về các cập nhật bảo mật và nâng cấp hữu ích.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "Chào Mừng MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Tôi không có tài khoản Mandrake Online và muốn lập một cái "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "Đăng ký"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "Đăng nhập:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Mật khẩu:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Mật khẩu:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Chính Sách Riêng Tư Của Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Chứng thực"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "Hãy điền tên đăng nhập MandraleOnline, mật khẩu và tên máy:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "Đăng nhập:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "Tên máy tính:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Mật khẩu:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Đang gửi cấu hình của bạn"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -201,25 +115,7 @@ msgstr ""
 "Cuối cùng, bạn sẽ được cung cấp một bí danh thư với tên người dùng của bạn "
 "@mandrakeonline.net "
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Lỗi khi đang gửi thông tin"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Có lỗi xảy ra khi đang gửi thông tin cá nhân của bạn.\n"
-"\n"
-"Hãy nhấn Tiếp theo để thử gửi lại cấu hình của bạn."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Kết thúc"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -227,7 +123,7 @@ msgstr ""
 "Từ bây giờ, bạn sẽ nhận được các thông\n"
 "báo về cập nhật bảo mật thông qua MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -235,111 +131,139 @@ msgstr ""
 "MandrakeOnline cung cấp khả năng tự động cập nhật.\n"
 "Một chương trình sẽ chạy thường quy trong hệ thống để đợi các cập nhật mới\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Đã hoàn thành việc tải lên!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "Nâng cấp tự động"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Chọn vị trí địa lý của bạn"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Vâng, tôi muốn tự động cập nhật"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Đang đọc cấu hình\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "OK"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Bỏ qua"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
 msgstr ""
-"Bạn thực sự muốn hủy bỏ Mandrake Online?\n"
-"Để tiếp tục đồ thuật, hãy nhấn 'Bỏ qua',\n"
-"để thoát ra, hãy nhấn  'Thoát'."
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Hủy bỏ thật sự ? - Mandrake Online"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Kết thúc"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Đang thoát khỏi Đồ Thuật\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "Trục trặc kết nối"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Trục trặc kết nối"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate không thể liên lạc với site, xin thực hiện lại sau."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Sai mật khẩu"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Tên đăng nhập hoặc mật khẩu của bạn không đúng.\n"
+"Hoặc là bạn phải nhập lại, hoặc bạn cần tạo một tài khoản cho Mandrake "
+"Online.\n"
+" Trong trường hợp sau, hãy quay về bước đầu tiên để kết nối tới Mandrake "
+"Online.\n"
+" Cần biết là bạn cũng phải cung cấp tên máy tính \n"
+" (chỉ chấp nhận các ký tự trong bảng chữ cái)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Đóng"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Đang đọc cấu hình\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -398,3 +322,75 @@ msgstr "Không thể tạo phương tiện mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Không thể cập nhật các gói từ phương tiện mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Châu Phi"
+
+#~ msgid "Asia"
+#~ msgstr "Châu Á"
+
+#~ msgid "Australia"
+#~ msgstr "Châu Úc"
+
+#~ msgid "Europe"
+#~ msgstr "Châu Âu"
+
+#~ msgid "North America"
+#~ msgstr "Bắc Mỹ"
+
+#~ msgid "South America"
+#~ msgstr "Nam Mỹ"
+
+#~ msgid "Next"
+#~ msgstr "Tiếp theo"
+
+#~ msgid "Quit"
+#~ msgstr "Thoát"
+
+#~ msgid "Back"
+#~ msgstr "Quay lại"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Cảnh báo: Bạn chưa chỉ định trình duyệt"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Đang gửi cấu hình của bạn"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Lỗi khi đang gửi thông tin"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Có lỗi xảy ra khi đang gửi thông tin cá nhân của bạn.\n"
+#~ "\n"
+#~ "Hãy nhấn Tiếp theo để thử gửi lại cấu hình của bạn."
+
+#~ msgid "Finished"
+#~ msgstr "Kết thúc"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Chọn vị trí địa lý của bạn"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Bỏ qua"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Bạn thực sự muốn hủy bỏ Mandrake Online?\n"
+#~ "Để tiếp tục đồ thuật, hãy nhấn 'Bỏ qua',\n"
+#~ "để thoát ra, hãy nhấn  'Thoát'."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Hủy bỏ thật sự ? - Mandrake Online"
+
+#~ msgid "Close"
+#~ msgstr "Đóng"
diff --git a/po/wa.po b/po/wa.po
index 28332df7..59f535fe 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
-"PO-Revision-Date: 2004-02-06 18:08+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
+"PO-Revision-Date: 2004-02-16 22:58+0100\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,116 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "Afrike"
+#: ../mdkonline:85
+msgid "Skip Wizard"
+msgstr "Passer houte"
 
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "Azeye"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "Ostraleye"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "Urope"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "Amerike bijhrece"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "Amerike nonnrece"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "Shuvant"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "Fini"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "Cwiter"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "En erî"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "Dji n' a nén d' conte MandrakeOnline et dji vôreu"
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "M' abouner"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "Oyi, dji vou des metaedjes a djoû otomatikes"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "Cwitant l' macrea\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "Li muroe est vude"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "Li muroe est vude. Tchoezixhoz ene plaece s' i vs plait."
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "Asteme: Nou betchteu waibe di dné"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "Raloyaedje...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "Aroke avou l' raloyaedje"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr ""
-"Dji n' a polou m' raloyî a MandrakeOnline, rissayîz on pô pus tård s' i vs "
-"plait."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "Måva scret"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"Vos avoz dné on måva no d' elodjaedje ou on måva scret.\n"
-"I vos les fåt rtaper, oudonbén i vos fåt fé on conte so MandrakeOnline.\n"
-"Po ç' dierin cas, potchîz al prumire etape po s' raloyî a MandrakeOnline.\n"
-"Vos dvroz ossu dner on no d' éndjole (seulmint des letes sins accints)"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "Evoyant l' apontaiedje..."
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "Wilicome e MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -138,36 +37,52 @@ msgstr ""
 "por nos pleur vos informer tchaeke côp k' i gn årè on metaedje a djoû\n"
 "di såvrité, oudonbén ahessåve pol apontiaedje da vosse.\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+msgid "Create a MandrakeOnline Account"
+msgstr "Ahiver on conte MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "Dji n' a nén d' conte MandrakeOnline et dji vôreu"
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "M' abouner"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "No d' elodjaedje:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "Sicret:"
+
+#: ../mdkonline:109
+msgid "Confirm Password:"
+msgstr "Acertinez l' sicret:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr "Emile di contak:"
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Politike sol privaceye di Mandrake"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "Otintifiaedje"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr ""
 "Dinez vosse no d' elodjaedje, no d' éndjole eyet scret po MandrakeOnline:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "No d' elodjaedje:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "No d' l' éndjole:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "Sicret:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "Evoyaedje di l' apontiaedje da vosse"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -200,25 +115,7 @@ msgstr ""
 "so les siervices payants di www.mandrakeexpert.com.\n"
 "Eto, vos åroz èn alias emile del foûme « uzeu@mandrakeonline.net »."
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "Åk n' a nén stî tot-z evoyant les informåcions"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"Åk n' a nén stî tot evoyant les informåcions personeles da vosse.\n"
-"\n"
-"Clitchîz so «Shuvant» po sayî dels evoyî cor on côp."
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "Fini"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -226,7 +123,7 @@ msgstr ""
 "A pårti d' asteure vos rçuroz les anonces di såvrité\n"
 "et di metaedjes a djoû viè MandrakeOnline."
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -236,122 +133,139 @@ msgstr ""
 "On programe srè enondé regulirmint so vosse sistinme po cweri après des "
 "noveas metaedjes a djoû\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "Vosse metaedje a djoû a stî comifåt!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "metaedjes a djoû otomatikes"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "Tchoezixhoz vost eplaeçmint sol Daegn"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "Oyi, dji vou des metaedjes a djoû otomatikes"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "Dji lé vost apontiaedje\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr "Payis:"
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr "Ahiver"
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "'l est bon"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
+"Li no d' elodjaedje eyet l' sicret dvèt esse di moens di 12 caracteres\n"
+
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr "Caracteres speciås"
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr "Les caracteres speciås èn sont nén possibes\n"
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr "Tchamps vudes"
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr "Rimplixhoz tos les tchamps s' i vs plait\n"
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr "Emile"
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr "Emile nén valide\n"
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr "Li conte egzistêye dedja\n"
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr "Candjî d' conte"
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr "Åk n' a nén stî tot s' raloyant å sierveu \n"
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "Rinoncî"
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr "Problinme avou l' sierveu"
 
-#: ../mdkonline:534
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr "Aroke"
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr "Dinez on no d' elodjaedje d' si vs plait"
+
+#: ../mdkonline:188
 msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
-"Voloz vs vormint cwiter MandrakeOnline?\n"
-"Po rivni å Macrea, clitchîz so «Rinoncî»,\n"
-"po moussî foû po d' bon, clitchîz so «Moussî foû»."
+"Les screts n' sont nén les minmes\n"
+" Sayîz cor on côp s' i vs plait\n"
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "Vormint rnoncî? - MandrakeOnline"
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr "C' est nén ene adresse emile valide!\n"
 
-#: ../mdkonline:567
-msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "Fini"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "Cwitant l' macrea\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "Raloyaedje...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "Aroke avou l' raloyaedje"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
 msgstr ""
-"Vos estoz k' enonde pol prumî côp nosse modêye Mandrake Linux Download "
-"Edition\n"
-"\n"
-"Vos estoz dipus di troes miyons sol Daegn a-z eployî Mandrake Linux!\n"
-"\n"
-"S' i vs plait, prindoz kékès segondes po responde a on ptit  ploncaedje.\n"
-"Les dnêyes rascodowes seront-st eployeyes seulmint po des studiaedjes di "
-"martchî.\n"
-"Li tecse chal pa dzo c' est l' politike di MandrakeSoft å dfait del "
-"privaceye\n"
-"des dnêyes personeles."
-
-#: ../mdkonline:576
+"Dji n' a polou m' raloyî a MandrakeOnline, rissayîz on pô pus tård s' i vs "
+"plait."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "Måva scret"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"Vos avoz dné on måva no d' elodjaedje ou on måva scret.\n"
+"I vos les fåt rtaper, oudonbén i vos fåt fé on conte so MandrakeOnline.\n"
+"Po ç' dierin cas, potchîz al prumire etape po s' raloyî a MandrakeOnline.\n"
+"Vos dvroz ossu dner on no d' éndjole (seulmint des letes sins accints)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "Evoyant l' apontaiedje..."
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "Clôre"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "Dji lé vost apontiaedje\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -413,3 +327,109 @@ msgstr "Dji n' a savou fé l' sopoirt mdkupdate.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "Dji n' a savou mete a djoû les pacaedje foû do sopoirt mdkupdate.\n"
+
+#~ msgid "Africa"
+#~ msgstr "Afrike"
+
+#~ msgid "Asia"
+#~ msgstr "Azeye"
+
+#~ msgid "Australia"
+#~ msgstr "Ostraleye"
+
+#~ msgid "Europe"
+#~ msgstr "Urope"
+
+#~ msgid "North America"
+#~ msgstr "Amerike bijhrece"
+
+#~ msgid "South America"
+#~ msgstr "Amerike nonnrece"
+
+#~ msgid "Next"
+#~ msgstr "Shuvant"
+
+#~ msgid "Quit"
+#~ msgstr "Cwiter"
+
+#~ msgid "Back"
+#~ msgstr "En erî"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "Li muroe est vude"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "Li muroe est vude. Tchoezixhoz ene plaece s' i vs plait."
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "Asteme: Nou betchteu waibe di dné"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "Evoyaedje di l' apontiaedje da vosse"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "Åk n' a nén stî tot-z evoyant les informåcions"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "Åk n' a nén stî tot evoyant les informåcions personeles da vosse.\n"
+#~ "\n"
+#~ "Clitchîz so «Shuvant» po sayî dels evoyî cor on côp."
+
+#~ msgid "Finished"
+#~ msgstr "Fini"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "Tchoezixhoz vost eplaeçmint sol Daegn"
+
+#~ msgid "OK"
+#~ msgstr "'l est bon"
+
+#~ msgid "Cancel"
+#~ msgstr "Rinoncî"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "Voloz vs vormint cwiter MandrakeOnline?\n"
+#~ "Po rivni å Macrea, clitchîz so «Rinoncî»,\n"
+#~ "po moussî foû po d' bon, clitchîz so «Moussî foû»."
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "Vormint rnoncî? - MandrakeOnline"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ "Vos estoz k' enonde pol prumî côp nosse modêye Mandrake Linux Download "
+#~ "Edition\n"
+#~ "\n"
+#~ "Vos estoz dipus di troes miyons sol Daegn a-z eployî Mandrake Linux!\n"
+#~ "\n"
+#~ "S' i vs plait, prindoz kékès segondes po responde a on ptit  ploncaedje.\n"
+#~ "Les dnêyes rascodowes seront-st eployeyes seulmint po des studiaedjes di "
+#~ "martchî.\n"
+#~ "Li tecse chal pa dzo c' est l' politike di MandrakeSoft å dfait del "
+#~ "privaceye\n"
+#~ "des dnêyes personeles."
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans Italic 17"
+
+#~ msgid "Close"
+#~ msgstr "Clôre"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0db60ff0..865f80d1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2004-02-10 10:06+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -14,115 +14,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "非洲"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "亚洲"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "澳洲"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "欧洲"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "北美洲"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "南美洲"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "下一步"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "完成"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "退出"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "上一步"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "我没有 MandrakeOnline 账户, 我要"
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "订阅"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "是, 我要自动更新"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "正在退出向导\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr "空镜像"
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
-msgstr "空镜像。请选择一个位置。"
-
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "警告：未指定浏览器"
-
-#: ../mdkonline:273
-msgid "Connecting ...\n"
-msgstr "正在连接...\n"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "连接问题"
-
-#: ../mdkonline:282 ../mdkonline:347
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeOnline 无法连接到站点, 请稍后再试一次"
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "密码错误"
-
-#: ../mdkonline:294
-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)"
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
-"您的登录名或密码有错。\n"
-"不管是哪种情况，您都需要重新输入一次。不然，您就需要在 MandrakeOnline 上创建"
-"一个账户。\n"
-"如果您想要创建账户的话，请返回到第一步，以连接到 MandrakeOnline。\n"
-"请注意，您还必须提供一个机器名(只能由字母组成)"
 
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr "正在发送配置..."
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "MandrakeOnline 欢迎您"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -133,35 +33,53 @@ msgstr ""
 "的配置(软件包、硬件配置)上传到中央数据库中，这样可以保证您能够时刻收到\n"
 "安全更新和有用的升级。\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "MandrakeOnline 欢迎您"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "我没有 MandrakeOnline 账户, 我要"
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "订阅"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "登录名:"
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "密码:"
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "密码:"
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake 隐私保护政策"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "身份炎症"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "请输入您的 MandrakeOnline 登录名, 密码和机器名:"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "登录名:"
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "机器名:"
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "密码:"
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "发送您的配置"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -192,25 +110,7 @@ msgstr ""
 "到支持服务的付费折扣。\n"
 "最后，您还能得到一个 username@mandrakeonline.net 的电子邮件别名。"
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "发送信息出错"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"发送您的个人信息时出错。\n"
-"\n"
-"请按“下一步”再次尝试发送您的配置。"
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "完成"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -218,7 +118,7 @@ msgstr ""
 "从现在开始，您将能够收到 MandrakeOnline 发出的安全\n"
 "和更新通知了。"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -226,156 +126,135 @@ msgstr ""
 "MandrakeOnline 还能让您自动保持更新。您的系统中会定期运行一个特\n"
 "定的程序，该程序会自动下载并安装更新\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "您的上传已经成功!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "自动升级"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "选择您的地理位置"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "是, 我要自动更新"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "正在读取配置\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
+
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "确定"
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "取消"
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:174
+msgid "Empty Fields"
 msgstr ""
-"您真的想要中断 MandrakeOnline 吗?\n"
-"要返回到向导，请按“取消”，真的退\n"
-"出请按“退出”。"
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "真的要退出?- MandrakeOnline"
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:176
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
 msgstr ""
-"您即将首次启动我们的 Mandrake Linux 免费下载版本。\n"
-"\n"
-"全世界有超过三百万和您一样的用户选择了 Mandrake Linux!\n"
-"\n"
-"请花一点时间完成小小的问卷调查。此问卷调查所收集的数据将只会用于市场研究。\n"
-"下面说明了 MandrakeSoft 关于您个人数据的隐私保护政策。"
 
-#: ../mdkonline:576
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
+msgstr ""
+
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "完成"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "正在退出向导\n"
+
+#: ../mdkonline:252
+msgid "Connecting ...\n"
+msgstr "正在连接...\n"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "连接问题"
+
+#: ../mdkonline:261 ../mdkonline:327
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeOnline 无法连接到站点, 请稍后再试一次"
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "密码错误"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
-"我们收集什么样的私人信息?\n"
-"\n"
-"我们会在网站的不同部分收集不同的信息；\n"
-"以下列出了我们主要收集的私人信息:\n"
-"\n"
-"首先，我们将记录您的电子邮箱地址、姓名和邮政地址。\n"
-"其次，我们将给您分配唯一的顾客ID。该ID将用于用于向您的 Mandrake\n"
-"账户中添加额外信息，例如:\n"
-"    - 您订阅的邮件列表。\n"
-"    - 如果您要注册已经购买的产品，我们将会询问您的私人信息以及计\n"
-"算机系统硬件的细节。这样有助于我们为您提供最能满足您需要的支持服\n"
-"务。\n"
-"    - 在向我们捐赠的网页和我们的在线商店(MandrakeStore)中，我们\n"
-"将会记录付账用途的数据(我们不会保存任何信用卡资料)。\n"
-"\n"
-"我们将如何处置这些信息?\n"
-"\n"
-"我们不会和任何个人或公司共享任何私人信息 - 我们会严格按照以下用\n"
-"途使用这些信息:\n"
-"    - 如果您订阅了邮件列表，我们将会在我们的数据库中保留此邮件地\n"
-"址，以便能够为您提供定制的信息和/或允许您在不同的邮件列表中参与\n"
-"讨论。如果您给这样的一个列表发送邮件，其他人将会看到您的电子邮件\n"
-"地址，但是外人无法访问我们的订阅者数据库。不管在任何时候，只要您\n"
-"想要退订邮件列表，都可以使用我们相应的表格完成这一操作。\n"
-"    - 如果您在注册所购产品时提供了您的信息以便得到技术支持，我们\n"
-"将绝对将这些信息保密。除非我们的合作伙伴必须通过这些信息才能为您\n"
-"提供您所需的服务。\n"
-"    - 如果您使用了 MandrakeStore，我们也会使用您的顾客 ID 来跟踪\n"
-"您的订单，以及进行产品配送。\n"
-"    - 如果您为我们提供了营销信息，我们将仅在内部使用此信息，用以\n"
-"完善我们产品。这样无论您是否购买了我们的产品，产品都能更加满足您\n"
-"需要。\n"
-"\n"
-"如何去更改或修正您的私人信息?\n"
-"\n"
-"法国法律赋予任何人都有权利去访问、更正、编辑和(或)删除自己的私人\n"
-"信息。我们把这项权利作为一项世界上公认个人拥有的权利。您可以在任\n"
-"何履行这项权利，只需用您的顾客 ID 等入您的账户，就可编辑您的私人\n"
-"数据。您可以到该网页去登入: http://www.mandrakeonline.net"
+"您的登录名或密码有错。\n"
+"不管是哪种情况，您都需要重新输入一次。不然，您就需要在 MandrakeOnline 上创建"
+"一个账户。\n"
+"如果您想要创建账户的话，请返回到第一步，以连接到 MandrakeOnline。\n"
+"请注意，您还必须提供一个机器名(只能由字母组成)"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
-msgstr "Sans 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
+msgstr "正在发送配置..."
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "关闭"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "正在读取配置\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -433,3 +312,189 @@ msgstr "无法创建 mdkupdate 介质。\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "无法从 mdkupdate 介质中更新包。\n"
+
+#~ msgid "Africa"
+#~ msgstr "非洲"
+
+#~ msgid "Asia"
+#~ msgstr "亚洲"
+
+#~ msgid "Australia"
+#~ msgstr "澳洲"
+
+#~ msgid "Europe"
+#~ msgstr "欧洲"
+
+#~ msgid "North America"
+#~ msgstr "北美洲"
+
+#~ msgid "South America"
+#~ msgstr "南美洲"
+
+#~ msgid "Next"
+#~ msgstr "下一步"
+
+#~ msgid "Quit"
+#~ msgstr "退出"
+
+#~ msgid "Back"
+#~ msgstr "上一步"
+
+#~ msgid "Empty Mirror"
+#~ msgstr "空镜像"
+
+#~ msgid "Empty Mirror. Please choose a place."
+#~ msgstr "空镜像。请选择一个位置。"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "警告：未指定浏览器"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "发送您的配置"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "发送信息出错"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "发送您的个人信息时出错。\n"
+#~ "\n"
+#~ "请按“下一步”再次尝试发送您的配置。"
+
+#~ msgid "Finished"
+#~ msgstr "完成"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "选择您的地理位置"
+
+#~ msgid "OK"
+#~ msgstr "确定"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "您真的想要中断 MandrakeOnline 吗?\n"
+#~ "要返回到向导，请按“取消”，真的退\n"
+#~ "出请按“退出”。"
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "真的要退出?- MandrakeOnline"
+
+#~ msgid ""
+#~ " You are just starting our Free Mandrake Linux Download Edition for the "
+#~ "first time. \n"
+#~ "\n"
+#~ "There are now over three million Mandrake Linux users all over the "
+#~ "world!\n"
+#~ "\n"
+#~ "Please take a few seconds to fill a short questionnaire. The data from "
+#~ "this \n"
+#~ "questionnaire will be used only for aggregate market studies.\n"
+#~ "The text below is the privacy policy of MandrakeSoft about your personal "
+#~ "data."
+#~ msgstr ""
+#~ "您即将首次启动我们的 Mandrake Linux 免费下载版本。\n"
+#~ "\n"
+#~ "全世界有超过三百万和您一样的用户选择了 Mandrake Linux!\n"
+#~ "\n"
+#~ "请花一点时间完成小小的问卷调查。此问卷调查所收集的数据将只会用于市场研"
+#~ "究。\n"
+#~ "下面说明了 MandrakeSoft 关于您个人数据的隐私保护政策。"
+
+#~ msgid ""
+#~ "What personal data do we collect ?         \n"
+#~ "                               \n"
+#~ "Various information is collected in different areas of the website;\n"
+#~ "what follows is an overview of the data we keep:\n"
+#~ "\n"
+#~ "Firstly, we record your email address, name and postal address.\n"
+#~ "Secondly we give you a unique customer ID. This ID will be used to \n"
+#~ "add additional information related to your Mandrake account such as:\n"
+#~ "    - Your subscription to mailling lists.\n"
+#~ "    - When registering a purchased product, we ask for personal\n"
+#~ "information as well as system/hardware details so that we may deliver\n"
+#~ "the best support services customized to your needs.\n"
+#~ "    - On our donation page and on our online store (MandrakeStore), we\n"
+#~ "record data for billing purpose (we do not store any credit card data).\n"
+#~ "    \n"
+#~ "What do we do with this information?\n"
+#~ "\n"
+#~ "We never share personal information with other persons or companies -\n"
+#~ "we use this data strictly for the following purposes:\n"
+#~ "    - If you have subscribed to a mailing list, we keep this email\n"
+#~ "address in our database to provide you with customized information\n"
+#~ "and/or to enable you to participate in discussions in various mailing\n"
+#~ "lists. If you send a message to such a list, other people will see\n"
+#~ "your email address but no external parties have access to our database\n"
+#~ "of subscribers. At any time you may unsubscribe to any list by using\n"
+#~ "the appropriate form.\n"
+#~ "    - If you provide information when registering a purchased product\n"
+#~ "to receive support, we keep this information private unless the\n"
+#~ "information is required by one of our partners to deliver the support\n"
+#~ "you require.\n"
+#~ "    - If you use MandrakeStore, we also use your Customer ID to track\n"
+#~ "your order and deliver your products.\n"
+#~ "    - If you provide us with marketing information, we keep it for \n"
+#~ "internal use only in order to improve our products so that they can \n"
+#~ "better fit your needs whether you have purchased a product or not.), How "
+#~ "to change / correct your personal data?\n"
+#~ "\n"
+#~ "French law gives individuals the right to access, correct, modify or \n"
+#~ "remove their own personal data that we have on record. We offer this \n"
+#~ "as a worldwide privilege. You may execute this right at any time by \n"
+#~ "logging to your account with your customer ID and editing your\n"
+#~ "personnal data. You can log on to this page: http://www.mandrakeonline.net"
+#~ msgstr ""
+#~ "我们收集什么样的私人信息?\n"
+#~ "\n"
+#~ "我们会在网站的不同部分收集不同的信息；\n"
+#~ "以下列出了我们主要收集的私人信息:\n"
+#~ "\n"
+#~ "首先，我们将记录您的电子邮箱地址、姓名和邮政地址。\n"
+#~ "其次，我们将给您分配唯一的顾客ID。该ID将用于用于向您的 Mandrake\n"
+#~ "账户中添加额外信息，例如:\n"
+#~ "    - 您订阅的邮件列表。\n"
+#~ "    - 如果您要注册已经购买的产品，我们将会询问您的私人信息以及计\n"
+#~ "算机系统硬件的细节。这样有助于我们为您提供最能满足您需要的支持服\n"
+#~ "务。\n"
+#~ "    - 在向我们捐赠的网页和我们的在线商店(MandrakeStore)中，我们\n"
+#~ "将会记录付账用途的数据(我们不会保存任何信用卡资料)。\n"
+#~ "\n"
+#~ "我们将如何处置这些信息?\n"
+#~ "\n"
+#~ "我们不会和任何个人或公司共享任何私人信息 - 我们会严格按照以下用\n"
+#~ "途使用这些信息:\n"
+#~ "    - 如果您订阅了邮件列表，我们将会在我们的数据库中保留此邮件地\n"
+#~ "址，以便能够为您提供定制的信息和/或允许您在不同的邮件列表中参与\n"
+#~ "讨论。如果您给这样的一个列表发送邮件，其他人将会看到您的电子邮件\n"
+#~ "地址，但是外人无法访问我们的订阅者数据库。不管在任何时候，只要您\n"
+#~ "想要退订邮件列表，都可以使用我们相应的表格完成这一操作。\n"
+#~ "    - 如果您在注册所购产品时提供了您的信息以便得到技术支持，我们\n"
+#~ "将绝对将这些信息保密。除非我们的合作伙伴必须通过这些信息才能为您\n"
+#~ "提供您所需的服务。\n"
+#~ "    - 如果您使用了 MandrakeStore，我们也会使用您的顾客 ID 来跟踪\n"
+#~ "您的订单，以及进行产品配送。\n"
+#~ "    - 如果您为我们提供了营销信息，我们将仅在内部使用此信息，用以\n"
+#~ "完善我们产品。这样无论您是否购买了我们的产品，产品都能更加满足您\n"
+#~ "需要。\n"
+#~ "\n"
+#~ "如何去更改或修正您的私人信息?\n"
+#~ "\n"
+#~ "法国法律赋予任何人都有权利去访问、更正、编辑和(或)删除自己的私人\n"
+#~ "信息。我们把这项权利作为一项世界上公认个人拥有的权利。您可以在任\n"
+#~ "何履行这项权利，只需用您的顾客 ID 等入您的账户，就可编辑您的私人\n"
+#~ "数据。您可以到该网页去登入: http://www.mandrakeonline.net"
+
+#~ msgid "Sans Italic 17"
+#~ msgstr "Sans 17"
+
+#~ msgid "Close"
+#~ msgstr "关闭"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4c1801bb..b3f40e46 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-06 17:37+0100\n"
+"POT-Creation-Date: 2004-02-16 22:53+0100\n"
 "PO-Revision-Date: 2003-11-30 19:38+0800\n"
 "Last-Translator: hilbert <freehil@yahoo.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -18,117 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../mdkonline:64
-msgid "Africa"
-msgstr "非洲"
-
-#: ../mdkonline:65
-msgid "Asia"
-msgstr "亞洲"
-
-#: ../mdkonline:66
-msgid "Australia"
-msgstr "澳洲"
-
-#: ../mdkonline:67
-msgid "Europe"
-msgstr "歐洲"
-
-#: ../mdkonline:68
-msgid "North America"
-msgstr "北美"
-
-#: ../mdkonline:69
-msgid "South America"
-msgstr "南美"
-
-#: ../mdkonline:87 ../mdkonline:201 ../mdkonline:234
-msgid "Next"
-msgstr "下一步"
-
-#: ../mdkonline:88
-msgid "Finish"
-msgstr "完成"
-
-#: ../mdkonline:89 ../mdkonline:531
-msgid "Quit"
-msgstr "結束"
-
-#: ../mdkonline:90 ../mdkonline:202 ../mdkonline:236 ../mdkonline:238
-msgid "Back"
-msgstr "上一步"
-
-#: ../mdkonline:92
-msgid "I don't have a MandrakeOnline account and I want to "
-msgstr "我還沒有 Mandrake Online 的帳號，我希望要 "
-
-#: ../mdkonline:93
-msgid "Subscribe"
-msgstr "註冊"
-
-#: ../mdkonline:109
-msgid "Yes I want automated updates"
-msgstr "我希望使用自動化更新"
-
-#: ../mdkonline:150
-msgid "Quitting Wizard\n"
-msgstr "正在結束設定精靈\n"
-
-#: ../mdkonline:164
-msgid "Empty Mirror"
-msgstr ""
-
-#: ../mdkonline:164
-msgid "Empty Mirror. Please choose a place."
+#: ../mdkonline:85
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:248
-msgid "Warning: No browser specified"
-msgstr "緊告: 沒有指定瀏覽器"
-
-#: ../mdkonline:273
-#, fuzzy
-msgid "Connecting ...\n"
-msgstr "連線問題"
-
-#: ../mdkonline:282 ../mdkonline:347 ../mdkupdate:169
-msgid "Connection problem"
-msgstr "連線問題"
-
-#: ../mdkonline:282 ../mdkonline:347
-#, fuzzy
-msgid "MandrakeOnline could not be contacted, please try again at a later time"
-msgstr "MandrakeUpdate 無法聯絡到網站, 我們將再試."
-
-#: ../mdkonline:294
-msgid "Wrong password"
-msgstr "密碼錯誤"
-
-#: ../mdkonline:294
-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)"
-msgstr ""
-"您所輸入的登入 ID 或者是密碼有誤導致無法登入。\n"
-"請重新確定您所輸入的登入資訊，或者是您尚未\n"
-"註冊，請先註冊一個新帳號再使用。\n"
-"請回到主畫面程式重新進行操作，以便於能夠連上\n"
-"Mandrake Online 服務。"
-
-#: ../mdkonline:320
-msgid "Sending configuration..."
-msgstr ""
-
-#: ../mdkonline:356
+#: ../mdkonline:99
 msgid "Welcome to MandrakeOnline"
 msgstr "歡迎來到 MandrakeOnline"
 
-#: ../mdkonline:357
+#: ../mdkonline:100
 msgid ""
 "At this step You are supposed to have an account on MandrakeOnline.\n"
 "This assistant will help you to upload your configuration\n"
@@ -142,35 +40,53 @@ msgstr ""
 "這個步驟完成後，就能夠提供您相關的安全公告以及套件更新\n"
 "等資訊。\n"
 
-#: ../mdkonline:374
+#: ../mdkonline:101
+#, fuzzy
+msgid "Create a MandrakeOnline Account"
+msgstr "歡迎來到 MandrakeOnline"
+
+#: ../mdkonline:103
+msgid "I don't have a MandrakeOnline account and I want to "
+msgstr "我還沒有 Mandrake Online 的帳號，我希望要 "
+
+#: ../mdkonline:103
+msgid "Subscribe"
+msgstr "註冊"
+
+#: ../mdkonline:107 ../mdkonline:127
+msgid "Login:"
+msgstr "帳號："
+
+#: ../mdkonline:108 ../mdkonline:128
+msgid "Password:"
+msgstr "    密碼："
+
+#: ../mdkonline:109
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "    密碼："
+
+#: ../mdkonline:110
+msgid "Mail contact:"
+msgstr ""
+
+#: ../mdkonline:117
 msgid "Mandrake Privacy Policy"
 msgstr "Mandrake 隱私政策"
 
-#: ../mdkonline:379
+#: ../mdkonline:123
 msgid "Authentification"
 msgstr "認證確認"
 
-#: ../mdkonline:380
+#: ../mdkonline:124
 msgid "Enter your MandrakeOnline login, password and machine name:"
 msgstr "請輸入您在 MandrakeOnline 上的帳號 ID 與密碼"
 
-#: ../mdkonline:382
-msgid "Login:"
-msgstr "帳號："
-
-#: ../mdkonline:382
+#: ../mdkonline:129
 msgid "Machine name:"
 msgstr "機器名稱："
 
-#: ../mdkonline:382
-msgid "Password:"
-msgstr "    密碼："
-
-#: ../mdkonline:387
-msgid "Sending your Configuration"
-msgstr "正送出您的組態內容"
-
-#: ../mdkonline:388
+#: ../mdkonline:135
 msgid ""
 "In order to benefit from MandrakeOnline services,\n"
 "we are about to upload your configuration.\n"
@@ -206,25 +122,7 @@ msgstr ""
 "當整個步驟都完成後，Mandrake 將回提供一個 username@mandrakeonline.net\n"
 "的使用者帳好提供給您使用。"
 
-#: ../mdkonline:396
-msgid "Error while sending informations"
-msgstr "送出資訊時發生錯誤"
-
-#: ../mdkonline:397
-msgid ""
-"There was an error while sending your personal informations.\n"
-"\n"
-"Press Next to try and send your configuration again."
-msgstr ""
-"送出您個人資訊時發生了錯誤導致發送失敗。\n"
-"\n"
-"請等等重新再測試發送您個人資訊。"
-
-#: ../mdkonline:403
-msgid "Finished"
-msgstr "完成了"
-
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to MandrakeOnline."
@@ -232,7 +130,7 @@ msgstr ""
 "現在開始，您將會不定期的收到來自於MandrakeOnline\n"
 "發送的安全與更新修正套件公告資訊。"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid ""
 "MandrakeOnline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -240,111 +138,137 @@ msgstr ""
 "MandrakeOnline 提供讓您能夠自動進行更新動作。\n"
 "系統將會定期的執行更新程式檢查最新的更新資訊\n"
 
-#: ../mdkonline:404
+#: ../mdkonline:141
 msgid "Your upload was successful!"
 msgstr "已經成功上傳資訊!"
 
-#: ../mdkonline:409
+#: ../mdkonline:142
 msgid "automated Upgrades"
 msgstr "自動升級"
 
-#: ../mdkonline:417
-msgid "Choose your geographical location"
-msgstr "選擇您的區域位置"
+#: ../mdkonline:144
+msgid "Yes I want automated updates"
+msgstr "我希望使用自動化更新"
 
-#: ../mdkonline:435
-msgid "Reading configuration\n"
-msgstr "正在讀取組態設定\n"
+#: ../mdkonline:147
+msgid "Country:"
+msgstr ""
 
-#: ../mdkonline:512
-msgid "OK"
-msgstr "確定"
+#: ../mdkonline:172
+msgid "Creation"
+msgstr ""
 
-#: ../mdkonline:528
-msgid "Cancel"
-msgstr "取消"
+#: ../mdkonline:172
+msgid "Login and Password should be < 12 characters\n"
+msgstr ""
 
-#: ../mdkonline:534
-msgid ""
-"Do you really want to abort MandrakeOnline?\n"
-"To return to the Wizard press 'Cancel',\n"
-"to really quit it press 'Quit'."
+#: ../mdkonline:173
+msgid "Special Characters"
+msgstr ""
+
+#: ../mdkonline:173
+msgid "Special Characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Empty Fields"
+msgstr ""
+
+#: ../mdkonline:174
+msgid "Please fill up all fields\n"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email"
+msgstr ""
+
+#: ../mdkonline:175
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline:176
+msgid "Account already exist\n"
 msgstr ""
-"您確定要取消 MandrakeOnline 的執行嗎？\n"
-"返回到原本精靈畫面，請按下 \"取消\" 按鈕，\n"
-"或者是可以選取 \"結束\" 來關閉程式。"
 
-#: ../mdkonline:535
-msgid "Really abort? - MandrakeOnline"
-msgstr "確定要結束？ - MandrakeOnline"
+#: ../mdkonline:176
+msgid "Change account"
+msgstr ""
+
+#: ../mdkonline:181
+msgid "Problem connecting to server \n"
+msgstr ""
 
-#: ../mdkonline:567
+#: ../mdkonline:181
+msgid "Server Problem"
+msgstr ""
+
+#: ../mdkonline:186 ../mdkonline:188 ../mdkonline:190
+msgid "Error"
+msgstr ""
+
+#: ../mdkonline:186
+msgid "Please provide a login"
+msgstr ""
+
+#: ../mdkonline:188
 msgid ""
-" You are just starting our Free Mandrake Linux Download Edition for the "
-"first time. \n"
-"\n"
-"There are now over three million Mandrake Linux users all over the world!\n"
-"\n"
-"Please take a few seconds to fill a short questionnaire. The data from "
-"this \n"
-"questionnaire will be used only for aggregate market studies.\n"
-"The text below is the privacy policy of MandrakeSoft about your personal "
-"data."
+"The passwords do not match\n"
+" Please try again\n"
+msgstr ""
+
+#: ../mdkonline:190
+msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:576
+#: ../mdkonline:210
+msgid "Finish"
+msgstr "完成"
+
+#: ../mdkonline:227
+msgid "Quitting Wizard\n"
+msgstr "正在結束設定精靈\n"
+
+#: ../mdkonline:252
+#, fuzzy
+msgid "Connecting ...\n"
+msgstr "連線問題"
+
+#: ../mdkonline:261 ../mdkonline:327 ../mdkupdate:169
+msgid "Connection problem"
+msgstr "連線問題"
+
+#: ../mdkonline:261 ../mdkonline:327
+#, fuzzy
+msgid "MandrakeOnline could not be contacted, please try again at a later time"
+msgstr "MandrakeUpdate 無法聯絡到網站, 我們將再試."
+
+#: ../mdkonline:273
+msgid "Wrong password"
+msgstr "密碼錯誤"
+
+#: ../mdkonline:273
 msgid ""
-"What personal data do we collect ?         \n"
-"                               \n"
-"Various information is collected in different areas of the website;\n"
-"what follows is an overview of the data we keep:\n"
-"\n"
-"Firstly, we record your email address, name and postal address.\n"
-"Secondly we give you a unique customer ID. This ID will be used to \n"
-"add additional information related to your Mandrake account such as:\n"
-"    - Your subscription to mailling lists.\n"
-"    - When registering a purchased product, we ask for personal\n"
-"information as well as system/hardware details so that we may deliver\n"
-"the best support services customized to your needs.\n"
-"    - On our donation page and on our online store (MandrakeStore), we\n"
-"record data for billing purpose (we do not store any credit card data).\n"
-"    \n"
-"What do we do with this information?\n"
-"\n"
-"We never share personal information with other persons or companies -\n"
-"we use this data strictly for the following purposes:\n"
-"    - If you have subscribed to a mailing list, we keep this email\n"
-"address in our database to provide you with customized information\n"
-"and/or to enable you to participate in discussions in various mailing\n"
-"lists. If you send a message to such a list, other people will see\n"
-"your email address but no external parties have access to our database\n"
-"of subscribers. At any time you may unsubscribe to any list by using\n"
-"the appropriate form.\n"
-"    - If you provide information when registering a purchased product\n"
-"to receive support, we keep this information private unless the\n"
-"information is required by one of our partners to deliver the support\n"
-"you require.\n"
-"    - If you use MandrakeStore, we also use your Customer ID to track\n"
-"your order and deliver your products.\n"
-"    - If you provide us with marketing information, we keep it for \n"
-"internal use only in order to improve our products so that they can \n"
-"better fit your needs whether you have purchased a product or not.), How to "
-"change / correct your personal data?\n"
-"\n"
-"French law gives individuals the right to access, correct, modify or \n"
-"remove their own personal data that we have on record. We offer this \n"
-"as a worldwide privilege. You may execute this right at any time by \n"
-"logging to your account with your customer ID and editing your\n"
-"personnal data. You can log on to this page: http://www.mandrakeonline.net"
+"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 ""
+"您所輸入的登入 ID 或者是密碼有誤導致無法登入。\n"
+"請重新確定您所輸入的登入資訊，或者是您尚未\n"
+"註冊，請先註冊一個新帳號再使用。\n"
+"請回到主畫面程式重新進行操作，以便於能夠連上\n"
+"Mandrake Online 服務。"
 
-#: ../mdkonline:623
-msgid "Sans Italic 17"
+#: ../mdkonline:300
+msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:641
-msgid "Close"
-msgstr "關閉"
+#: ../mdkonline:335
+msgid "Reading configuration\n"
+msgstr "正在讀取組態設定\n"
 
 #: ../mdkupdate:43
 #, perl-format
@@ -402,3 +326,75 @@ msgstr "無法建立 mdkupdate 媒體.\n"
 #: ../mdkupdate:210
 msgid "Unable to update packages from mdkupdate medium.\n"
 msgstr "無法由 mdkupdate 媒體更新套件.\n"
+
+#~ msgid "Africa"
+#~ msgstr "非洲"
+
+#~ msgid "Asia"
+#~ msgstr "亞洲"
+
+#~ msgid "Australia"
+#~ msgstr "澳洲"
+
+#~ msgid "Europe"
+#~ msgstr "歐洲"
+
+#~ msgid "North America"
+#~ msgstr "北美"
+
+#~ msgid "South America"
+#~ msgstr "南美"
+
+#~ msgid "Next"
+#~ msgstr "下一步"
+
+#~ msgid "Quit"
+#~ msgstr "結束"
+
+#~ msgid "Back"
+#~ msgstr "上一步"
+
+#~ msgid "Warning: No browser specified"
+#~ msgstr "緊告: 沒有指定瀏覽器"
+
+#~ msgid "Sending your Configuration"
+#~ msgstr "正送出您的組態內容"
+
+#~ msgid "Error while sending informations"
+#~ msgstr "送出資訊時發生錯誤"
+
+#~ msgid ""
+#~ "There was an error while sending your personal informations.\n"
+#~ "\n"
+#~ "Press Next to try and send your configuration again."
+#~ msgstr ""
+#~ "送出您個人資訊時發生了錯誤導致發送失敗。\n"
+#~ "\n"
+#~ "請等等重新再測試發送您個人資訊。"
+
+#~ msgid "Finished"
+#~ msgstr "完成了"
+
+#~ msgid "Choose your geographical location"
+#~ msgstr "選擇您的區域位置"
+
+#~ msgid "OK"
+#~ msgstr "確定"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid ""
+#~ "Do you really want to abort MandrakeOnline?\n"
+#~ "To return to the Wizard press 'Cancel',\n"
+#~ "to really quit it press 'Quit'."
+#~ msgstr ""
+#~ "您確定要取消 MandrakeOnline 的執行嗎？\n"
+#~ "返回到原本精靈畫面，請按下 \"取消\" 按鈕，\n"
+#~ "或者是可以選取 \"結束\" 來關閉程式。"
+
+#~ msgid "Really abort? - MandrakeOnline"
+#~ msgstr "確定要結束？ - MandrakeOnline"
+
+#~ msgid "Close"
+#~ msgstr "關閉"