merge new tool mdkonline_tui

68 files changed, 16478 insertions, 4474 deletions

diff --git a/po/af.po b/po/af.po
index 200a6b3f..aab0a2e4 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-af\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-02-27 21:12+0200\n"
 "Last-Translator: Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
 "Language-Team: Afrikaans\n"
@@ -17,226 +17,271 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Vir enige probleem stuur 'n e-pos na support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Installeer updaterings"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Konfigureer die Netwerk"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Kyk vir Opdaterings"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Aanlyn Webwerf"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Konfigureer die Netwerk"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Konfigureer"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Updates Applet"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Aksies"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Konfigureer"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "Kyk vir Opdaterings"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Bekyk staaflêers"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Status"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Maak toe"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Af"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Netwerk konneksie: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Op"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Af"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Laaste gemerk: "
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Nuwe Opdaterings: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Kyk vir Opdaterings"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Konneksie probleem"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr ""
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Verkeerde wagwoord\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
 #: ../mdkapplet:348
-#, fuzzy
+#, fuzzy, c-format
 msgid "No check"
 msgstr "Laaste gemerk: "
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Staaflêers"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Maak skoon"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Omtrent.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Eindig"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Volgende"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Vorige"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Verlaar Wysgeer"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Vorige"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Welkom by Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -246,56 +291,68 @@ msgstr ""
 "(pakkette, hardeware konfigurasie) na 'n sentrale databasis sodat\n"
 "jy op datum gehou kan word met sekuriteit en ander waardevolle nuus.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Skep 'n Mandrakeonline Rekening"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Ek het nie 'n Mandrakeonline rekening nie en ek wil "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Inskryf"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Inteken:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Bevestig Wagwoord:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "E-pos kontak:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux se Privaatheidsbeleid"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Identifikasie"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Sleutel in jou Mandrakeonline inteken, wagwoord, en masjiennaam:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Masjiennaam:"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Konfigurasie"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -329,11 +386,18 @@ msgstr ""
 "Laastens, jy sal 'n e-pos alias kry in die vorm\n"
 "   you-naam@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Klaar"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Die oplaai was suksesvol!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -341,7 +405,8 @@ msgstr ""
 "Van nou af sal jy sekuritiets en opgradeerings nuus kry\n"
 "vanaf Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -349,27 +414,28 @@ msgstr ""
 "Mandrakeonline gee jou die vermoë op die opgradeerings te automatiseer.\n"
 "'n Program sal gereeld op jou stelsel loop en wag vir nuwe opgradeerings\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Die oplaai was suksesvol!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatiese Upgradëerings"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Land:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Fout"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Voorsien u aantekennaam"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -378,38 +444,48 @@ msgstr ""
 "probeer weer\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Nie-geldige e-pos adres!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Lees konfigurasie\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Stuur konfigurasie..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Konneksie probleem"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Beëndig Assistent\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeupdate kon nie die webruimte kontak nie, ons sal weer probeer"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Verkeerde wagwoord"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -426,8 +502,83 @@ msgstr ""
 "spesifiseer\n"
 "(net alfabetiese karakters word toegelaat)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "Anntekennaam en wagwoord moet minder as 12 karakters wees\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Spesiale karakters word nie geduld nie\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Voorsien asselbief alle velde\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "e-pos nie geldig nie\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "Rekening bestaan reeds\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Probleem om na bediener te konnekteer\n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Welkom by Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Welkom by Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Verkeerde wagwoord"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Land:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -443,24 +594,53 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - loods MandrakeUpdate.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - loods Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - loods Mandrakeupdate.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate kon nie die webruimte kontak nie, ons sal weer probeer"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Kon nie pakette vanaf mdkupdate media opgradeer nie.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Launch Mandrakelinux Update"
 #~ msgstr "Loods \"Mandrakelinux Update\""
 
@@ -480,42 +660,21 @@ msgstr "  --update       - loods Mandrakeupdate.\n"
 #~ msgid "Creation"
 #~ msgstr "Skep"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "Anntekennaam en wagwoord moet minder as 12 karakters wees\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Spesiale karakters"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Spesiale karakters word nie geduld nie\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Leë velde"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Voorsien asselbief alle velde\n"
-
 #~ msgid "Email"
 #~ msgstr "e-pos"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "e-pos nie geldig nie\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "Rekening bestaan reeds\n"
-
 #~ msgid "Change account"
 #~ msgstr "Verander rekening"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Probleem om na bediener te konnekteer\n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Bediener probleem"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Kon nie pakette vanaf mdkupdate media opgradeer nie.\n"
-
 #, fuzzy
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Welkom by Mandrakeonline"
@@ -527,10 +686,6 @@ msgstr "  --update       - loods Mandrakeupdate.\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Ja ek soek automatiese nuus"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "Mandrakeupdate kon nie die webruimte kontak nie, ons sal weer probeer"
-
 #~ msgid "Register Now!"
 #~ msgstr "Registreer Nou!"
 
diff --git a/po/ar.po b/po/ar.po
index 0d0541e9..a77321de 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-23 03:49+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabeyes <support@arabeyes.org>\n"
@@ -20,10 +20,12 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "النّظام محدّث"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -32,150 +34,188 @@ msgstr ""
 "net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "النّظام مشغول. رجاء الانتظار..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "هناك تحديثات متوفّرة لنظامك"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "الخدمة غير مهيّئة. رجاء اضغط على  \"تهيئة الخدمة\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "الشّبكة متوقّفة. رجاء هيّئ شبكتك"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "الخدمة غير مُنشَّطة. رجاء اضغط على \"موقع الإنترنت\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
-msgstr "هذه الإصدارة غير مدعومة (إما بسبب أنها قديماً جداً، أو أنها إصدارة تطويريّة)"
+msgstr ""
+"هذه الإصدارة غير مدعومة (إما بسبب أنها قديماً جداً، أو أنها إصدارة تطويريّة)"
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "ثبّت التّحديثات"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "تهيئة الخدمة"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "إفحص التّحديثات"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "موقع على الخطّ"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "أعدّ الشّبكة"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "أعدّ الآن !"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "بريمج تحديثات ماندريك لينكس"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "الأفعال"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "أعدّ"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "إفحص التّحديثات"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "شاهد السّجلّات"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "الحالة"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "إغلق"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "أسفل"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "وصلة الشّبكة: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "أعلى"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "أسفل"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "آخر فحص: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "تحديثات: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "يجري إطلاق دراكونكت (drakconnect)\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "يجري إطلاق محدّث ماندريك --بريمج (mdkupdate --applet)\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "يبدو أنّ ماندريك أُنلاين  مثبّت من جديد،ياجريإعادة  تحميل البريمج..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "يجري حساب التّحديثات الجديدة...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "الإتّصال بـ"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "يجري الفحص... التّحديثات متوفّرة\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "إصدارة تطويريّة غير مدعومة من قبل الخدمة"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "إصدارة قديمة جداً غير مدعومة من قبل الخدمة"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "حالة مجهولة"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "الخدمات على الخطّ معطّلة. اتّصل بموقع ماندريك أُنلاين\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "كلمة مرور خاطئة.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "فعل أو مضيف أو إسم دخول خاطئ.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -184,58 +224,72 @@ msgstr ""
 "البروكسي الخاصّة بك)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "النّظام محدّث\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "دون فحص"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "يجري فحص الشّبكة: تبدو معطّلة\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "يجري فحص ملفّ الإعداد: غير موجود\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "السّجلّات"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "إمحي"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "حَوْل..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "أطلق دوما عند البدأ"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "خروج"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "التالي"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "السابق"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "اجتياز المعالج"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "السابق"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "أهلا بكم في ماندريك أُنلاين"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -245,55 +299,68 @@ msgstr ""
 "(الحزم، تهيئة العتاد) إلى قاعدة بيانات مركزية كي\n"
 "يتسنى لك أن تعلم بالتحديثات الأمنية و الترقيات المفيدة.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "إنشاء حساب في ماندريك أُنلاين"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "ليس لدي حساب في ماندريك أُنلاين و أريد أن"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "إشترك"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "إسم الدّخول:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "كلمة المرور:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "أكّد كلمة المرور:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "بريد الاتّصال:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "سياسة السّرّية لماندريك لينكس"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "التّحقّق من الأصالة"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "أدخل اسم الدخول الخاص بماندريك أُنلاين، وكلمة المرور واسم الماكينة:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "إسم الماكنة:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "إبعث الإعداد"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -326,11 +393,18 @@ msgstr ""
 "www.mandrakeexpert.com.\n"
 "أخيرا، سيوفّر لك بريد إلكتروني على شكل username@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "إنهي"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "تم التحميل بنجاحك!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -338,7 +412,8 @@ msgstr ""
 "من الآن ستستلم اشعارات بالترقيات\n"
 "و التحديثات الأمنية بفضل ماندريك أنلاين."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -347,27 +422,28 @@ msgstr ""
 "\n"
 "سيعمل برنامج بانتظام على نظامك منتظرا تحديثات جديدة\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "تم التحميل بنجاحك!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "تحديثات آلية"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "البلد:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "خطأ"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "أعط اسم الدّخول من فضلك"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -376,38 +452,48 @@ msgstr ""
 "كرّر المحاولة من فضلك\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "عنوان بريدي غير صالح !\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "جاري قراءة اعداداتك\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "يجري بعث الإعداد..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "مشكلة في الإتصال"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "يحدث مشكل عند تحميل الملفّات، حاول مجدّدا من فضلك"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "جاري الخروج من المعالج\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "تعذّر الإتّصال بـماندريك أنلاين. يرجى تجديد المحاولة فيما بعد"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "كلمة مرور خاطئة"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -423,8 +509,83 @@ msgstr ""
 " عليك أن تكتب إسم الماكينة أيضا \n"
 " (تقبل فقط الحروف الأبجدية)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "أهلا بكم في ماندريك أُنلاين"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "أهلا بكم في ماندريك أُنلاين"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "كلمة مرور خاطئة"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "البلد:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -439,19 +600,49 @@ msgstr ""
 "\n"
 "الاستعمال:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - إظهار رسالة المساعدة هذه.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - تشغيل ماندريك أبدايت تلقائيّاً.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - تشغيل ماندريك أبدايت.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - تحديث  المفاتيح\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "تعذّر الإتّصال بـماندريك أنلاين. يرجى تجديد المحاولة فيما بعد"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/az.po b/po/az.po
index 1556ba3b..3143c882 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-12 19:12+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -17,10 +17,12 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Sisteminiz yenidir"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -29,152 +31,189 @@ msgstr ""
 "support@mandrakeonline.net ünvanına məktub göndərin."
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistem məşğuldur. Xahiş edirik gözləyin..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Sisteminiz üçün yeniləmələr mövcuddur"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Xidmət quraşdırılmayıb. Xahiş edirik \"Xidməti quraşdır\" düyməsinə basın"
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Şəbəkə fəal deyil. Xahiş edirik şəbəkənizi quraşdırın"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "Xidmət fəallaşdırılmayıb. Xahiş edirik \"Online Veb Saytı\" düyməsinə basın"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Yeniləmələri qur"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Xidməti quraşdır"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Yeniləmələri Yoxla"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Onlayn Veb Saytı"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Şəbəkəni Quraşdır"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "İndi Quraşdır!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Yeniləmələr Appleti"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Gedişatlar"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Quraşdır"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Yeniləmələri yoxla"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Qeydləri qöstər"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Vəziyyət"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Bağla"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "İşləmir"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Şəbəkə Bağlantısı:"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Fəal"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "İşləmir"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Son yoxlama:"
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Yeniləmələr:"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect başladılır\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "mdkupdate --applet başladılır\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline yenidən qurulub, applet yenidən yüklənir ..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Yeniləmələr hesablanır...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Bağlanır"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Yoxlanır... Yeniləmələr mövcuddur\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Naməlum vəziyyət"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online xidmətlər qeyri-fəaldır. Mandrakeonline ilə əlaqə qurun\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Səhv Şifrə.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Səhv gedişat, qovşaq ya da giriş.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -183,58 +222,72 @@ msgstr ""
 "qurğularınızı yoxlayın)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem yenidir\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Yoxlama"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Şəbəkə Yoxlanır: deyəsən qeyri-fəaldır\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Quraşdırma faylı Yoxlanır: Mövcud deyil\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Qeydlər"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Təmizlə"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Haqqında..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Həmişə başlanğıcda işə sal"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Çıx"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Sonrakı"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Əvvəlki"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Sehirbazı Keç"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Əvvəlki"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Mandrakeonline-a Xoş Gəldiniz"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -245,55 +298,68 @@ 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:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Mandrakeonline Hesabı Yaradılır"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Mandrakeonline hesabım yoxdur və olmasını istəyirəm "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Qeyd Ol"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Giriş Adı:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Parol:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Şifrənin Təstiqi:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Poçt əlaqəsi:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux Mülkiyyət Siyasəti"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Tanıtma"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Mandrakeonline giriş adı, parolunuzu və kompüter adını girin:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Kompüter adı:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Qurğuları Göndər"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -327,11 +393,18 @@ 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:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Qurtar"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Sizin yollamanız müvəffəqiyyətli oldu"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -339,7 +412,8 @@ msgstr ""
 "İndidən etibarən Mandrakeonline vasitəsilə güncəlləmə və\n"
 "təhlükəsizlik elanları alacaqsınız."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -348,27 +422,28 @@ msgstr ""
 "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:144
-msgid "Your upload was successful!"
-msgstr "Sizin yollamanız müvəffəqiyyətli oldu"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "avtomatik Yüksəltmələr"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Ölkə:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Xəta"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Xahiş edirik istifadəçi adı bildirin"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -377,40 +452,50 @@ msgstr ""
 " Xahiş edirik yenidən sınayın\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Hökmsüz epoçt ünvanı!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Qurğularınız oxunur\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Qurğular yollanır..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Bağlantı problemi"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 "Fayllar göndərilirkən xəta yaranır, xahiş edirik daha sonra yenidən sınayın"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Sehirbazdan Çıxılır\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Mandrakeonline ilə əlaqə qurula bilmədi, xahiş edirik daha sonra sınayın"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Səhv parol"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -427,8 +512,83 @@ msgstr ""
 " Yaddan çıxartmayın ki, ayrıca KOMPÜTER adını \n"
 " girməlisiniz (təkcə hərflərə icazə verilir)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline-a Xoş Gəldiniz"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline-a Xoş Gəldiniz"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Səhv parol"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Ölkə:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -443,18 +603,50 @@ msgstr ""
 "\n"
 "istifadə qaydası:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - bu yardım ismarışını göstər.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate launched automatically.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - launch Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Update keys\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Mandrakeonline ilə əlaqə qurula bilmədi, xahiş edirik daha sonra sınayın"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 1a1d50be..fce4c707 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\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"
@@ -16,225 +16,271 @@ msgstr ""
 "X-Generator: KBabel 1.0\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Ако има проблем,изпратете поща на support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Инсталиране на обновления"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Конфигурарай"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr ""
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr ""
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Прочитам вашата конфигурация\n"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Политика на Мандраке относно сигурността"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Действия"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Конфигурарай"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr ""
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr ""
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Статус"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Затвори"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Долу"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr ""
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Горе"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Долу"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr ""
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Проблем с връзката"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Проблем с връзката"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr ""
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Грешна парола\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Логове"
 
 #: ../mdkapplet:428
-#, fuzzy
+#, fuzzy, c-format
 msgid "Clear"
 msgstr "Календар"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Относно..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Изход"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Нататък"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Предишен"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Прескача помощника"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Предишен"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Добре дошли в Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -244,57 +290,68 @@ msgstr ""
 "(пакети и хардуерни настройки) в централизираната база данни,за да\n"
 "ви държим в течение относно необходими обновявания и полезни новости.\n"
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Добре дошли в Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Не съм член на Mandrakeonline,а искам да стана"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Абонирай"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Име:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Потвърди парола:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Политика на Мандраке относно сигурността"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Проверка"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Въведете вашите Mandrakeonline име,парола и псевдоним на машината:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Име на Машината:"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Прочитам вашата конфигурация\n"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -329,11 +386,18 @@ msgstr ""
 "mandrakeexpert.com.\n"
 "И още - ще Ви запазим е-адрес с Вашето потребителско име@mandrakeonline.net"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Край"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Изпращането бе успешно!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -341,7 +405,8 @@ msgstr ""
 "От сега нататък,Вие ще получавате информация\n"
 "относно сигурността и новостите,благодарение на Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -349,27 +414,28 @@ msgstr ""
 "Mandrakeonline ви предлага автоматизиране на обновлението.\n"
 "Програмата ще се пуска регулярно на системата Ви и ще следи за обновявания\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Изпращането бе успешно!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "автоматизирани обновявания"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Страна:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Грешка"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr ""
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -378,39 +444,48 @@ msgstr ""
 " Моля опитайте отново\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Невалиден адрес за е-поща!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Прочитам вашата конфигурация\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Проблем с връзката"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Излизам\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Не можах да се свържа с Mandrakeonline,моля опитайте по-късно."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Грешна парола"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -427,8 +502,83 @@ msgstr ""
 "Знайте,че ще трябва също да зададете име на Машината \n"
 " (само букви се признават)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Проблем при свързване със сървъра \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Добре дошли в Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Добре дошли в Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Грешна парола"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Страна:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -444,25 +594,53 @@ msgstr ""
 "\n"
 "начин на ползване:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr " --help         - показва това помощно съобщение.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - обновява цялата информация.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - обновява цялата информация.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - обновява цялата информация.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Не можах да се свържа с Mandrakeonline,моля опитайте по-късно."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Не мога да обновя пакети от източник mdkupdate.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Configuration"
 #~ msgstr "Прочитам вашата конфигурация\n"
@@ -474,12 +652,6 @@ msgstr "  --applet       - обновява цялата информация.\n
 #~ msgid "Email"
 #~ msgstr "Ел. поща"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Проблем при свързване със сървъра \n"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Не мога да обновя пакети от източник mdkupdate.\n"
-
 #, fuzzy
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Добре дошли в Mandrakeonline"
@@ -491,9 +663,6 @@ msgstr "  --applet       - обновява цялата информация.\n
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Да,искам автоматично обновяване"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Не можах да се свържа с Mandrakeonline,моля опитайте по-късно."
-
 #, fuzzy
 #~ msgid "Mandrakelinux Online Team"
 #~ msgstr "Добре дошли в Mandrakeonline"
diff --git a/po/bn.po b/po/bn.po
index 61bf2823..11c80f0e 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-14 18:00+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -17,10 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "আপনার সিষ্টেম আপ-টু-ডেট আছে"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -29,155 +31,192 @@ msgstr ""
 "support@mandrakeonline.net এ মেইল করুন"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "সিষ্টেম বর্তমানে ব্যস্ত রয়েছে। অনুগ্রহ করে অপেক্ষা করুন..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "আপনার সিষ্টেমের জন্য নতুন আপডেট উপস্হিত আছে"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "পরিসেবা (service) বর্তমানে কনফিগার করা নেই। অনুগ্রহ করে \"পরিসেবাটি কনফিগার করো"
 "\"-এ ক্লিক করুন"
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "নেটওয়ার্ক বর্তমানে বন্ধ আছে। অনুগ্রহ করে আপনার নেটওয়ার্ক কনফিগার করুন"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "পরিসেবা (service) বর্তমানে সক্রিয় নেই। অনুগ্রহ করে \"অনলাইন ওয়েবসাইট\"-এ ক্লিক করুন"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "আপডেট গুলো ইনষ্টল করো"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "পরিসেবাটি কনফিগার করো"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "আপডেট পরীক্ষা করো"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "অনলাইন ওয়েবসাইট"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "নেটওয়ার্ক কনফিগার করো"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "এক্ষুনি কনফিগার করো!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "ম্যান্ড্রেক আপডেট অ্যাপ্লেট"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "কার্য"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "কনফিগার"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "আপডেট পরীক্ষা করো"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "লগ দেখুন"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "অবস্থা"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "বন্ধ"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "নিচে"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "নেটওয়ার্ক সংযোগ: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "উপরে"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "নিচে"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "সর্বশেষ পরীক্ষা: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "আপডেট সমুহ: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect চালু করা হচ্ছে\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "mdkupdate --applet চালু করা হচ্ছে\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "মনে হচ্ছে Mandrakeonline পুনরায় ইনষ্টল করা হয়েছে, পুনরায় applet চালানো হচ্ছে ...."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "নতুন আপডেট পরীক্ষা করা হচ্ছে...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "এর সাথে সংযোগ করা হচ্ছে"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "পরীক্ষা চলছে... আপডেট পাওয়া গেছে\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "অজ্ঞাত অবস্হা"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "অনলাইন পরিসেবা নিষ্ক্রিয় করা রয়েছে। ম্যান্ড্রেকঅনলাইন সাইটের সাথে যোগাযোগ করুন\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "ভূল পাসওয়ার্ড।\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "কাজ অথবা হোষ্ট অথবা লগ-ইন সঠিক নয়।\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -186,58 +225,72 @@ msgstr ""
 "সেটিংস পুনায় পরীক্ষা করুন)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "সিষ্টেম আপ-টু-ডেট আছে\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "কোন পরীক্ষণ নেই"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "নেটওয়ার্ক পরীক্ষা করা হচ্ছে: সম্ভবত নিষ্ক্রিয় করা আছে\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "config ফাইল পরীক্ষা করা হচ্ছে: উপস্থিত নেই\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "লগ"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "পরিষ্কার করো"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "পরিচিতি..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "সবসময় স্টার্টআপে আরম্ভ করো"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "প্রস্থান"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "পরবর্তী"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "পূর্ববর্তী"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "উইজার্ড ছেড়ে এগিয়ে চলো"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "পূর্ববর্তী"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "ম্যান্ড্রকঅনলাইনে (Mandrakeonline) আপনাকে স্বাগতম"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -247,55 +300,68 @@ msgstr ""
 "একটি কেন্দ্রীয় ডাটাবেসে আপলোড করতে সাহায্য করবে যাতে\n"
 "আপনাকে সুরক্ষা সংক্রান্ত এবং অন্যান্য প্রয়োজনীয় আপডেট সম্বন্ধে জানানো করা যায়।\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "ম্যান্ড্রেকঅনলাইনে একটি অ্যাকাউন্ট তৈরি করো"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "আমার কোনো ম্যান্ড্রেকানলাইন অ্যাকাউন্ট নেই কিন্তু আমি একটি তৈরি করতে ইচ্ছুক "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "সাবস্ক্রাইব (Subscribe)"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "লগ-ইন:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "পাসওয়ার্ড নিশ্চিত করুন:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "মেইলে যোগাযোগ:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "ম্যান্ড্রেকলিনাক্স প্রাইভেসি পলিসি"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "অনুমোদন"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "আপনার ম্যান্ড্রেকঅনলাইন লগ-ইন, পাসওয়ার্ড এবং মেশিনের নাম লিখুন:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "মেশিনের নাম:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "কনফিগারেশন প্রেরণ করুন"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -330,11 +396,18 @@ msgstr ""
 "এবং, আপনার জন্য username@mandrakeonline.net উপনাম (alias) দিয়ে একটি ই-মেইল "
 "ঠিকানাও দেওয়া হবে।"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "সম্পন্ন"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "আপনার আপলোড সাফল্যের সাথে সম্পন্ন হয়েছে!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -342,7 +415,8 @@ msgstr ""
 "ম্যান্ড্রেকঅনলাইন-এর জন্য, এখন থেকে আপনি নিরাপত্তা এবং \n"
 "আপডেট সংক্রান্ত ঘোষনাগুলো নিয়মিত পাবেন।"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -350,27 +424,28 @@ msgstr ""
 "ম্যান্ড্রেকঅনলাইন আপনাকে স্বয়ংক্রিয়ভাবে আপডেট পেতে সাহায্য করে।\n"
 "একটি প্রোগ্রাম নুতন আপডেটের অপেক্ষায় আপনার সিষ্টেমে নিয়মিত চলবে\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "আপনার আপলোড সাফল্যের সাথে সম্পন্ন হয়েছে!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "স্বয়ংক্রিয় আপগ্রেড"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "দেশ:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "ত্রুটি"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "অনুগ্রহ করে একটি লগ-ইন নির্দিষ্ট করুন"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -379,40 +454,50 @@ msgstr ""
 " অনুগ্রহ করে পুনরায় চেষ্টা করুন\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "এটি বৈধ ই-মেইল ঠিকানা নয়!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "কনফিগারেশন পড়া হচ্ছে\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "কনফিগারেশন প্রেরণ করে হচ্ছে..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "সংযোগ সমস্যা"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "ফাইল আপলোড করার সময় সমস্যা হয়েছে, অনুগ্রহ করে পুনরায় চেষ্টা করুন"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "উইজার্ড থেকে প্রস্থান করা হচ্ছে\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "ম্যান্ড্রেকঅনলাইন-এর সাথে সংযোগ করা সম্ভব হয় নি, অনুগ্রহ করে কিছুক্ষণ পর পুনরায় চেষ্টা "
 "করুন"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "ভূল পাসওয়ার্ড"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -430,8 +515,83 @@ msgstr ""
 " আপনাকে কিন্তু মেশিনের নাম লিখতে বলা হবে \n"
 " (শুধুমাত্র বর্ণমালার অক্ষর লেখা যাবে)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "ম্যান্ড্রকঅনলাইনে (Mandrakeonline) আপনাকে স্বাগতম"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "ম্যান্ড্রকঅনলাইনে (Mandrakeonline) আপনাকে স্বাগতম"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "ভূল পাসওয়ার্ড"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "দেশ:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -446,18 +606,51 @@ msgstr ""
 "\n"
 "ব্যবহার বিধি:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr " --help          - এই সহায়িকা বার্তা প্রদর্শন করো।\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate স্বয়ংক্রিয়ভাবে চালু করা হয়েছে।\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdate চালু করো।\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - আপডেট কী (keys)\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"ম্যান্ড্রেকঅনলাইন-এর সাথে সংযোগ করা সম্ভব হয় নি, অনুগ্রহ করে কিছুক্ষণ পর পুনরায় চেষ্টা "
+"করুন"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/br.po b/po/br.po
index 2ea1dbdb..b5adb18d 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-05-06 15:36+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: brezhoneg <LL@li.org>\n"
@@ -15,275 +15,339 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr ""
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Kefluniañ ar rouedad"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr ""
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Kefluniañ ar rouedad"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Kefluniañ bremanñ !"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Ober"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Kefluniañ"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr ""
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr ""
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr ""
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Serriñ"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Diskenn"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Kevreadenn ar rouedad :"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Sevel"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Diskenn"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr ""
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr ""
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr ""
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "N'eo ket un tremenger mat.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Kazetennoù"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Skarañ"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "A-brepoz ..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Kuitaat"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "A heul"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Diaraog"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Diaraog"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Degeler e Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Degeler e MandrakeOnline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr ""
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Anv :"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Tremenger :"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Dilesadur"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Anv ar ostiz :"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr ""
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -303,81 +367,100 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Disoc'h"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr ""
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Bro :"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Fazi"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr ""
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
 msgstr ""
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "N'eo ket ur mailh mat !\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "O lenn ar gefluniadur\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr ""
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "O kuitaat ar skoazeller\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "N'eo ket un tremenger mat"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -388,8 +471,83 @@ msgid ""
 " (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "N'eo ket ur mailh mat\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Degeler e Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Degeler e Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "N'eo ket un tremenger mat"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Bro :"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -399,31 +557,59 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr ""
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr ""
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr ""
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Configuration"
 #~ msgstr "Kefluniadur"
 
 #~ msgid "Email"
 #~ msgstr "Mailh"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "N'eo ket ur mailh mat\n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Fazi gant ar servijer"
 
diff --git a/po/bs.po b/po/bs.po
index 583ef1cd..6e5b2125 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-17 13:23+0200\n"
 "Last-Translator: Amila Akagić <bono@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -18,10 +18,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Vaš sistem je up-to-date"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -30,150 +32,187 @@ msgstr ""
 "nasupport@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistem je zauzet. Molim sačekajte..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Nove ispravke su dostupne za vaš sistem"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Servis nije podešen. Kliknite na \"Podesi servis\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Mreža ne radi. Podesite vašu mrežu"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servis nije aktiviran. Kliknite na \"Online web stranica\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instaliraj ispravke"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Podesi servis"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Provjeri da li ima ispravki"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Online web stranica"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Podesi odmah!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux aplet sa ispravkama"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Akcije"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Podesi"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Provjeri ispravke"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Pogledaj logove"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Status"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Zatvori"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Ne radi"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Mrežna konekcija: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Radi"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Ne radi"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Zadnja provjera: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Ispravke: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokrećem drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Pokrećem mdkupdate --aplet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Madrakeonline je izgleda ponovo instaliran, pokrećem aplet..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Izračunavam nove ispravke...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Vežem se na"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Provjeravam... Ispravke su dostupne\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Nepoznato stanje"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online servisi su isključeni. Kontaktirajte Mandrakeonline stranicu\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Pogrešna šifra\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Pogrešna akcija, računar ili korisničko ime.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -182,58 +221,72 @@ msgstr ""
 "route, firewall ili proxy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je up-to-date\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Bez provjere"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Provjeravam mrežu: čini se da je isključena\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Provjeravam config datoteku: Ne postoji\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logovi"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Očisti"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "O programu..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Uvijek pokreni na početku"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Završi"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Sljedeći"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Nazad"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Preskoči Čarobnjaka"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Nazad"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Dobro došli na Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -243,55 +296,68 @@ msgstr ""
 "(pakete, hardware-ska podešavanja) u centraliziranu bazu podataka kako\n"
 "bi vas mogli informisali o sigurnosnim iskravkama i korisnim nadogradnjama.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Napravi račun na Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Nemam Mandrakeonline račun i želim "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Upiši se"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Korisničko ime:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Šifra:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Ponovo šifra:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Kontakt mail:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux Privacy Policy"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autentifikacija"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Upišite svoje Mandrakeonline korisničko ime, šifru i naziv mašine:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Naziv mašine:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Pošalji postavke"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -326,11 +392,18 @@ msgstr ""
 "www.mandrakeexpert.com.\n"
 "I napokon, imat ćete email alias vaše korisničko_ime@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Kraj"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Vaš upload bio je uspješan!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -338,7 +411,8 @@ msgstr ""
 "Od sada ćete primati obavještenja o sigurnosti i\n"
 "ispravkama zahvaljujući Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -346,27 +420,28 @@ msgstr ""
 "Mandrakeonline daje vam priliku da automatizirate ispravke.\n"
 "Program će se pokrenuti na vašem sistemu i čekati nove ispravke\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Vaš upload bio je uspješan!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatizovna nadogradnja"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Država:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Greška"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Unesite korisničko ime"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -375,40 +450,50 @@ msgstr ""
 " Molim pokušajte ponovo\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Neispravna e-mail adresa!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Čitam konfiguraciju\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Šaljem postavke..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problem sa konekcijom"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Pojavio se problem prilikom slanja datoteka, pokušajte ponovo"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Izlazim iz čarobnjaka\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Mandrakeonline nije mogao stupiti u kontakt sa stranicom, pokušajte ponovo "
 "kasnije"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Pogrešna šifra"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -425,8 +510,83 @@ msgstr ""
 " Upamtite da morate unijeti i naziv mašine \n"
 " (unesite samo alfabetske znakove)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Problem pri spajanju na server\n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Dobro došli na MandrakeOnline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Dobro došli na Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Pogrešna šifra"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Država:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -441,22 +601,55 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - štampa ovu poruku.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate se automatski pokreće.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - pokreće Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Update keys\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"MandrakeOnline nije mogao stupiti u kontakt sa stranicom, molim pokušajte "
+"ponovo kasnije."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Nisam u mogućnosti da uradim update paketa sa mdkupdate medija.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Configuration"
 #~ msgstr "Čitam konfiguraciju\n"
@@ -468,12 +661,6 @@ msgstr "  --update       - Update keys\n"
 #~ msgid "Email"
 #~ msgstr "E-mail"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Problem pri spajanju na server\n"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Nisam u mogućnosti da uradim update paketa sa mdkupdate medija.\n"
-
 #, fuzzy
 #~ msgid "Response from MandrakeOnline server\n"
 #~ msgstr "Dobro došli na MandrakeOnline"
@@ -485,15 +672,6 @@ msgstr "  --update       - Update keys\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Da, želim automatizovani update"
 
-#~ msgid "MandrakeUpdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "MandrakeOnline nije mogao stupiti u kontakt sa stranicom, molim pokušajte "
-#~ "ponovo kasnije."
-
-#, fuzzy
-#~ msgid "Mandrake Online Team"
-#~ msgstr "Dobro došli na MandrakeOnline"
-
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - koristi samo siguran medij.\n"
 
diff --git a/po/ca.po b/po/ca.po
index b404c2db..73a1ee70 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-25 13:55+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -19,218 +19,274 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "El vostre sistema està actualitzat"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
-msgstr "Problema de configuració del servei. Comproveu els logs i envieu un correu a support@mandrakeonline.net"
+msgstr ""
+"Problema de configuració del servei. Comproveu els logs i envieu un correu a "
+"support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "El sistema està ocupat. Espereu ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Hi ha actualitzacions disponibles pel vostre sistema"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "El servei no està configurat. Premeu a \"configura el servei\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La xarxa està inactiva. Si us plau configureu-la"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instal·la actualitzacions"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Configura el servei"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Comprova actualitzacions"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Configura la xarxa"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Configura ara!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet Mandrakelinux Update"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Accions"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Configura"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Comprova actualitzacions"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Veure els logs"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Estat"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Tanca"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Caiguda"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Connexió de xarxa: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Funcionant"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Caiguda"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Última comprovació: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Actualitzacions: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "S'està executant drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "S'estan computant les noves actualitzacions...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "S'està connectant a"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "S'està comprovant ...Hi ha actualitzacions disponibles\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Estat desconegut"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Contrasenya incorrecta.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "El sistema està actualitzat\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "No comprovis"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "S'està comprovant la xarxa: sembla estar desactivada\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
-msgstr "S'està comprovant l'existència del fitxer de configuració: No està present\n"
+msgstr ""
+"S'està comprovant l'existència del fitxer de configuració: No està present\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Registres"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Neteja"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Quant a..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Executa sempre al inici"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Surt"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Següent"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Salta l'auxiliar"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Benvingut a Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -241,57 +297,70 @@ msgstr ""
 "per tal de mantenir-vos informat sobre les actualitzacions de seguretat i "
 "altres millores.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Crea un compte a Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "No tinc cap compte de Mandrakeonline i en vull un "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Subscriu-te"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Nom d'usuari:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Confirmació de la contrasenya:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Contacte de correu:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Normes de privacitat de Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autenticació"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 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:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Nom de màquina:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Envia la configuració"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -327,11 +396,18 @@ msgstr ""
 "Per últim, us facilitarem un àlies de correu electrònic amb el vostre nom "
 "d'usuari@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Finalitza"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr ""
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -339,7 +415,8 @@ msgstr ""
 "A partir d'ara, gràcies a Mandrakeonline, rebreu\n"
 "avisos d'actualitzacions i millores de seguretat."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -349,27 +426,28 @@ msgstr ""
 "S'executarà regularment un programa per comprovar si hi ha noves "
 "actualitzacions\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "actualitzacions automàtiques"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "País:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Error"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Si us plau doneu un login"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -378,38 +456,49 @@ msgstr ""
 " Si us plau intenteu-ho de nou\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "No és una adreça de correu vàlida!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "S'està llegint la configuració\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "S'està enviant la configuració..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problema de connexió"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "S'està sortint de l'auxiliar\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 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"
+msgstr ""
+"No s'ha pogut contactar amb Mandrakeonline, si us plau, provi-ho més tard"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Contrasenya incorrecta"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -426,8 +515,84 @@ msgstr ""
 " Estigueu avisat de que també cal proporcionar un nom de màquina \n"
 " (només s'admeten caràcters de l'alfabet)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+"Tant el nom d'usuari com la contrasenya han de tenir menys de 12 caràcters\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "No es permeten caràcters especials\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Si us plau ompliu tots els camps\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "Correu no vàlid\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "El compte ja existeix\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Problemes connectant al servidor \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Benvingut a Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Benvingut a Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Contrasenya incorrecta"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "País:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -443,22 +608,54 @@ msgstr ""
 "\n"
 "sintaxi:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostra aquest missatge d'ajuda.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate es llança automàticament.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - actualitza Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Actualitza les claus\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Mandrakeupdate no ha pogut contactar amb el lloc, ho provarem més tard."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "No es poden actualitzar els paquets des del suport mdkupdate.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Problemes de configuració. Executeu \"configura\" un altre cop"
 
@@ -489,44 +686,21 @@ msgstr "  --update       - Actualitza les claus\n"
 #~ msgid "Creation"
 #~ msgstr "Creació"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr ""
-#~ "Tant el nom d'usuari com la contrasenya han de tenir menys de 12 "
-#~ "caràcters\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Caràcters especials"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "No es permeten caràcters especials\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Camps buits"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Si us plau ompliu tots els camps\n"
-
 #~ msgid "Email"
 #~ msgstr "Correu"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "Correu no vàlid\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "El compte ja existeix\n"
-
 #~ msgid "Change account"
 #~ msgstr "Canvia compte"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Problemes connectant al servidor \n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Problema del servidor"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "No es poden actualitzar els paquets des del suport mdkupdate.\n"
-
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Resposta del servidor de Mandrakeonline\n"
 
@@ -536,10 +710,6 @@ msgstr "  --update       - Actualitza les claus\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Sí, vull actualitzacions automàtiques"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "Mandrakeupdate no ha pogut contactar amb el lloc, ho provarem més tard."
-
 #~ msgid "Register Now!"
 #~ msgstr "Registreu-vos ara!"
 
@@ -678,4 +848,3 @@ msgstr "  --update       - Actualitza les claus\n"
 
 #~ msgid "Sans Italic 17"
 #~ msgstr "Sans Italic 17"
-
diff --git a/po/cs.po b/po/cs.po
index b172f3c9..225f2a9a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-16 23:02+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -24,10 +24,12 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Váš systém je plně aktuální"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -36,150 +38,187 @@ msgstr ""
 "support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Systém je zaneprázdněn. Počkejte..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Pro váš systém jsou k dispozici nové aktualizace"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Služba není nastavena. Klikněte prosím na \"Nastavit službu\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Síť není dostupná. Nastavte prosím vaši síť"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Služba není aktivována. Klikněte prosím na \"Online webové stránky\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instalovat aktualizace"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Nastavit službu"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Zkontrolovat aktualizace"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Online webové stránky"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Nastavit síť"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Nastavit teď!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Aplet pro aktualizace Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Akce"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Nastavit"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Zkontrolovat aktualizace"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Prohlížet záznamy"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Stav"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Zavřít"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Není"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Připojení k síti: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Připojeno"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Není"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Poslední kontrola: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Aktualizace: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Spouští se drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Spouští se mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline vypadá, že je přeinstalováno, znovu nahrávám aplet...."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Vyhledávám nové aktualizace...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Připojuji se k"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Zjišťuji... Aktualizace jsou dostupné\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Neznámý stav"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online služby jsou vypnuty. Kontaktujte stránky Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Špatné heslo\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Chybná akce nebo počítač nebo přihlášení.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -188,58 +227,72 @@ msgstr ""
 "směrování, firewallu nebo proxy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Systém je aktuální\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Nezjištěno"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontroluji síť: zdá se nedostupná\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Kontroluji soubor s nastavením: Nenalezen\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Záznamy"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Vyčistit"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "O aplikaci..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Vždy spustit při startu"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Konec"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Další"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Zpět"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Přeskočit průvodce"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Zpět"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Vítá vás Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -250,55 +303,68 @@ msgstr ""
 "kdy budete ihned informováni o všech bezpečnostních a dalších\n"
 "potřebných aktualizacích.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Vytvořit účet na Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Nemám účet na Mandrakeonline a chci se "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Přihlásit"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Jméno:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Potvrdit heslo:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Emailový kontakt:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Ochrana soukromí společnosti Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Ověřování"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Zadejte jméno, heslo a název počítače pro Mandrakeonline:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Název počítače:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Poslat nastavení"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -333,11 +399,18 @@ msgstr ""
 "www.mandrakeexpert.com.\n"
 "Také vám bude poskytnuta emailová adresa: jmeno@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Hotovo"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Zaslání informací proběhlo úspěšně!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -345,7 +418,8 @@ 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:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -353,27 +427,28 @@ msgstr ""
 "Mandrakeonline nabízí možnost automatizovat aktualizace.\n"
 "Program, který bude běžet v systému a čekat na aktualizace\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Zaslání informací proběhlo úspěšně!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatické aktualizace"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Země:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Chyba"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Zadejte prosím přihlášení"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -382,40 +457,50 @@ msgstr ""
 "Zkuste to prosím znovu\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Neplatná emailová adresa!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Načíst konfiguraci\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Posílám konfiguraci..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problémy při spojení"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Při nahrávání souborů se vyskytl problém, zkuste to prosím znovu"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Ukončuji průvodce\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 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:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Špatné heslo"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -433,8 +518,83 @@ msgstr ""
 " Uvědomte si, že musíte také zadat jméno počítače \n"
 " (jsou povoleny pouze znaky abecedy bez diakritiky)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Vítá vás Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Vítá vás Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Špatné heslo"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Země:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -450,18 +610,51 @@ msgstr ""
 "\n"
 "Použití:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - vytiskne tuto nápovědu.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - automatické spuštění Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - spustí Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - aktualizace klíčů\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Službě Mandrakeonline se nepodařilo připojit k serveru, zkuste to prosím "
+"znovu později."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/cy.po b/po/cy.po
index 4740aba1..c6dab2f1 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-23 20:53-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -15,10 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Mae'r system yn gyfredol"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -27,153 +29,190 @@ msgstr ""
 "support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Mae'r system yn brysur. Arhoswch..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Mae diweddariadau newydd ar gael ar gyfer eich system"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Nid yw'r gwasanaeth wedi ei ffurfweddu. Cliciwch \"Ffurfweddu'r gwasanaeth\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Nid yw'r rhwydwaith ar gael.  Ffurfweddwch eich rhwydwaith"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Nid yw'r gwasanaeth ar gael. Cliciwch \"Gwefan Ar-lein\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Gosod diweddariadau"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Ffurfweddu'r gwasanaeth"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Gwirio Diweddariad"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Safle Gwe Ar-lein"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Ffurfweddu'r Rhwydwaith"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Ffurfweddu!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Rhaglennig Diweddaru Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Gweithredoedd"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Ffurfweddu"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Gwirio diweddariad"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Darllen cofnodion"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Statws"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Cau"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Lawr"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Cyswllt Rhwydwaith:"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Fyny"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Lawr"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Gwiriad diwethaf:"
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Diweddariadau:"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Cychwyn drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Cychwyn mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mae Mandrakeonline i'w weld wedi ei ail osod, ail lwytho'r rhaglennig..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Cyfrifo diweddariadau newydd...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Cysylltu â"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Gwirio... Mae diweddariadau ar gael\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Cyflwr anhysbys"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Mae'r gwasanaethau ar-lein wedi eu hatal. Cysylltwch â safle Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Y cyfrinair anghywir\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Gweithred, gwestai neu fewngofnod anghywir.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -182,58 +221,72 @@ msgstr ""
 "cadarn neu osodiadau dirprwy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Mae'r system yn gyfredol\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Dim gwiriad"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Gwirio'r Rhwydwaith: i weld wedi ei anablu\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Gwirio ffeil ffurfweddiad: Nid yw ar gael\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Cofnodion"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Clirio"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Ynghylch..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Cychwyn wrth gychwyn"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Nesaf"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Blaenorol"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Osgoi'r Dewin"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Blaenorol"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Croeso i Mandrakeonline "
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -243,56 +296,69 @@ msgstr ""
 "(pecynnau, ffurfweddiad caledwedd) i gronfa ddata canolog er\n"
 "mwyn eich hysbysu am ddiweddariadau diogelwch a defnyddiol.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Creu cyfrif Mandrakeonline "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Nid oes gennyf gyfrif Mandrakeonline ac mi rydw i eisiau"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Tanysgrifio"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Cadarnhau Cyfrinair:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Cyswllt E-bost"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Polisi Preifatrwydd Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Dilysu"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Rhowch eich mewngofnod Mandrakeonline, eich cyfrinair ac enw'r peiriant :"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Enw'r peiriant:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Anfon Ffurfweddiad"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -328,11 +394,18 @@ msgstr ""
 "gyda eich enw defnyddiwr@mandrakeonline.net yn cael ei ddarparu ar eich "
 "cyfer."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Gorffen"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Roedd eich llwytho i fyny'n llwyddiant!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -340,7 +413,8 @@ msgstr ""
 "O hyn ymlaen byddwch yn derbyn cyhoeddiadau\n"
 "diogelwch a diweddariadau gan Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -348,27 +422,28 @@ msgstr ""
 "Mae MandrakeOnline yn cynnig y dewis i chi ddiweddaru'n awtomatig,\n"
 "Bydd rhaglen yn rhedeg yn rheolaidd yn eich system i gasglu diweddariadau.\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Roedd eich llwytho i fyny'n llwyddiant!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Diweddariadau awtomatig"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Gwlad:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Gwall"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Rhowch fewngofnod"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -377,38 +452,48 @@ msgstr ""
 "Ceisiwch eto\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Nid yw'n gyfeiriad e-bost dilys!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Darllen ffurfweddiad\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Anfon ffurfweddiad..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problem cysylltu"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Mae problem yn digwydd wrth lwytho ffeiliau i fyny, ceisiwch eto."
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Gadael y Dewin\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Methu cysylltu â Mandrakeonline, ceisiwch eto'n nes ymlaen"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Y cyfrinair anghywir"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -424,8 +509,83 @@ msgstr ""
 "cofiwch y bydd angen darparu enw Peiriant \n"
 "(gyda dim ond llythrennau)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Croeso i Mandrakeonline "
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Croeso i Mandrakeonline "
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Y cyfrinair anghywir"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Gwlad:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -441,18 +601,49 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu'r neges cymorth hon.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - cychwyn Mandrakeupdate yn awtomatig\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - cychwyn Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Allwedd diweddaru\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Methu cysylltu â Mandrakeonline, ceisiwch eto'n nes ymlaen"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/da.po b/po/da.po
index 8844ce1f..4672ff9d 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-21 19:33+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <<dansk@klid.dk>>\n"
@@ -17,10 +17,12 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Systemet er opdateret."
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -29,150 +31,189 @@ msgstr ""
 "til support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Systemet er optaget. Vent ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Nye opdateringer er tilgængelige for dit system"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Tjeneste er ikke konfigureret. Klik på \"konfigurér tjenesten\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Netværket er nede. Konfigurér venligst dit netværk"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Tjeneste er ikke aktiveret. Klik på \"Websted på nettet\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
-msgstr "Udgivelse ikke understøttet (for gammel udgivelse, eller udviklingsudgivelse)"
+msgstr ""
+"Udgivelse ikke understøttet (for gammel udgivelse, eller udviklingsudgivelse)"
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Installér opdateringer"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Konfigurér tjenesten"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Tjek for opdateringer"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "WebSite på nettet"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Konfigurér netværk"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Konfigurér nu!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Opdateringer panelprogram"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Handlinger"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Konfigurér"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Tjek for opdateringer"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Se logger"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Status"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Luk"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Ned"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Netværks-forbindelse: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Op"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Ned"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Sidste tjek: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Opdateringer: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Begynder på drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Start Mandrakelinux Opdatering op - applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
-msgstr "Mandrakeonline ser ud til at være geninstalleret, genindlæser applet ...."
+msgstr ""
+"Mandrakeonline ser ud til at være geninstalleret, genindlæser applet ...."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Beregner nye opdateringer...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Kobler op til"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Tjekker... Opdateringer er tilgængelige\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "Udviklingsudgivelse ikke understøttet af tjeneste"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "For gammel udgivelse ikke understøttet af tjeneste"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Ukendt tilstand"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Nettjenester er deaktiveret. Kontakt Mandrakeonline webstedet\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Forkert adgangskode\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Forkert handling eller vært eller brugerkonto.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -181,58 +222,72 @@ msgstr ""
 "opsætning)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet er opdateret\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Ingen tjek"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tjekker netværk: ser ud til at være deaktiveret\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Tjekker konfigureringsfil: Ikke til stede\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logger"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Nulstil"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Om..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Start altid op ved opstart"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Afslut"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Næste"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Forrige"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Overspring hjælperen"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Forrige"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Velkommen til Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -243,55 +298,68 @@ msgstr ""
 "holde dig orienteret omkring sikkerhedsopdateringer og nyttige "
 "opdateringer.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Opret en Mandrakeonline-konto"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Jeg har ikke en Mandrakeonline-konto, og jeg vil gerne "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "abonnere"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Brugernavn:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Bekræft adgangskode:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Mail-kontakt:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux privatbeskyttelsespolitik"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autentifikation"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Angiv dit Mandrakeonline brugernavn, adgangskode og maskinnavn:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Maskinnavn:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Send konfiguration"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -322,11 +390,18 @@ msgstr ""
 "Der vil også blive lavet et epost-alias med dit brugernavn@mandrakeonline."
 "net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Afslut"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Din oplægning lykkedes!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -334,7 +409,8 @@ msgstr ""
 "Fra nu af vil du modtage annonceringer om sikkerhed\n"
 "og opdateringer takket være Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -342,27 +418,28 @@ 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:144
-msgid "Your upload was successful!"
-msgstr "Din oplægning lykkedes!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatiserede upgraderinger"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Land:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Fejl"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Angiv venligst et logind"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -371,38 +448,48 @@ msgstr ""
 " Prøv igen\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Ikke en gyldig postadresse!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Læser konfiguration\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Sender konfiguration..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problem med forbindelse"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Problem skete ved oplægning af filer, prøv igen"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Afslutter guiden\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeonline kunne ikke kontaktes, prøv igen senere"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Forkert adgangskode"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -420,8 +507,83 @@ msgstr ""
 "Vær opmærksom på at du også skal angive et maskinnavn \n"
 "(Kun bogstaver er tilladt)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "Logind og adgangskode bør være mindre end 12 tegn lange\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Specialtegn er ikke tilladt\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Udfyld venligst alle felter\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "Email ikke gyldig\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "Konto eksisterer allerede\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Problem ved opkobling til server \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Velkommen til Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Velkommen til Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Forkert adgangskode"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Land:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -436,22 +598,53 @@ msgstr ""
 "\n"
 "brug:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - print denne hjælpebesked.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate startes automatisk.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - start MandrakeOpdatér op.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Opdatér nøgler\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate kunne ikke kontakte stedet, vi vil prøve igen."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Kan ikke opdatere pakker fra mdkupdate-medium.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Konfigurationsproblemer. Start \"konfigurér\" igen"
 
@@ -482,42 +675,21 @@ msgstr "  --update       - Opdatér nøgler\n"
 #~ msgid "Creation"
 #~ msgstr "Oprettelse"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "Logind og adgangskode bør være mindre end 12 tegn lange\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Specialtegn"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Specialtegn er ikke tilladt\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Tomme felter"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Udfyld venligst alle felter\n"
-
 #~ msgid "Email"
 #~ msgstr "Email"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "Email ikke gyldig\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "Konto eksisterer allerede\n"
-
 #~ msgid "Change account"
 #~ msgstr "Ændr konto"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Problem ved opkobling til server \n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Serverproblem"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Kan ikke opdatere pakker fra mdkupdate-medium.\n"
-
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Svar fra Mandrakeonline-serveren\n"
 
@@ -527,9 +699,6 @@ msgstr "  --update       - Opdatér nøgler\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Ja, jeg ønsker automatiserede opdateringer"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate kunne ikke kontakte stedet, vi vil prøve igen."
-
 #~ msgid "Register Now!"
 #~ msgstr "Registrér nu!"
 
@@ -768,4 +937,3 @@ msgstr "  --update       - Opdatér nøgler\n"
 
 #~ msgid "Sans Italic 17"
 #~ msgstr "Sans Italic 17"
-
diff --git a/po/de.po b/po/de.po
index 962ffd18..6f5bde13 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-18 12:24+0200\n"
 "Last-Translator: Frank Köster\n"
 "Language-Team: Deutsch <I18n-mdk-de@codershome.org>\n"
@@ -20,10 +20,12 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Ihr System ist aktuell"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -32,151 +34,188 @@ msgstr ""
 "senden Sie eine Mail an support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "System ist beschäftigt. Warte ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Neue Aktualisierungen für Ihr System verfügbar"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Dienst nicht konfiguriert. Klicken Sie auf „Den Dienst konfigurieren“"
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Kein Netzwerk. Bitte konfigurieren Sie Ihr Netzwerk"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Dienst nicht verfügbar. Klicken Sie auf „Online Webseite“"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Aktualisieren"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Den Dienst konfigurieren"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Überprüfe Updates"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Online Webseite"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Netzwerk konfigurieren"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Jetzt konfigurieren!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Update-Applet"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Aktionen"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Konfigurieren"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Überprüfe Updates"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Logs ansehen"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Status"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Schließen"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Runter"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Netzwerkverbindung:"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Hoch"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Runter"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Letzte Überprüfung:"
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Aktualisierungen:"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Starte drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Starte mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline scheint neu installiert worden zu sein, lade Applet erneut ..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Berechne neue Updates...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Verbinde mit"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Überprüfe... Updates sind verfügbar\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Unbekannter Zustand"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Onlinedienste abgeschaltet. Kontaktieren Sie die Mandrakeonline Site\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Falsches Passwort\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Falsche Aktion, falscher Host oder Anmeldekennung\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -185,58 +224,72 @@ msgstr ""
 "(Pruefen SieRoute, Firewall, oder Prxy-einstellungen)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "System ist aktuell\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Keine Überprüfung"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Überprüfe Netzwerk: Scheint abgeschaltet\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Überprüfe Konfigurationsdatei: Nicht vorhanden\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logs"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Löschen"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Über.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Immer beim Start ausführen"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Nächster"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Zurück"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Überspringe Assistenten"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Zurück"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Wilkommen bei Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -246,56 +299,69 @@ msgstr ""
 "Konfiguration) zu einer zentralisierten Datenbank hochzuladen um\n"
 "Sie über Sicherheitsupdates und nützliche Upgrades zu informieren.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Erstelle einen Mandrakeonline Account"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Ich besitze keinen Mandrakeonline Account und ich möchte"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Benutzername:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Passwort bestätigen:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Mail Kontakt:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux Datenschutzrichtlinie"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Authentifizierung"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Geben Sie Ihren Mandrakeonline Benutzernamen, Passwort und Rechnernamen ein:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Rechnername:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Konfiguration senden"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -332,11 +398,18 @@ msgstr ""
 "Letzlich wird ein Email Alias mit Ihrem your username@mandrakeonline.net für "
 "Sie bereitgestellt."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Ende"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Ihr Upload war erfolgreich!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -344,7 +417,8 @@ msgstr ""
 "Ab jetzt erhalten SIe Sicherheits- und Updateankündigungen\n"
 "dank Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -353,27 +427,28 @@ msgstr ""
 "Ein Program wird regelmäßig auf Ihrem System laufen, um auf neue Updates zu "
 "prüfen\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Ihr Upload war erfolgreich!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatisierte Upgrades"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Land:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Fehler"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Bitte geben Sie eine Loginkennung an"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -382,42 +457,52 @@ msgstr ""
 "Versuchen Sie es erneut!\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Keine gültige E-Mail-Adresse!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Lese Konfiguration\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Sende Konfiguration..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Verbindungsproblem"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 "Ein Problem taucht beim hochladen der Dateien auf, bitte versuchen Sie es "
 "erneut"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Beenden des Assistenten\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Mandrakeonline kann nicht erreicht werden, versuchen Sie es später noch "
 "einmal."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Falsches Passwort"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -435,8 +520,83 @@ msgstr ""
 "Seien Sie Sich bewustt, dass Sie eine Rechnernamen bereitstellen müssen \n"
 " (nur alphabetische Zeichen sind zugelassen)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Wilkommen bei Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Wilkommen bei Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Falsches Passwort"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Land:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -452,18 +612,51 @@ msgstr ""
 "\n"
 "Verwendung: \n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - Ausgabe dieser Hilfe.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate startet automatisch.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - starte Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Aktualisiere Schlüssel\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Mandrakeonline kann nicht erreicht werden, versuchen Sie es später noch "
+"einmal."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/el.po b/po/el.po
index 4c56c2b0..dd6ff77c 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\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"
@@ -16,224 +16,271 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Για κάθε πρόβλημα στείλτε ένα μήνυμα στο support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Αναβαθμίσεις"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Ρύθμιση"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr ""
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr ""
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Ανάγνωση Ρυθμίσεων\n"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Πολιτική Προσωπικού Απορρήτου της Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Ενέργειες"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Ρύθμιση"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr ""
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr ""
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Κατάσταση"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Κλείσιμο"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Κάτω"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr ""
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Πάνω"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Κάτω"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr ""
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Πρόβλημα σύνδεσης"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Πρόβλημα σύνδεσης"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr ""
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Λάθος κωδικός πρόσβασης\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Ημερολόγια"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Καθαρισμός"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Περί..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Επόμενο"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Προηγούμενο"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Προηγούμενο"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Καλώς ήρθατε στο Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -243,59 +290,70 @@ msgstr ""
 "(πακέτα, υλικό του υπολογιστή σας) σε μια κεντρική βάση για να μπορείτε\n"
 "να ενημερώνεστε για αναβαθμίσεις ασφαλείας και χρήσιμες αναβαθμίσεις.\n"
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Καλώς ήρθατε στο Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Δεν έχω λογαριασμό στο Mandrakeonline και θέλω να αποκτήσω "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Όνομα χρήστη:          "
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:               "
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Επαλήθευση Κωδικού:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Πολιτική Προσωπικού Απορρήτου της Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Πιστοποίηση"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Εισάγετε το όνομα χρήστη ,κωδικό πρόσβασης και το Όνομα μηχανήματος για το "
 "Mandrakeonline:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Όνομα μηχανήματος:"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Ανάγνωση Ρυθμίσεων\n"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -331,11 +389,18 @@ msgstr ""
 "Και τέλος θα σας προμηθεύσουμε με μια διεύθυνση με το δικό σας "
 "ΌνομαΧρήστη@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Τέλος"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Η αποστολή ήταν επιτυχής!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -343,7 +408,8 @@ msgstr ""
 "Από εδώ και πέρα θα παραλαμβάνετε ανακοινώσεις\n"
 "σχετικά με ενημερώσεις ασφαλείας και αναβαθμίσεις χάρη στο Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -352,27 +418,28 @@ msgstr ""
 "Ένα πρόγραμμα θα εκτελείται τακτικά στο σύστημά σας αναμένοντας νέες "
 "αναβαθμίσεις\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Η αποστολή ήταν επιτυχής!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "αυτοματοποιημένες Αναβαθμίσεις"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Χώρα:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Σφάλμα"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr ""
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -381,41 +448,50 @@ msgstr ""
 "Παρακαλώ προσπαθήστε ξανά\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Μη έγκυρη διεύθυνση ταχυδρομείου!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Ανάγνωση Ρυθμίσεων\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Πρόβλημα σύνδεσης"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Τερματίζεται ο Οδηγός\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Το Mandrakeupdate δεν μπόρεσε να συνδεθεί με την ιστοσελίδα, θα "
 "ξαναδοκιμάσουμε."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Λάθος κωδικός πρόσβασης"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -433,8 +509,83 @@ msgstr ""
 "Σημειώστε ότι θα πρέπει να εισάγετε και το Όνομα μηχανήματος\n"
 " (δεκτοί είναι μόνο οι αλφαβητικοί χαρακτήρες)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Πρόβλημα στην επικοινωνία με τον διακομιστή \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Καλώς ήρθατε στο Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Καλώς ήρθατε στο Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Λάθος κωδικός πρόσβασης"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Χώρα:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -450,39 +601,58 @@ msgstr ""
 "\n"
 "χρήση:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - εκτύπωση αυτού του μηνύματος βοήθειας.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - αναβάθμιση όλων των πληροφοριών.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - αναβάθμιση όλων των πληροφοριών.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - αναβάθμιση όλων των πληροφοριών.\n"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Πρόβλημα στην επικοινωνία με τον διακομιστή \n"
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Αδύνατη η αναβάθμιση των πακέτων από το μέσο mdkupdate.\n"
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Το Mandrakeupdate δεν μπόρεσε να συνδεθεί με την ιστοσελίδα, θα "
+"ξαναδοκιμάσουμε."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Αδύνατη η αναβάθμιση των πακέτων από το μέσο mdkupdate.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
 
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Ναι θέλω να αυτοματοποιήσω τις αναβαθμίσεις"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "Το Mandrakeupdate δεν μπόρεσε να συνδεθεί με την ιστοσελίδα, θα "
-#~ "ξαναδοκιμάσουμε."
-
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - χρήση μόνο των ασφαλών μέσων.\n"
 
diff --git a/po/eo.po b/po/eo.po
index 369d088a..ee6d1585 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\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"
@@ -16,296 +16,339 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Pri ajna problemo sendu retmesaĝon al support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Via komputilo ne havas retadaptilon!"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instalu ĝisdatigojn"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Konfiguru"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Ĝisdatigoj"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Konfiguru retumon"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Konfiguru teksaĵon"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux-Ĝisdatigo (Mandrakeupdate)"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Agoj"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Konfiguru"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "Sekurecaj ĝisdatigoj"
 
 #: ../mdkapplet:160
-#, fuzzy
+#, fuzzy, c-format
 msgid "See logs"
 msgstr "Celu +5s"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Statuso"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Fermu"
 
 #: ../mdkapplet:202
-#, fuzzy
-msgid "Down"
-msgstr "Finata"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Nova konekto"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr ""
 
+#: ../mdkapplet:202
+#, fuzzy, c-format
+msgid "Down"
+msgstr "Finata"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Ĝisdatigoj"
 
 #: ../mdkapplet:208
-#, fuzzy
+#, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lanĉu userdrake"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Konektproblemo"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nekonata servilonomo"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Malĝusta pasvorto\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistema modalo"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logdosieroj"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Forviŝu"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Pri..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Eliru"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Sekva"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Antaŭa"
-
-#: ../mdkonline:88
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, c-format
 msgid "Skip Wizard"
 msgstr "Transsaltu la sorĉilon"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Antaŭa"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Bonvenon al Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Bonvenon al Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Mi ne havas Mandrakeonline konton kaj mi deziras ĝin "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Abonu"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Salutnomo:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Konfirmu pasvorton:"
 
-#: ../mdkonline:113
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, c-format
 msgid "Mail contact:"
 msgstr "Retpoŝta kontakto:"
 
-#: ../mdkonline:120
-#, fuzzy
+#: ../mdkonline:122
+#, fuzzy, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux-elektoj"
 
-#: ../mdkonline:126
-#, fuzzy
+#: ../mdkonline:128
+#, fuzzy, c-format
 msgid "Authentification"
 msgstr "Aŭtentikigado"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:132
-#, fuzzy
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, fuzzy, c-format
 msgid "Machine name:"
 msgstr "en nomoj"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Son-konfigurado"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -325,44 +368,52 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Finu"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr ""
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Lando:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Eraro"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "Bonvole provu denove"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -371,41 +422,48 @@ msgstr ""
 "Bonvolu provi denove\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Nevalida retpoŝta adreso!\n"
 
-#: ../mdkonline:200
-#, fuzzy
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, fuzzy, c-format
 msgid "Reading configuration\n"
 msgstr "Presil-konfigurado"
 
 #: ../mdkonline:205
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending configuration..."
 msgstr "Son-konfigurado"
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Konektproblemo"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Eliras Sorĉilon\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeupdate ne povis kontakti la retejon, ni reprovos."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Malĝusta pasvorto"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -416,8 +474,83 @@ msgid ""
 " (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Problemo de konektado al la servilo \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Bonvenon al Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Bonvenon al Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Malĝusta pasvorto"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Lando:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -433,40 +566,59 @@ msgstr ""
 "\n"
 "uzado:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --helpo         - presu tiun helpmesaĝon.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - ĝisdatigu ĉiujn informojn.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - ĝisdatigu ĉiujn informojn.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - ĝisdatigu ĉiujn informojn.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate ne povis kontakti la retejon, ni reprovos."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'mdkupdate medium'.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Configuration"
 #~ msgstr "Konfiguraĵo"
 
 #~ msgid "Email"
 #~ msgstr "Retpoŝt-adreso"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Problemo de konektado al la servilo \n"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'mdkupdate medium'.\n"
-
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate ne povis kontakti la retejon, ni reprovos."
-
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - uzu nur 'security media'.\n"
 
diff --git a/po/es.po b/po/es.po
index c803aa90..3a377cce 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-09 09:35-0300\n"
 "Last-Translator: Fabian Mandelbaum <fmandelbaum@hotmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -23,10 +23,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Su sistema está al día"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -35,152 +37,189 @@ msgstr ""
 "bitácora y envie un correo a support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "El sistema está ocupado. Espere ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Hay nuevas actualizaciones disponibles para su sistema"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "El servicio no está configurado. Haga clic sobre \"Configurar el servicio\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La red no está activa. Configurela por favor"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "El servicio no está activado. Haga clic sobre \"Sitio web en línea\"."
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versión no soportada (muy antigua o versión de desarrollo)"
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instalar actualizaciones"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Configurar el servicio"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Verificar actualizaciones"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Sitio web en línea"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Configurar red"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "¡Configurar ahora!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet Mandrakelinux Update"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Acciones"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Configurar"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Verificar actualizaciones"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Ver registros"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Estado"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Cerrar"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Inactiva"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Conexión de red: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Activa"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Inactiva"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Última verificación: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Actualizaciones: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lanzando drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Lanzando mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline parece haber sido reinstalado, volviendo a cargar applet..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Computando actualizaciones nuevas...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Conectando con"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verificando... Están disponibles actualizaciones\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "Versión de desarrollo no soportada por el servicio"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "Versión muy antigua no soportada por el servicio"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Estado desconocido"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Servicios en línea deshabilitados. Contacte al sitio Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Contraseña incorrecta\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Acción, host o login incorrectos.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -189,58 +228,72 @@ msgstr ""
 "su ruta, cortafuegos o proxy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "El sistema está al día\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Sin verificación"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificando red: parece estar deshabilitada\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Verificando archivo de configuración: No presente\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Registros"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Limpiar"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Acerca..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Lanzar siempre al arrancar"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Salir"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Omitir Asistente"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Bienvenido a Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -250,57 +303,70 @@ 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:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Crear una cuenta en Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "No tengo ninguna cuenta en Mandrakelinux Online y quiero una "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Suscribir"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Usuario:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Confirmar contraseña:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Correo de contacto:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Política de privacidad de Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autentificación"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 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:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Nombre de máquina:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Enviar la configuración"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -335,11 +401,18 @@ msgstr ""
 "Finalmente, se le concederá un alias de correo del estilo\n"
 "nombreusuario@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Acabar"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Actualización exitosa"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -347,7 +420,8 @@ msgstr ""
 "Desde ahora, recibirá anuncions de seguridad\n"
 "y actualizaciones gracias a Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -356,27 +430,28 @@ msgstr ""
 "Se ejecutará regularmente un programa  en su sistema a la espera de nuevas "
 "actualizaciones\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Actualización exitosa"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "actualizaciones automatizadas"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "País:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Error"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Por favor, proporcione un login"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -385,40 +460,50 @@ msgstr ""
 " Por favor, intente de nuevo\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "¡No es una dirección de correo válida!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Leyendo la configuración\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Enviando configuración..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problema de conexión"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Ocurrieron problemas al enviar archivos, por favor intente de nuevo"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Saliendo del asistente\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 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:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Contraseña incorrecta"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -436,8 +521,83 @@ msgstr ""
 " Tenga presente que también debe proporcionar un nombre de Máquina \n"
 " (sólo se admiten caracteres alfabéticos)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Bienvenido a Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Bienvenido a Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Contraseña incorrecta"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "País:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -453,22 +613,55 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostrar este mensaje de ayuda.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate lanzado automáticamente.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - lanzar Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Actualizar llaves\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Mandrakeupdate no pudo contactar el sitio, ipor favor, vuélvalo a intentar "
+"más tarde.."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Problemas de configuración. Lance \"configure\" otra vez."
 
diff --git a/po/et.po b/po/et.po
index e868faf3..23a43b9b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-22 12:29+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -17,10 +17,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Teie süsteemis pole midagi uuendada"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -29,151 +31,188 @@ msgstr ""
 "aadressile support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Süsteem on tegevuses. Palun oodake..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Teie süsteemile on uuendusi"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Teenus pole seadistatud. Palun valige \"Teenuse seadistamine\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Võrk on maas. Palun seadistage võrk"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Teenus pole aktiveeritud. Palun valige \"Veebilehekülg\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Väljalase pole toetatud (liiga vana või arendusversioon)"
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Uuenduste paigaldamine"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Teenuse seadistamine"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Uuenduste kontrollimine"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Veebilehekülg"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Võrgu seadistamine"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Seadista"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinuxi uuenduste aplett"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Toimingud"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Seadistused"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Uuenduste kontrollimine"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Logide vaatamine"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Olek"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Sulge"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Puudub"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Võrguühendus: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Olemas"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Puudub"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Viimati kontrollitud: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Uuendused: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnecti käivitamine\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "mdkupdate --applet käivitamine\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline paistab olevat uuesti paigaldatud, aplett laaditakse uuesti..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Uuenduste kontrollimine...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Ühendumine saidiga"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Kontroll... On uuendusi\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "Teenus ei toeta arendusversiooni"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "Teenus ei toeta liiga vanu väljalaskeid"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Tundmatu olek"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Võrguteenused ei ole lubatud. Ühendumine Mandrakeonline'i saidiga\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Vale parool.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Vale toiming või masin või kasutajatunnus.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -182,58 +221,72 @@ msgstr ""
 "tulemüüri või vahendaja (proxy) seadistusi)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Midagi pole uuendada\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Pole kontrollitud"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Võrgu kontroll: paistab, et see on maas\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Konfiguratsioonifaili kontroll: puudub\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logid"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Puhasta"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Info..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Käivitatakse alati käivitumisel"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Välju"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Järgm"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Eelmine"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Jäta nõustaja vahele"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Eelmine"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Tere tulemast Mandrakeonline'i"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -243,56 +296,69 @@ msgstr ""
 "(paketid, riistvara) tsentraalsesse andmebaasi, et edaspidi\n"
 "teavitada Teid turvaparandustest ja kasulikest uuendustest.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Mandrakeonline'i konto loomine"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 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:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Konto loomine"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Kasutajatunnus:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Parool teist korda:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "E-posti aadress:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinuxi privaatsuspoliitika"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autentimine"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Sisestage oma Mandrakeonline'i kasutajatunnus, parool ja masina nimi:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Masina nimi:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Saada konfiguratsioon"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -326,11 +392,18 @@ msgstr ""
 "teenuste puhul.\n"
 "Ja lõpuks saate ka e-posti aadressi: kasutajatunnus@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Lõpeta"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Saatmine õnnestus!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -338,7 +411,8 @@ msgstr ""
 "Nüüdsest alates saate tänu Mandrakeonline'ile \n"
 "teateid turvaparanduste ja uuenduste kohta."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -346,27 +420,28 @@ msgstr ""
 "Mandrakeonline pakub võimalust uuendamine automaatseks muuta.\n"
 "Selleks käivitatakse Teie arvutis regulaarselt rakendus, mis otsib uuendusi\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Saatmine õnnestus!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Automaatne uuendamine"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Riik:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Viga"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Palun andke kasutajatunnus"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -375,38 +450,48 @@ msgstr ""
 " Palun proovige uuesti\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "See ei ole korrektne e-posti aadress!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Konfiguratsiooni tuvastamine\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Konfiguratsiooni saatmine..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Probleem ühendusega"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Tekkis viga failide saatmisel, palun proovige uuesti"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Nõustajast väljumine\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeonline'iga ei saadud ühendust, palun proovige hiljem uuesti"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Vale parool"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -424,8 +509,83 @@ msgstr ""
 " Pange tähele, et teatada tuleb ka oma masina nimi \n"
 " (lubatud on ainult tähed)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "Kasutajatunnuses ja paroolis tohib olla kuni 12 sümbolit\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Erisümbolid ei ole lubatud\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Palun täitke kõik väljad\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "E-posti aadress pole korrektne\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "Konto on juba olemas\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Probleem serveriga ühendumisel \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Tere tulemast Mandrakeonline'i"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Tere tulemast Mandrakeonline'i"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Vale parool"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Riik:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -441,22 +601,53 @@ msgstr ""
 "\n"
 "kasutamine:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - näitab seda abiteadet.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate käivitatakse automaatselt.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - käivitatakse Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - uuendatakse võtmeid\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeonline'iga ei saadud ühendust, palun proovige hiljem uuesti"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Pakettide värskendamine mdkupdate andmekandjalt ebaõnnestus.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "No updates available for your system"
 #~ msgstr "Teie süsteemile uuendusi ei ole"
 
@@ -499,42 +690,21 @@ msgstr "  --update       - uuendatakse võtmeid\n"
 #~ msgid "Creation"
 #~ msgstr "Loomine"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "Kasutajatunnuses ja paroolis tohib olla kuni 12 sümbolit\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Erisümbolid"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Erisümbolid ei ole lubatud\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Tühjad väljad"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Palun täitke kõik väljad\n"
-
 #~ msgid "Email"
 #~ msgstr "E-posti aadress"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "E-posti aadress pole korrektne\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "Konto on juba olemas\n"
-
 #~ msgid "Change account"
 #~ msgstr "Muuda kontot"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Probleem serveriga ühendumisel \n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Probleem serveriga"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Pakettide värskendamine mdkupdate andmekandjalt ebaõnnestus.\n"
-
 #~ msgid ""
 #~ " You are just starting our Free Mandrakelinux Download Edition for the "
 #~ "first time. \n"
diff --git a/po/eu.po b/po/eu.po
index 3a4a8fda..d717da8e 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-21 23:25+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: EUSKARA <itzulpena@euskalgnu.org>\n"
@@ -21,10 +21,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Zure sistema eguneratuta dago"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -33,152 +35,189 @@ msgstr ""
 "posta support@mandrakeonline.net helbidera"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistema okupatuta dago. Itxaron..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Zure sistemarentzako eguneraketa berriak eskuragarri daude"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Zerbitzua ez dago konfiguratuta. Mesedez sakatu \"Zerbitzua konfiguratu\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sarea erorita dago. Mesedez konfiguratu zure sarea"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Zerbitzua ez dago aktibatuta. Mesedez klikatu \"Lerroko Webgunea\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Bertsio hau ez dago sostengaturik (bertsio zaharregia, edo garapen bertsioa)"
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instalatu eguneratzeak"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Zerbitzua konfiguratu"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Egiaztatu eguneratzeak"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Lerroko Webgunea"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Konfiguratu sarea"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Konfiguratu orain!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux eguneratzeen applet-a"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Ekintzak"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Konfiguratu"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Egiaztatu eguneratzeak"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Ikusi egunkariak"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Egoera"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Itxi"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Ez dabil"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Sare-konexioa: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Badabil"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Ez dabil"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Azken egiaztatzea: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Eguneraketak: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconect abiarazten\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "mdkupdate --applet abiarazten\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline berrinstalatu dela dirudi, appleta birzamatzen ..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Eguneraketa berriak kalkulatzen...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Hona konektatzen"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Egiaztaketa... Dauden eguneraketak\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "Garapen bertsioa zerbitzuaren sostengurik gabe"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "Bertsio zaharregia zerbitzuaren sostengurik gabe"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Egoera ezezaguna"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Lineako zerbitzua desgaituta. Kontaktatu Mandrakeonline gunearekin\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Pasahitza ez da zuzena\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Okerreko akzioa, ostalaria edo saio_hasiera.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -187,58 +226,72 @@ msgstr ""
 "edo proxy ezarpenak)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistema eguneratzera doa\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Egiaztatzerik ez"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sare egiaztaketa: desgaituta dagoela dirudi\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Konfigurazio-fitxategia egiaztatzea: ez dago\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Egunkariak"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Garbitu"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Honi buruz..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Jaurti beti hasterakoan"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Irten"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Aurrekoa"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Saltatu morroia"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Aurrekoa"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Ongi etorri Mandrakeonline-ra"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -248,57 +301,70 @@ msgstr ""
 "zentralizatu batera kargatzen lagunduko dizu, segurtasun-eguneratzeeieta "
 "bertsio-berritzeei buruzko informazioa jaso ahal izan dezazun.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Sortu Mandrakeonline kontua"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Ez dut Mandrakeonline konturik eta nahiko nuke "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Harpidetu"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Erabiltzaile-izena:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Berretsi pasahitza:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Posta-kontaktua:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux-en pribatutasun-gidalerroa"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autentifikazioa"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Idatzi Mandrakeonline-n sartzeko erabiltzaile-izena, pasahitza eta makina-"
 "izena:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Makina-izena:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Bidali konfigurazioa"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -333,11 +399,18 @@ msgstr ""
 "Azkenik, posta elektronikoko alias bat emango dizugu: "
 "username@mandrakeonline.net ."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Amaitu"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Behar bezala kargatu da!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -345,7 +418,8 @@ msgstr ""
 "Hemendik aurrera, segurtasunari eta eguneratzeei buruzko \n"
 "berriak jasoko dituzu Mandrakeonline-ri esker."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -353,27 +427,28 @@ msgstr ""
 "Mandrakeonline-k eguneratzeak automatizatzeko aukera eskaintzen dizu.\n"
 "Aldika programa bat exekutatuko da zure sisteman eguneratzeak bilatzeko.\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Behar bezala kargatu da!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "bertsio-berritze automatikoak"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Estatua:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Errorea"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Idatzi erabiltzaile-izena"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -382,38 +457,48 @@ msgstr ""
 " Saiatu berriro\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Helbide elektronikoa baliogabea da!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Konfigurazioa irakurtzen\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Konfigurazioa bidaltzen..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Konexio-arazoa"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Arazoa fitxategiak igotzerakoan gertatzen da, saiatu berriro mesedez"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Morroitik irteten\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Ezin izan da Mandrakeonline-rekin kontaktatu, saiatu berriro geroago"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Pasahitza ez da zuzena"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -431,8 +516,83 @@ msgstr ""
 " Kontuan izan makina-izena ere idatzi behar duzula \n"
 " (alfabeto-karaktereak bakarrik onartzen dira)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Ongi etorri Mandrakeonline-ra"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Ongi etorri Mandrakeonline-ra"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Pasahitza ez da zuzena"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Estatua:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -448,18 +608,49 @@ msgstr ""
 "\n"
 "erabilera:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - laguntza-mezu hau inprimatzen du.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate automatikoki abiarazten du.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdate abiarazten du.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Gakoak eguneratzen ditu\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Ezin izan da Mandrakeonline-rekin kontaktatu, saiatu berriro geroago"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 5f900957..e7af8727 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-07-20 15:48+0430\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -18,168 +18,200 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
-#, fuzzy
+#, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "سیستم به روز است\n"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "سیستم اشغال است. صبر کنید..."
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "هیچ بروزسازیی برای سیستم‌تان در دسترس نیست"
 
 #: ../mdkapplet:85
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "سرویس در دسترس نیست. بر \"پیکربندی\" کلیک کنید"
 
 #: ../mdkapplet:91
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network is down. Please configure your network"
 msgstr "شبکه پایین است. بر \"پیکربندی شبکه\" را کلیک کنید"
 
 #: ../mdkapplet:97
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "سرویس در دسترس نیست. بر \"پیکربندی\" کلیک کنید"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "نصب کردن بروزسازی‌ها"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "پیکربندی شبکه"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "بررسی بروزسازی‌ها"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "وب‌گاه اینترنت"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "پیکربندی شبکه"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "پیکربندی اکنون!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "برنامک بروزسازی ماندرایک"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "کنش‌ها"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "پیکربندی"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "بررسی بروزسازی‌ها"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "دیدن ثبت‌ها"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "وضعیت"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "بستن"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "پایین"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "اتصال شبکه: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "بالا"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "پایین"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "آخرین بررسی: "
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "بروزسازی‌های جدید: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "راه انداختن drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "به راه انداختن mdkupdate-applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "بنظر می‌رسد که Mandrakeonline نصب مجدد شده است، برنامک بارگذاری مجدد می‌شود ..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "در حال محاسبه کردن بروزسازی‌های جدید...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "در حال اتصال به"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "در حال بررسی... بروزسازی‌هایی در دسترس هستند\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "وضعیت ناشناخته"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "خدمات برخطی از کار افتاده‌اند. با وبگاه Mandrakeonline تماس بگیرید\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "گذرواژه‌ی اشتباه\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "کنش یا میزبان یا ثبت‌ورود اشتباه.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -188,58 +220,72 @@ msgstr ""
 "بررسی کنید)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "سیستم به روز است\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "بدون بررسی"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "بررسی کردن شبکه: بنظر از کار افتاده است\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "بررسی کردن پرونده‌ی config: حضور ندارد\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "ثبت‌ها"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "پاک کردن"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "درباره‌ی.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "ترک"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "بعدی"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "پیشین"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "پرش از جادوگر"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "پیشین"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "به Mandrakeonline خوش آمدید"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -249,56 +295,68 @@ msgstr ""
 "به بانک اطلاعاتی مرکزی بمنظور اطلاع رسانی به شما درباره‌ی بروزسازی‌ها و\n"
 "ارتقاهای مفید کمک خواهد کرد.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "ایجاد حساب Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "حساب Mandrakeonline ندارم و می‌خواهم"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "مشترک"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "ثبت‌ورود:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "تصدیق گذرواژه:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "تماس پستی:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "رویه‌ی خصوصیت ماندرایک"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "تأیید هویت"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "نام ماشین، گذرواژه و ثبت‌ورود Mandrakeonline خود را وارد کنید:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "نام ماشین:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "فرستادن پیکربندی"
 
-#: ../mdkonline:138
-#, fuzzy
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, fuzzy, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -333,11 +391,18 @@ msgstr ""
 "در پایان، پست الکترونیکی مستعاری با نام‌کاربری@mandrakeonline.net به شما عرضه "
 "خواهد شد."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "پایان"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "باردهی‌تان موفق بود!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -345,7 +410,8 @@ msgstr ""
 "از اکنون شما آگهی‌های بروزسازی‌های امنیتی را به\n"
 "لطف Mandrakeonline دریافت خواهید کرد."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -354,27 +420,28 @@ msgstr ""
 "برنامه‌ای در سیستم‌تان بطور متناوب اجرا شده و منتظر بروزسازی‌های جدید خواهد "
 "بود\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "باردهی‌تان موفق بود!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "ارتقاهای خودکار"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "کشور:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "خطا"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "لطفاً ثبت‌ورودی را عرضه کنید"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -383,38 +450,48 @@ msgstr ""
 " لطفاً دوباره امتحان کنید\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "نشانی پست معتبری نیست!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "خواندن پیکربندی\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "فرستادن پیکربندی..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "مشکل اتصال"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "ترک جادوگر\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "نتوانست با Mandrakeonline تماس گرفت، لطفاً بعداً دوباره امتحان کنید"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "گذرواژه‌ی اشتباه"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -431,8 +508,83 @@ msgstr ""
 " توجه داشته باشید که باید نام ماشینی را همچنین ارائه کنید \n"
 " (فقط نویسه‌های الفبایی مجازند) "
 
-#: ../mdkupdate:51
-#, fuzzy, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "ثبت‌ورود و گذرواژه باید کمتر از ۱۲ نویسه باشد\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "نویسه‌های مخصوص مجاز نیستند\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "لطفاً همه‌ی محوطه‌ها را پر کنید\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "پست الکترونیکی معتبر نیست\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "حساب از قبل وجود دارد\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "اشکال اتصال به کارگزار \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "به Mandrakeonline خوش آمدید"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "به Mandrakeonline خوش آمدید"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "گذرواژه‌ی اشتباه"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "کشور:"
+
+#: ../mdkupdate:50
+#, fuzzy, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -447,22 +599,53 @@ msgstr ""
 "\n"
 "طرز استفاده:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - چاپ این پیام راهنما.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate بطور خودکار اجرا شد.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - اجرای Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - بروزسازی کلیدها.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "نتوانست با Mandrakeonline تماس گرفت، لطفاً بعداً دوباره امتحان کنید"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "قادر نبودن به بروزسازی بسته‌ها از رسانه‌ی mdkupdate.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "مشکلات پیکربندی. دوباره \"پیکربندی\" را اجرا کنید"
 
@@ -493,38 +676,17 @@ msgstr "  --update       - بروزسازی کلیدها.\n"
 #~ msgid "Creation"
 #~ msgstr "ایجاد کردن"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "ثبت‌ورود و گذرواژه باید کمتر از ۱۲ نویسه باشد\n"
-
 #~ msgid "Special characters"
 #~ msgstr "نویسه‌های مخصوص"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "نویسه‌های مخصوص مجاز نیستند\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "محوطه‌های خالی"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "لطفاً همه‌ی محوطه‌ها را پر کنید\n"
-
 #~ msgid "Email"
 #~ msgstr "پست الکترونیکی"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "پست الکترونیکی معتبر نیست\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "حساب از قبل وجود دارد\n"
-
 #~ msgid "Change account"
 #~ msgstr "تغییر دادن حساب"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "اشکال اتصال به کارگزار \n"
-
 #~ msgid "Server Problem"
 #~ msgstr "اشکال کارگزار"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسانه‌ی mdkupdate.\n"
diff --git a/po/fi.po b/po/fi.po
index 2e10052b..24d46b0d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-fi - MDK 10.1 Release\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-05 19:59+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n"
 "Language-Team: Finnish <cooker-i18n@mandrakelinux.com>\n"
@@ -21,10 +21,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Järjestelmäsi on ajan tasalla"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -33,151 +35,188 @@ msgstr ""
 "support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Järjestelmä on varattu. Odota ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Päivityksiä järjestelmällesi on saatavilla"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Palvelu ei ole asetettu. Paina \"Aseta palvelu\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Verkko on alhaalla. Ole hyvä ja aseta verkkosi"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Palvelu ei ole otettu käyttöön. Paina \"Online Webbisivusto\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Asenna päivitykset"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Aseta palvelu"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Tarkista päivitykset"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Online-sivusto"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Aseta verkko"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Aseta Nyt!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandraken päivityssovelma"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Toiminnot"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Aseta"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Tarkista päivitykset"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Katso lokitiedostot"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Tila"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Sulje"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "pois päältä"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Verkkoyhteys:"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "päällä"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "pois päältä"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Viimeisin tarkistus:"
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Päivitykset:"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Käynnistetään drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "käynnistetään mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline on asennettu uudelleen, käynnistetäänsovelma uudestan ..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Lasketaan  uudet päivitykset...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Yhdistetään kohteeseen"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Tarkistetaan... Päivityksiä on saatavilla\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Tuntematon tila"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online palvelut pois käytöstä. Ota yhteys Mandrakeonline sivustoon\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Väärä salasana\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Väärä tili, kone tai kirjautuminen.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -186,58 +225,72 @@ msgstr ""
 "välityspalvelinten asetukset)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Järjestelmäsi on ajan tasalla\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Ei tarkistusta"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tarkistetaan verkko: Näyttää poistettu käytöstä\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Tarkistetaan asetustiedostoa: Ei olemassa\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Lokit"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Tyhjennä"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Tietoa.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Käynnistä ainä käynnistyksen yhteydessä"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Poistu"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Edellinen"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Ohita velho"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Edellinen"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Tervetuloa Mandrakeonlineen"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -248,55 +301,68 @@ msgstr ""
 "sinut voitaisiin pitää ajan tasalla turvapäivityksistä ja hyödyllisistä\n"
 "päivityksistä.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Luo Mandrakeonline-tunnus"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Minulla ei ole Mandrakeonline-tunnusta ja haluan "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Liity"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Tunnus:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Varmista salasana:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Sähköpostiosoitteesi:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinuxin yksityisyyspolitiikka"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Vahvistetaan"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Syötä Mandrakeonline-käyttäjätunnuksesi, salasanasi sekä koneesi nimi:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Koneen nimi:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Lähetä Asetukset"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -330,11 +396,18 @@ msgstr ""
 "maksullisissa tukipalveluissa.\n"
 "Lopuksi saat sähköposti-aliaksen malli käyttäjänimi@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Valmis"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Tietojen siirto onnistui!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -342,7 +415,8 @@ msgstr ""
 "Tästä lähtien saat turva- ja päivitysilmoitukset\n"
 "suoraan Mandrakeonlinesta."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -351,27 +425,28 @@ msgstr ""
 "Ohjelma käynnistyy säännöllisesti järjestelmässäsi odottamaan uusia "
 "päivityksiä\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Tietojen siirto onnistui!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automaattiset päivitykset"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Maa:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Virhe"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Anna tunnuksesi"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -380,38 +455,48 @@ msgstr ""
 "Yritä uudestaan\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Sähköpostiosoite ei kelpaa!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Luetaan asetukset\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Lähetän asetustiedot..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Yhteysongelma"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Virheitä tietdostojen lähettämisessä, ole hyvä ja yritä uudelleen"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Poistutaan velhosta\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Ei saatu yhteyttä Mandrakeonlineen kokeile myöhemmin uudelleen."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Väärä salasana"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -428,8 +513,84 @@ msgstr ""
 "yhteyden Mandrakeonlineen.\n"
 " Tiedoksi: sinun pitää antaa myös koneen nimi (vain kirjaimet hyväksytään)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+"Tunnuksen ja salasanan pituuden pitäisi olla vähemmän kuin 12 merkkiä\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Erikoismerkit eivät ole sallittuja\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Täytä kaikkiin kenttiin\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "Sähköpostiosoite ei kelpaa\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "Tunnus on jo olemassa\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Ongelmia yhdistettäessä palvelimeen\n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Tervetuloa Mandrakeonlineen"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Tervetuloa Mandrakeonlineen"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Väärä salasana"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Maa:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -445,22 +606,53 @@ msgstr ""
 "\n"
 "Käyttö:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - tulosta tämä apuviesti.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate käynistetään automaattisesti.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - käynnistä Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Päivitä avaimet\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate ei saanut yhteyttä sivustoon, kokeilemme uudelleen."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Ei pystytty päivittämään paketteja mdkupdate-lähteestä.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Asetusongelmia. Suorita \"Asetukset\" uudelleen"
 
@@ -491,43 +683,21 @@ msgstr "  --update       - Päivitä avaimet\n"
 #~ msgid "Creation"
 #~ msgstr "Luonti"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr ""
-#~ "Tunnuksen ja salasanan pituuden pitäisi olla vähemmän kuin 12 merkkiä\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Erikoismerkit"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Erikoismerkit eivät ole sallittuja\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Tyhjät kentät"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Täytä kaikkiin kenttiin\n"
-
 #~ msgid "Email"
 #~ msgstr "Sähköposti"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "Sähköpostiosoite ei kelpaa\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "Tunnus on jo olemassa\n"
-
 #~ msgid "Change account"
 #~ msgstr "Muuta tunnusta"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Ongelmia yhdistettäessä palvelimeen\n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Palvelinongelma"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Ei pystytty päivittämään paketteja mdkupdate-lähteestä.\n"
-
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Vastaus Mandrakeonline palvelimelta\n"
 
@@ -537,9 +707,6 @@ msgstr "  --update       - Päivitä avaimet\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Kyllä, haluan automaattiset päivitykset"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate ei saanut yhteyttä sivustoon, kokeilemme uudelleen."
-
 #~ msgid "Register Now!"
 #~ msgstr "Rekisteröidy nyt!"
 
diff --git a/po/fr.po b/po/fr.po
index 0f03500a..4b8283f7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-14 01:06+0200\n"
 "Last-Translator: Lecureuil Nicolas <n1c0l4s.l3@wanadoo.fr>\n"
 "Language-Team: francais <fr@li.org>\n"
@@ -23,10 +23,12 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Votre système est à jour"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -36,152 +38,189 @@ msgstr ""
 "support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Le système est occupé. Veuillez patienter ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "De nouvelles mise à jour sont disponible pour votre système"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Service non configuré. Cliquez sur « configuration »"
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Le réseau n'est pas disponible. Verifiez la configuration du réseau"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Service non activé. Cliquez sur « Site Mandrakeonline »"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Installer les mises à jour"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Configurer le service"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Vérifier la disponibilité de mises à jour"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Site Mandrakeonline"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Configurer le réseau"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Configurer maintenant!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Appliquette des mises à jour Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Actions"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Configurer"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Vérifier la disponibilité de mises à jour"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Voir les journaux"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Statut"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Fermer"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Arrêté"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Connection réseau : "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Activé"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Arrêté"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Dernière vérification : "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Mises à jour : "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lancement de drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Lancement de mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline semble avoir été réinstallé, rechargement de l'appliquette ..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Calcul des nouvelles mises à jour...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Connection à"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verification... Des mises à jours sont disponible\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Etat inconnu"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Service en-ligne désactivé. Veuillez contacter le site Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Mot de passe incorrect.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Mauvaise action, hôte ou identifiant\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -191,58 +230,72 @@ msgstr ""
 "mandataire)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Le système est à jour\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Pas de vérification"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Vérification de l'accès au réseau : il semble être désactivé\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Vérification du fichier de configuration : Absent\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Journaux"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Effacer"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "À propos..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Toujours lancer au démarage"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Suivant"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Précédent"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Interrompre l'assistant"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Précédent"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Bienvenue à Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -252,57 +305,70 @@ msgstr ""
 "paquetages, configuration matérielle) vers une base de données centralisée,\n"
 "afin de vous maintenir informé des mises-à-jour de bugs ou de sécurité.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Créer un compte Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Je n'ai pas de compte Mandrakeonline et je veux "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Souscrire"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Identifiant :"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Confirmer le mot de passe :"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Adresse electronique :"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux et votre vie privée"
 
 # (in english : authentication !)
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Authentification"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Entrez vos identifiant, mot de passe et nom de machine Mandrakeonline :"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Nom de l'ordinateur :"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Envoyer la configuration"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -338,11 +404,18 @@ msgstr ""
 "net\n"
 "vous sera fourni."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Terminer"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Votre envoi a eu lieu avec succès !"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -350,7 +423,8 @@ msgstr ""
 "À partir de maintenant, vous recevrez les annonces\n"
 "de sécurité et de mises-à-jour grâce à Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -359,27 +433,28 @@ msgstr ""
 "Un programme se lancera régulièrement sur votre machine\n"
 "pour verifier la présence de nouvelles mises-à-jour.\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Votre envoi a eu lieu avec succès !"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "mises-à-jour automatiques"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Pays :"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Erreur"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Veuillez indiquer un identifiant"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -388,39 +463,49 @@ msgstr ""
 "Veuillez essayer de nouveau\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Cette adresse email n'est pas valide !\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Lecture de la configuration\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Envoi de la configuration..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problème de connexion"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 "Une erreur est survenue lors de l'envoie des fichiers, veuillez rééssayer"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Fermeture de l'assistant\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeonline n'a pas pu être contacté, veuillez ré-essayer plus tard"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Mot de passe incorrect"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -438,8 +523,83 @@ msgstr ""
 " Veuillez noter que vous devez aussi indiquer un nom de Machine \n"
 " (seuls les caractères alphabétiques sont autorisés)."
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Bienvenue à Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Bienvenue à Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Mot de passe incorrect"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Pays :"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -455,18 +615,49 @@ msgstr ""
 "\n"
 "usage :\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - affiche ce message d'aide.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate est lancé automatiquement.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - lance Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - met à jour les clés.\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeonline n'a pas pu être contacté, veuillez ré-essayer plus tard"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/fur.po b/po/fur.po
index 567b7b26..ac36e75d 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-06-28 16:55+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -22,169 +22,201 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
-#, fuzzy
+#, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "Il sisteme al è atualizât\n"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Il sisteme al è cjapât. Spiete ..."
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Nissune atualizazion dispunibile pal to sistem"
 
 #: ../mdkapplet:85
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Servizi no disponibil. Frache su \"configurazion\""
 
 #: ../mdkapplet:91
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Le rêt e je stacade. Frache su \"configure le rêt\""
 
 #: ../mdkapplet:97
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servizi no disponibil. Frache su \"configurazion\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instale atualizazions"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Configure le rêt"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Controle Atualizazions"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Sît online"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Configure le rêt"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Configure Daurman!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet Atualizazions Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Azions"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Configure"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Controle atualizazions"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Cjale i log"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Stât"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Siere"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Jù"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Conession a le rêt"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Su"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Jù"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Ultin control"
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Gnovis Atualizazions"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Fâs lâ drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Inviament de applet di mdkupdate\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline al somee sedi stât tornât a instalâ, o torni a cjariâ le "
 "applet ...."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Instalant gnovis atualizazion...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Conesion in vore a"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Controlant... Atualizazions e son disponibilis\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Stât no cognossût"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Servizis Online no facoltizâs. Contate il sît Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Password falade.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Azion o host o login falâs.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -193,58 +225,72 @@ msgstr ""
 "di instradament, firewall o proxy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Il sisteme al è atualizât\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Nissun control"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controlant le rêt: e somee no facoltizade\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Controlant il file di configurazion: No l'è presint\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "File di log"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Scancele"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Informazions su.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Jessî"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Pross"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Precedent"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Salte l'assistent"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Precedent"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Benvignût su Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -254,55 +300,68 @@ msgstr ""
 "(pachets, configurazion hardware) a un database centralizât in\n"
 "maniere di tignîti informât su atualizazions di sigurece e utii mioraments.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Cree un account Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "No ai un account Mandrakeonline ma o vorès vêlu "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Regjistrâmi"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Confirme Password:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Contat email:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Politiche di Mandrakelinux su le privacy"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autentificazion"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Insede il to login, password e non dal computer par Mandrakeonline:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Non dal computer:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Invie Configurazion"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -336,11 +395,18 @@ msgstr ""
 "www.mandrakeexpert.com.\n"
 "Alfin, un alias di email to_non@mandrakeonline.net al vignarà creât par te."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Finìs"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Cjariament completât cun sucès!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -348,7 +414,8 @@ msgstr ""
 "Di cumò indenant, tu ricevarâs avîs su le sigurece\n"
 " e su lis atualizazions graziis a Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -357,27 +424,28 @@ msgstr ""
 "Un program in spiete di gnovis atualizazions al sarà fat partî "
 "periodichementri\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Cjariament completât cun sucès!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Atualizazions automatichis"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Nazion:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Fal"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Par plasè furnìs un non utent"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -386,38 +454,48 @@ msgstr ""
 "Par plasè prove ancjemò\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "No l'è un recapit mail valevul!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Leture de configurazion in vore\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Inviament de configurazion in vore..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Probleme di conession"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Sierant il Wizard\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeonline nol po sedi contatât, par plasè prove plui indenant"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Password falade"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -434,8 +512,83 @@ msgstr ""
 " Sta atent che tu às di furnî un non di computer \n"
 " (dome caratars dal alfabet e son ametûts)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "Non utent e password e varessin di sedi lungjis mancul di 12 letaris\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "I Caratars speciâi no son consintûts\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Par plase jemple ducj i cjamps\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "Email no valevule\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "L'account al esist dizà\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Probleme conetintsi al server \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Benvignût su Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Benvignût su Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Password falade"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Nazion:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -451,22 +604,53 @@ msgstr ""
 "\n"
 "ûs:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - stampe chest mes di jutori.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate inviât automatichementri.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - invie Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Atualize clâf\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeonline nol po sedi contatât, par plasè prove plui indenant"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "No si rive a atualizâ i pachets de font mdkupdate.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Berdei te configurazion. Fas partî \"configure\" une altre volte"
 
@@ -497,39 +681,17 @@ msgstr "  --update       - Atualize clâf\n"
 #~ msgid "Creation"
 #~ msgstr "Creazion"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr ""
-#~ "Non utent e password e varessin di sedi lungjis mancul di 12 letaris\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Caratars speciâi"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "I Caratars speciâi no son consintûts\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Cjamps vueits"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Par plase jemple ducj i cjamps\n"
-
 #~ msgid "Email"
 #~ msgstr "Email"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "Email no valevule\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "L'account al esist dizà\n"
-
 #~ msgid "Change account"
 #~ msgstr "Mude account"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Probleme conetintsi al server \n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Probleme tal server"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "No si rive a atualizâ i pachets de font mdkupdate.\n"
diff --git a/po/gl.po b/po/gl.po
index 84e49173..a0ce486d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline.gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-04-22 10:22+0100\n"
 "Last-Translator: Leandro Regueiro <unho@gulo.org>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -16,226 +16,272 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
-#, fuzzy
+#, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "O sistema está actualizado\n"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "O sistema esta ocupado. Agarde ..."
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Non hai actualizacións dispoñibles para o seu sistema"
 
 #: ../mdkapplet:85
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Servicio non dispoñible. Clique en \"Configuración\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servicio non dispoñible. Clique en \"Configuración\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instala-las actualizacións"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Configura-la Rede"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Comprobar se hai Actualizacións"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Sitio Web en Liña"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Configura-la Rede"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "¡Configurar agora!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet de Actualización de Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Accións"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Configurar"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Comprobar actualizacións"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Ve-los logs"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Estado"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Pechar"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Abaixo"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Conexión á Rede: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Arriba"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Abaixo"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Última comprobación: "
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Novas Actualizacións: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lanzando drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Executando mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Conectando a"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Comprobando... As actualizacións están dispoñibles\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nome de máquina descoñecido"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Os sevicios en liña están deshabilitados. Contacte co sitio Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Contrasinal Non Válido.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "O sistema está actualizado\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Sen comprobar"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Comprobando a Rede: parece que está deshabilitada\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Comprobando o ficheiro de configuración: Non existe\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logs"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Limpar"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Acerca de..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Pechar"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Saltar Asistente"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Benvid@ a Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -245,56 +291,69 @@ msgstr ""
 "(paquetes, configuración do hardware) a unha base de datos central para\n"
 "mantelo informado acerca de actualizacións útiles e de seguridade.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Crear unha Conta en Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Non teño unha conta en Mandrakeonline e quéroa "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Subscribirse"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Confirma-lo Contrasinal:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Correo-e de contacto:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Política de Privacidade de Linux Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Identificación"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Introduza o seu login e contrasinal de Mandrakeonline e o nome do ordenador:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Nome do ordenador:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Envia-la Configuración"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -314,11 +373,18 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Rematar"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "¡O envio de datos tivo éxito!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -326,7 +392,8 @@ msgstr ""
 "Dende agora recibirá avisos referentes á seguridade \n"
 "e ás actualizacións gracias a Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -335,27 +402,28 @@ msgstr ""
 "Un programa executarase regularmente no seu sistema agardando novas "
 "actualizacións\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "¡O envio de datos tivo éxito!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Actualizacións Automáticas"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "País:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Erro"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Por favor, introduza un login"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -364,39 +432,49 @@ msgstr ""
 "Por favor, inténteo de novo\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "¡Non é un enderezo de email válido!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Lendo a configuración\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Enviando a configuración..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problema de conexión"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Saindo do Asistente\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Non se puido contactar con Mandrakeonline, por favor inténteo máis tarde"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Contrasinal incorrecto"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -413,8 +491,83 @@ msgstr ""
 " Asegúrese de que tamén proporciona un nome de Ordenador \n"
 " (só se admiten caracteres alfabéticos)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "O login e o contrasinal deben ter menos de 12 caracteres\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Os caracteres especiais non están permitidos\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Por favor, encha tódolos campos\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "Email non válido\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "A conta xa existe\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Problema conectando ó servidor\n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Benvid@ a Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Benvid@ a Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Contrasinal incorrecto"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "País:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -429,23 +582,54 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --axuda         - imprimir esta mensaxe de axuda.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate executouse automáticamente.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - executar Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - executar MandrakeUpdate.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Non se puido contactar con Mandrakeonline, por favor inténteo máis tarde"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Non se puido actualiza-los paquetes mediante mdkupdate.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Problemas de configuración. Execute \"configurar\" outra vez"
 
@@ -476,42 +660,21 @@ msgstr "  --applet       - executar MandrakeUpdate.\n"
 #~ msgid "Creation"
 #~ msgstr "Creación"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "O login e o contrasinal deben ter menos de 12 caracteres\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Caracteres especiais"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Os caracteres especiais non están permitidos\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Campos baleiros"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Por favor, encha tódolos campos\n"
-
 #~ msgid "Email"
 #~ msgstr "Email"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "Email non válido\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "A conta xa existe\n"
-
 #~ msgid "Change account"
 #~ msgstr "Cambiar de conta"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Problema conectando ó servidor\n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Problema no Servidor"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Non se puido actualiza-los paquetes mediante mdkupdate.\n"
-
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Resposta do servidor de Mandrakeonline\n"
 
diff --git a/po/he.po b/po/he.po
index 13000418..7dd6da8d 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-25 03:37+0200\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <mdk-hebrew@iglu.org.il>\n"
@@ -20,10 +20,12 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "המערכת מעודכנת"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -32,150 +34,187 @@ msgstr ""
 "net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "המערכת עסוקה, אנא המתן..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "עדכונים חדשים זמינים עבור המערכת שלך"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "השירות לא מוגדר. עליך ללחוץ על \"הגדרת השרות\"."
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "הרשת לא פעילה. עליך להגדיר את הרשת"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "השירות לא הופעל. עליך ללחוץ על \"אתר מקוון\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "גרסה לא נתמכת (גרסה ישנה מדי או גרסת פיתוח)"
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "התקן עדכונים"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "הגדרת השרות"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "בדוק עדכונים"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "אתר מקוון"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "הגדר את הרשת"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "הגדר כעת"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "יישומון עדכוני מנדרייק-לינוקס"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "פעולות"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "הגדר"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "בדוק עדכונים"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "צפה ברישומי המערכת"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "מצב"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "סגור"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "למטה"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "חיבור רשת: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "למעלה"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "למטה"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "בדיקה אחרונה:"
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "עדכונים: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "מפעיל את drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "מפעיל את mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "נראה ש Mandrakeonline הותקן מחדש, טוען את היישומון ..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "מנתח עדכונים חדשים...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "מתחבר אל"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "בודק... יש עדכונים זמינים\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "גרסאת פיתוח לא נתמכת על ידי שרות זה"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "גרסה ישנה מדי לא נתמכת בשרות זה"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "מצב לא מוכר"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "השירותים המקוונים הופסקו. עליך להתעדכן באתר Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "סיסמה שגוייה.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "הפעולה או שם מחשב או שם משתמש שגויים.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -184,58 +223,72 @@ msgstr ""
 "והגדרות השרת המתווך)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "המערכת מעודכנת\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "ללא בדיקה"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "בודק זמינות רשת: אין תגובה\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "בודק קובץ הגדרות: לא קיים\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "רישומים"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "נקה"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "אודות..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "הפעל תמיד באתחול המערכת"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "יציאה"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "הבא"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "קודם"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "דלג על האשף"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "קודם"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "ברוך בואך ל Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -245,55 +298,68 @@ msgstr ""
 "תצורת חומרה) לבסיס מידע מקוון במטרה לעדכן\n"
 "אותך אודות עדכוני אבטחה ושדרוגים שימושיים\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "צור חשבון Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "אין לי חשבון ב Mandrakeonline  ואני רוצה"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "הרשם כמנוי"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "שם משתמש:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "אישור סיסמה:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "דוא\"ל קשר:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "הצהרת הפרטיות של מנדרייק-לינוקס"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "אימות"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "הכנס את שם המשתמש, הסיסמה ושם המחשב שלך ב-Mandrakeonline:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "שם המחשב:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "שלח תצורה"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -326,11 +392,18 @@ msgstr ""
 "בתשלום באתר www.mandrakeexpert.com. בנוסף, נעניק\n"
 "לך כתובת דוא\"ל במבנה username@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "סיום"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "העלאת הנתונים הסתימה בהצלחה"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -338,7 +411,8 @@ msgstr ""
 "מעתה ישלחו לך עדכונים לגבי עדכוני אבטחה\n"
 "ועדכונים הודות ל-Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -346,27 +420,28 @@ msgstr ""
 "Mandrakeonline מאפשר לך לעדכן את מחשבך באופן אוטומטי.\n"
 "במערכת שלך תורץ תוכנה באופן סדיר שתחכה לעדכונים.\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "העלאת הנתונים הסתימה בהצלחה"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "שדרוגים אוטומטיים"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "מדינה:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "שגיאה"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "עליך לספק שם משתמש"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -375,38 +450,48 @@ msgstr ""
 "עליך לנסות שנית\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "זו אינה כתובת דוא\"ל תקינה!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "קורא את קובץ התצורה \n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "שולח תצורה..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "ההתחברות נכשלה"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "ישנה בעיה בעת העלאת קבצים, עליך לנסות שנית"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "יוצא מהאשף\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "לא יכול להתחבר לאתר של Mandrakeonline, עליך לנסות שוב מאוחר יותר"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "סיסמה שגוייה"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -422,8 +507,83 @@ msgstr ""
 "המקוון Mandrakeonline. לידיעתך, עליך לספק גם \n"
 "את שם המחשב (יש להשתמש באותיות בלבד)."
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "שם משתמש וסיסמה יכולים לכלול עד 12 תווים\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "אין להשתמש בתווים מיוחדים\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "עליך למלא את כל השדות\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "כתובת דוא\"ל לא תקינה\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "חשבון זה כבר קיים\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "חלה תקלה בחיבור לשרת\n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "ברוך בואך ל Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "ברוך בואך ל Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "סיסמה שגוייה"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "מדינה:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -438,22 +598,53 @@ msgstr ""
 "\n"
 "שימוש:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - הדפס הודעת עזרה זו.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         -Mandrakeupdate יופעל אוטומטי \n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - הרץ את Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - עדכן את המפתחות.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "לא יכול להתחבר לאתר של Mandrakeonline, עליך לנסות שוב מאוחר יותר"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "לא ניתן לעדכן חבילות ממדיית mdkupdate.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "בעיות תצורה. הרץ את \"הגדר\" שוב"
 
@@ -484,39 +675,17 @@ msgstr "  --update       - עדכן את המפתחות.\n"
 #~ msgid "Creation"
 #~ msgstr "יצירה"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "שם משתמש וסיסמה יכולים לכלול עד 12 תווים\n"
-
 #~ msgid "Special characters"
 #~ msgstr "תווים מיוחדים"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "אין להשתמש בתווים מיוחדים\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "שדות ריקים"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "עליך למלא את כל השדות\n"
-
 #~ msgid "Email"
 #~ msgstr "דוא\"ל"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "כתובת דוא\"ל לא תקינה\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "חשבון זה כבר קיים\n"
-
 #~ msgid "Change account"
 #~ msgstr "החלף חשבון"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "חלה תקלה בחיבור לשרת\n"
-
 #~ msgid "Server Problem"
 #~ msgstr "בעיית שרת"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "לא ניתן לעדכן חבילות ממדיית mdkupdate.\n"
-
diff --git a/po/hi.po b/po/hi.po
index 9af58f5e..45c2a3b1 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-22 20:32+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: Hindi, India <dysxhi@yahoo.co.in>\n"
@@ -19,10 +19,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "आपका तंत्र आज-तक अप-टू-डेट है"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -31,152 +33,189 @@ msgstr ""
 "support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "तंत्र व्यस्त है । प्रतीक्षा करें ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "आपके तंत्र हेतु नये अपडेट उपलब्ध है"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "सेवा संरचित नहीं है । कृपया \"सेवा संरचना\" पर क्लिक करें"
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "नेटवर्क डॉउन है । कृपया अपने नेटवर्क की संरचना करें"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "सेवा सक्रिय नहीं है । कृपया \"ऑनलाइन वेब-स्थल\" पर क्लिक करें"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "अपडेटों का संसाधन"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "सेवा की संरचना"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "अपडेटो की जाँच"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "ऑनलाइन वेबस्थल"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "नेटवर्क की संरचना"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "अभी संरचित करें!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "मैनड्रैक अपडेटो का एपलेट"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "कार्यवाहिया"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "संरचना"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "अपडेटो की जाँच"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "लॉगो को देखना"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "स्थिति"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "बन्द"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "नीचे"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "नेटवर्क कनेक्शन: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "ऊपर"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "नीचे"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "अंतिम जाँच: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "अपडेट्स: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "ड्रैककनेक्ट को आरम्भ किया जा रहा है\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "एमडीकेअपडेट को आरम्भ किया जा रहा है\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "एमडीकेऑनलाइन का लगता है कि पुनः संसाधन किया गया है, एपलेट को पुनः लाया जा रहा "
 "है .... "
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "नये अपडेटो की गणना की जा रही है...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "से सम्बन्ध स्थापित हो रहा है"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "जाँच की जा रही है... अपडेट्स उपलब्ध है\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "अज्ञात अवस्था"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "ऑनलाइन सेवायें निष्क्रिय है । मैनड्रैकऑनलाइन स्थल से सम्पर्क करें\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "गलत कूटशब्द।\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "गलत एक्शन या होस्ट या लॉग-इन।\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -185,58 +224,72 @@ msgstr ""
 "जाँच करें)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "तंत्र आज-तक अपडेट है\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "कोई जाँच नहीं"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "नेटवर्क की जाँच की जा रही है: लगता है निष्क्रिय है\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "कॉन्फ़िग संचिका की जाँच की जा रही है: विलुप्त है\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "रोज़नामचे"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "साफ़ करना "
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "के बारे में ।"
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "शुरूवात में सदैव आरम्भ करें"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "निकास"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "अगला"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "पिछला"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "विज़ार्ड को छोड़ कर आगे बढ़े"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "पिछला"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "मैनड्रैकऑनलाइन में स्वागत"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -246,55 +299,68 @@ msgstr ""
 "आपके तंत्र की संरचना को (पैकेजों, हार्डवेयर संरचना), एक केन्द्रीय डाटाबेस में\n"
 "अपलोड करने के लिए, यह सहायक आपकी सहायता करेगा ।\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "एक मैनड्रैकऑनलाइन खाता खोलें"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "मेरे पास एक मैनड्रैकऑनलाइन खाता नहीं है और मै चाहता हूँ "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "ग्राहक बनें"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "लॉग-इन:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "कूटशब्द: "
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "कूटशब्द की संपुष्टि करें:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "विपत्र सम्पर्क:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "मैनड्रैक गोपनीयता नीति"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "प्रमाणीकरण"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "अपना मैनड्रैकऑनलाइन लॉग-इन, कूटशब्द और मशीन नाम बतायें:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "मशीन नाम:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "संरचना भेजें"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -330,11 +396,18 @@ msgstr ""
 "अंत में, एक विपत्र उपनाम आपके username@mandrakeonline.net के साथभी आपको प्रदान किया "
 "जायेगा ।"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "समाप्त"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "आपका अपलोड सफ़ल रहा था !"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -342,7 +415,8 @@ msgstr ""
 "अब से आप सुरक्षा व अपडेटो की घोषणाओं को प्राप्त करेगें \n"
 "मैनड्रैकऑनलाइन को धन्यवाद।"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -351,27 +425,28 @@ msgstr ""
 "करता है।\n"
 "आपके तंत्र में एक कार्यक्रम लगातार नये अपडेटो की प्रतीक्षा में चलता रहेगा\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "आपका अपलोड सफ़ल रहा था !"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "स्वचालित किये हुए अपग्रेड"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "देश:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "त्रुटि"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "कृपया एक लॉग-इन प्रदान करें"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -380,39 +455,49 @@ msgstr ""
 "कृपया पुनः प्रयास करें\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "एक वैध विपत्र पता नहीं!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "संरचना पढ़ी जा रही है\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "संरचना के बारे में सूचित किया जा रहा है..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "सम्बन्ध स्थापन समस्या"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "संचिकाओं को अपलोड करते समय समस्या हुई, कॄपया पुनः प्रयास करें"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "विजार्ड से बाहर निकला जा रहा है\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "मैनड्रैकऑनलाइन से सम्पर्क स्थापित नहीं हो पाया, कृपया कुछ समय उपरान्त पुनः प्रयास करें ।"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "गलत कूटशब्द"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -429,8 +514,83 @@ msgstr ""
 " ध्यान रहें कि आपको एक मशीन का नाम भी प्रदान करना चाहिए\n"
 " (सिर्फ़ वर्णमाला अक्षरों को ही अनुमति है)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "मैनड्रैकऑनलाइन में स्वागत"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "मैनड्रैकऑनलाइन में स्वागत"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "गलत कूटशब्द"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "देश:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -446,18 +606,50 @@ msgstr ""
 "\n"
 "प्रयोग:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - यह सहायता संदेश छापें ।\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - एमडीकेअपडेट का स्वचालित रूप से शुरू होना ।\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - मैनड्रैकअपडेट की शुरूवात।\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - कुँजियों को अपडेट करना\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"मैनड्रैकऑनलाइन से सम्पर्क स्थापित नहीं हो पाया, कृपया कुछ समय उपरान्त पुनः प्रयास करें ।"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 7d8c6f2f..d233c527 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\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"
@@ -16,236 +16,271 @@ msgstr ""
 "X-Generator: KBabel 0.8\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Nema mrežnog adaptera na vašem sustavu!"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
-#, fuzzy
+#, fuzzy, c-format
 msgid "Install updates"
 msgstr "Instaliraj sustav"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Podesi"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Nadogradi"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Čitam postavke\n"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Polica Privatnosti"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Akcije"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Podesi"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr ""
 
 #: ../mdkapplet:160
-#, fuzzy
+#, fuzzy, c-format
 msgid "See logs"
 msgstr "Traži +5s"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Stanje"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Zatvori"
 
 #: ../mdkapplet:202
-#, fuzzy
-msgid "Down"
-msgstr "Gotov"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Mrežne postavke"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr ""
 
+#: ../mdkapplet:202
+#, fuzzy, c-format
+msgid "Down"
+msgstr "Gotov"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Nadogradi"
 
 #: ../mdkapplet:208
-#, fuzzy
+#, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokreni userdrake"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Problem s vezom"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Problem s vezom"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nepoznato ime računala"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Kriva lozinka.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemski mod"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Zapisi"
 
 #: ../mdkapplet:428
-#, fuzzy
+#, fuzzy, c-format
 msgid "Clear"
 msgstr "Kalendar"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "O programu..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Izlaz"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Slijedeće"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Prijašnje"
-
-#: ../mdkonline:88
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, c-format
 msgid "Skip Wizard"
 msgstr "Čarobnjak"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Prijašnje"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Dobro došli u MandrakeOnLine"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -255,59 +290,68 @@ msgstr ""
 "(pakete, hardwaresku konfiguraciju) u centralnu bazu kako\n"
 "bih vas mogli informirati o sigurnosnim i korisnim dogradnjama.\n"
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Dobro došli u MandrakeOnLine"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Nemam Mandrakeonline račun i želim "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Pretplatiti se"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../mdkonline:112
-#, fuzzy
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, fuzzy, c-format
 msgid "Confirm Password:"
 msgstr "Lozinka:"
 
-#: ../mdkonline:113
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, c-format
 msgid "Mail contact:"
 msgstr "Monitor pošte"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux Polica Privatnosti"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autentifikacija"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Unesite vaš Mandrakeonline login,lozinku i ime računala:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Ime računala:"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Čitam postavke\n"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -343,11 +387,18 @@ msgstr ""
 "Na kraju, biti će vam dodijeljen email alias sa izgledom "
 "korisnik@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Završi"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Vaše slanje je bilo uspješno!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -355,7 +406,8 @@ msgstr ""
 "Od sada ćete primati obavijesti o sigurnosti\n"
 "i dogradnjama zahvaljujući Mandrakeonlineu."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -363,72 +415,77 @@ msgstr ""
 "Mandrakeonline nudi vam mogućnost automatiziranja dogradnji.\n"
 "Program će se pokrenuti redovno na vašem sustavu čekajući nove dogradnje\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Vaše slanje je bilo uspješno!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatizirane Dogradnje"
 
-#: ../mdkonline:150
-#, fuzzy
+#: ../mdkonline:151
+#, fuzzy, c-format
 msgid "Country:"
 msgstr "Country"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Greška"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "Molim pokušajte ponovo"
 
 #: ../mdkonline:186
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
 msgstr "Lozinke se ne podudaraju"
 
 #: ../mdkonline:188
-#, fuzzy
+#, fuzzy, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Unesite ispravnu adresu molim!"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Čitam postavke\n"
 
 #: ../mdkonline:205
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending configuration..."
 msgstr "Čitam postavke\n"
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problem s vezom"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Izlazim iz čarobnjaka\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 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:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Kriva lozinka"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -446,8 +503,83 @@ msgstr ""
 " Budite upozoreni da morate također omogućiti ime računala \n"
 " (samo alfabetski karakteri se priznaju)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Dobro došli u MandrakeOnLine"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Dobro došli u MandrakeOnLine"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Kriva lozinka"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Country"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -457,25 +589,54 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --update       - napravi medij za dogradnju.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --update       - napravi medij za dogradnju.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - koristi samo medije za dogradnju.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Mandrakeonline ne može biti kontaktiran, molimo probajte ponovno kasnije"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Configuration"
 #~ msgstr "Čitam postavke\n"
@@ -495,11 +656,6 @@ msgstr "  --update       - koristi samo medije za dogradnju.\n"
 #~ msgstr "Da, želim automatske dogradnje"
 
 #, fuzzy
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "Mandrakeonline ne može biti kontaktiran, molimo probajte ponovno kasnije"
-
-#, fuzzy
 #~ msgid "Mandrakelinux Online Team"
 #~ msgstr "Dobro došli u MandrakeOnLine"
 
diff --git a/po/hu.po b/po/hu.po
index 791a69a7..04f78cee 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-23 12:14+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -17,10 +17,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "A rendszer naprakész"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -29,158 +31,196 @@ msgstr ""
 "következő címre: support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Kis türelmet - a rendszer egy feldolgozást végez..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Elérhetők frissítések az Ön rendszeréhez"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "A szolgáltatás nincs beállítva. Kattintson \"A szolgáltatás beállítása\" "
 "funkcióra."
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "A hálózat nem aktív. Állítsa be a hálózatot."
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
-msgstr "A szolgáltatás nincs aktiválva. Kattintson az \"Online weboldal\" funkcióra."
+msgstr ""
+"A szolgáltatás nincs aktiválva. Kattintson az \"Online weboldal\" funkcióra."
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Nem támogatott verzió (túl régi, vagy fejlesztői verzió)"
 
 # "Rendszerfrissítések telepítése" volt a 8.2-ben,
 #  ebből az utolsó 2 betű nem fért ki
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Frissítések telepítése"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "A szolgáltatás beállítása"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Frissítések keresése"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Online weboldal"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "A hálózat beállítása"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Beállítás most"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux-frissítési alkalmazás"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Műveletek"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Beállítás"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Frissítések keresése"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Információ a naplóban"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Állapot"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Bezárás"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Inaktív"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Hálózati kapcsolat: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Aktív"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Inaktív"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Legutóbbi ellenőrzés: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Frissítések: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "A DrakConnect indítása\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "\"mdkupdate --applet\" indítása\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Úgy tűnik, a Mandrakeonline újra lett telepítve - az alkalmazás "
 "újratöltése..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Új frissítések meghatározása...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Kapcsolódás:"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Ellenőrzés... vannak elérhető frissítések\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "A szolgáltatás nem támogat fejlesztői verziókat"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "Túl régi, a szolgáltatás által nem támogatott verzió"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Ismeretlen állapot"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Az online szolgáltatások inaktiválva vannak. Lépjen kapcsolatba a "
 "Mandrakeonline weboldallal.\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Helytelen jelszó.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Helytelen művelet, gép, vagy bejelentkezési név.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -189,58 +229,72 @@ msgstr ""
 "és a proxybeállításokat).\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "A rendszer naprakész.\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Nincs ellenőrzés"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "A hálózat ellenőrzése: úgy tűnik, nem aktív\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Beállításfájl ellenőrzése: nem található\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Naplók"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Törlés"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Névjegy..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Minden rendszerindításnál induljon el"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Kilépés"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Következő"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Előző"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "A varázsló kihagyása"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Előző"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Üdvözli a Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -250,57 +304,70 @@ msgstr ""
 "(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:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Mandrakeonline-azonosító létrehozása"
 
 # a sztring jelentése: nincs azonosítója, és szeretne egyet
 # a Mandrakeonline tulajdonnevet nem szabad lefordítani
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Nincs Mandrakeonline-azonosítóm, de szeretnék egyet "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Feliratkozás"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Azonosító:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Jelszó (még egyszer):"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Levélcím:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux adatvédelmi elvek"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Azonosítás"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Adja meg Mandrakeonline-azonosítóját, jelszavát és a gépnevet:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Gépnév:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Konfiguráció elküldése"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -338,11 +405,18 @@ msgstr ""
 "Egy új e-mail-címet is rendelkezésére bocsátunk:\n"
 "felhasználónév@mandrakeonline.net"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Befejezés"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "A feltöltés sikeresen megtörtént."
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -350,7 +424,8 @@ 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:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -358,27 +433,28 @@ 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:144
-msgid "Your upload was successful!"
-msgstr "A feltöltés sikeresen megtörtént."
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatizált frissítések"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Ország:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Hiba"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Adjon meg egy azonosítót"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -387,38 +463,49 @@ msgstr ""
 "Adja meg azokat még egyszer.\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Helytelen levélcím.\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Konfiguráció beolvasása\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Konfiguráció küldése..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Kapcsolati hiba"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "A fájlok feltöltésénél probléma lépett fel - próbálja meg ismét."
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Kilépés a Varázslóból\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Nem sikerült kapcsolatba lépni a Mandrakeonline-nal; próbálja meg később."
+msgstr ""
+"Nem sikerült kapcsolatba lépni a Mandrakeonline-nal; próbálja meg később."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Helytelen jelszó"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -435,8 +522,83 @@ msgstr ""
 "Mandrakeonline-hoz.\n"
 "Egy gépnevet is meg kell adnia; a név csak normál betűket tartalmazhat."
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Probléma a kiszolgálóhoz való kapcsolódáskor \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Üdvözli a Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Üdvözli a Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Helytelen jelszó"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Ország:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -451,22 +613,53 @@ msgstr ""
 "\n"
 "Használat:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - jelen segítség megjelenítése\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate automatikus indítása\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdate indítása\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - kulcsok frissítése\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "A Mandrakeupdate nem tudott kapcsolatba lépni a géppel; újabb próba."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "A csomagok Mandrakeupdate-adatforrásból való frissítése sikertelen.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr ""
 #~ "Beállítási problémák vannak. Indítsa el újra a \"Beállítás\" funkciót."
@@ -496,13 +689,6 @@ msgstr "  --update       - kulcsok frissítése\n"
 #~ msgid "Email"
 #~ msgstr "E-mail"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Probléma a kiszolgálóhoz való kapcsolódáskor \n"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr ""
-#~ "A csomagok Mandrakeupdate-adatforrásból való frissítése sikertelen.\n"
-
 #, fuzzy
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Üdvözli a Mandrakeonline!"
@@ -514,10 +700,6 @@ msgstr "  --update       - kulcsok frissítése\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Szeretnék automatikus frissítéseket"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "A Mandrakeupdate nem tudott kapcsolatba lépni a géppel; újabb próba."
-
 #, fuzzy
 #~ msgid "Mandrakelinux Online Team"
 #~ msgstr "Üdvözli a Mandrakeonline!"
@@ -603,4 +785,3 @@ msgstr "  --update       - kulcsok frissítése\n"
 
 #~ msgid "Really abort? - Mandrakeonline"
 #~ msgstr "Valóban kilép? - Mandrakeonline"
-
diff --git a/po/hy.po b/po/hy.po
index 69fa634b..6b500dd8 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-03-20 23:50+0300\n"
 "Last-Translator: Lilit Azizbekyan <l@freenet.am>\n"
 "Language-Team: hy <yes@hay.am>\n"
@@ -16,229 +16,271 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
-#, fuzzy
+#, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "Համակարգը զբաղված է: Սպասեք..."
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Համակարգը զբաղված է: Սպասեք..."
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Ձեր համակարգի համար չկան առկա նորացումներ"
 
 #: ../mdkapplet:85
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Ծառայությունը մատչելի չէ: Հպեք \"ձևակերպել\""
 
 #: ../mdkapplet:91
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Ցանցը անհասանելի է: Ստուգեք \"Ցանցի ձևակերպումը\""
 
 #: ../mdkapplet:97
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Ծառայությունը մատչելի չէ: Հպեք \"ձևակերպել\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Տեղադրել Նորացումները"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Ցանցի Ձևակերպում"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Ստուգել Նորացումները"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Օնլայն ՎեբԷջ"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Ցանցի Ձևակերպում"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Ձևակերպել"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Նորացումների Ապլետ"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Գործողություններ"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Ձևակերպել"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Ստուգել նորացումները"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Ընթերցել արձանագրերը"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Կարգավիճակ"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Փակել"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Ներքև"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Ցանցի Միացում`"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Վերև"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Ներքև"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Նախորդ ստուգում` "
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Վերջին Նորացումներ` "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Ստուգել Նորացումները"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Միացման պրոբլեմ"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr ""
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Սխալ գաղտնաբառ է\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Համակարգը զբաղված է: Սպասեք..."
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Ստուգված չէ"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
-#, fuzzy
+#, fuzzy, c-format
 msgid "Logs"
 msgstr "Մուտք`"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Մաքրել"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Ծրագրի մասին.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Ելք"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr ""
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr ""
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Առանձ Ուղեկցորդի"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr ""
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Բարի գալուստ Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -248,56 +290,68 @@ msgstr ""
 "(փաթեթները, սարքի տվյալները) կենտրոնական բազա` ձեզ տեղյակ\n"
 "պահելու անվտանգության և այլ օգտակար նորացումների մասին:\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Ստեղծել Mandrakeonline Հաշիվ"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Ես չունեմ Mandrakeonline հաշիվ, և ցանկանում եմ ձեռք բերել այն "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Բաժանորդագրվել"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Մուտք`"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Գաղտնաբառը`"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Հաստատեք գաղտնաբառը`"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Հաղորդակցության էլփոստ`"
 
-#: ../mdkonline:120
-#, fuzzy
+#: ../mdkonline:122
+#, fuzzy, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux Անվտանգության Կանոններ"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Տվյալների ստուգում"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Ներմուծեք ձեր Mandrakeonline հաշիվը, գաղտնաբառը և մեքենայի անունը`"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Մեքենայի անունը`"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Ուղարկել ձևակերպում"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -330,11 +384,18 @@ msgstr ""
 "www.mandrakeexpert.com.\n"
 "Ի վերջո, կտրամդրվի փոստարկղ ձեր անունով@mandrakeonline.net:"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Վերջ"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Ափլոադը հաջողությամբ ավարտվեց!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -342,7 +403,8 @@ msgstr ""
 "Այսուհետև շնորհիվ Mandrakeonline-ի ստանալու եք \n"
 "նորացումների և անվտանգության  ծանուցումներ:"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -350,27 +412,28 @@ msgstr ""
 "Mandrakeonline-ը առաջարկում է ավտոմատացնել նորացումները:\n"
 "Ծրագիրը համակարգում ինքնուրույն աշխատացվելու է` ստուգելու նորացումները\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Ափլոադը հաջողությամբ ավարտվեց!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "ավտոմատացված Նորացումներ"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Երկիր`"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Սխալ"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Հայտնեք հաշվի անունը"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -379,38 +442,48 @@ msgstr ""
 "Կրկին փորձեք\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Անվավեր էլփոստի հասցե!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Ձևակերպման ընթերցում\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Ուղարկվում են ձևակերպումները..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Միացման պրոբլեմ"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Ելք Ուղեկցորդից\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Անհնար է միանալ Mandrakeonline, ուշով կրկին փորձեք"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Սխալ գաղտնաբառ է"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -426,8 +499,83 @@ msgstr ""
 "Չմոռանաք նաև ներմուծել մեքենայի անունը\n"
 "(թույլատրված են միայն տառերը)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "Հաշիվը և գաղտնաբառը չեն կարող պարունակել ավելի քան 12 նշան\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Հատուկ նշանները արգելված են\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Լրացրեք բոլոր դատարկ տողերը\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "Անվավեր Էլփոստ\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "Հաշիվը արդեն գոյություն ունի\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Բանավարի հետ միացման խախտում \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Բարի գալուստ Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Բարի գալուստ Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Սխալ գաղտնաբառ է"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Երկիր`"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -442,22 +590,53 @@ msgstr ""
 "\n"
 "կիրառում`\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - ցուցադրել այս տեղեկանքը:\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate ավտոմատ բեռնում:\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - աշխատացնել Mandrakeupdate:\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Նորացնել բանալիները\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate -ը չի կարողանում միանալ էջին. կփորձենք կրկին:"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Անհնար է նորացնել փաթեթները mdkupdate - ից:\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Ձևակերպման պրոբլեմ: Նորեն աշխատացրեք \"ձևակերպումը\""
 
@@ -486,42 +665,21 @@ msgstr "  --update       - Նորացնել բանալիները\n"
 #~ msgid "Creation"
 #~ msgstr "Ստեղծում"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "Հաշիվը և գաղտնաբառը չեն կարող պարունակել ավելի քան 12 նշան\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Հատուկ նշաններ"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Հատուկ նշանները արգելված են\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Դատարկ տողեր"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Լրացրեք բոլոր դատարկ տողերը\n"
-
 #~ msgid "Email"
 #~ msgstr "Էլփոստ"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "Անվավեր Էլփոստ\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "Հաշիվը արդեն գոյություն ունի\n"
-
 #~ msgid "Change account"
 #~ msgstr "Փոխել հաշիվը"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Բանավարի հետ միացման խախտում \n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Բանավարի պրոբլեմ"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Անհնար է նորացնել փաթեթները mdkupdate - ից:\n"
-
 #, fuzzy
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Բարի գալուստ Mandrakeonline"
@@ -532,6 +690,3 @@ msgstr "  --update       - Նորացնել բանալիները\n"
 
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Այո, ցանկանում եմ ավտոմատ ստանալ նորացումներ"
-
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate -ը չի կարողանում միանալ էջին. կփորձենք կրկին:"
diff --git a/po/id.po b/po/id.po
index 382dc98f..61917132 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.01\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-20 23:33+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willy@e-jogja.net>\n"
 "Language-Team: INDONESIA <id@li.org>\n"
@@ -16,11 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Sistem Anda sudah up-to-date"
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -29,157 +30,189 @@ msgstr ""
 "support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistem sedang sibuk. Harap tunggu ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Update baru tersedia untuk sistem Anda"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Layanan belum dikonfigurasi. Silahkan klik pada \"Konfigurasikan layanan\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Jaringan sedang non-aktif. Harap konfigurasikan jaringan Anda"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Layanan tidak diaktifkan. Silahkan klik pada \"Website Online\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instal update"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Konfigurasikan layanan"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Cek Update"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "WebSite Online"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Konfigurasikan Jaringan"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Konfigurasi Sekarang!"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Kebijakan Privacy Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Aksi"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Konfigurasikan"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Cek update"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Lihat log"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Status"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Tutup"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "non-aktif"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Koneksi Jaringan: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Aktif"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "non-aktif"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Pengujian terakhir: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Update"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Menjalankan drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Menjalankan mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline tampaknya baru saja diinstall ulang, me-reload applet ...."
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Menghitung update baru...\n"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Menghubungkan ke"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Memeriksa... Update tersedia\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "status tidak diketahui"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Layanan Online dinonaktifkan. Hubungi situs Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Katasandi salah.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Aksi Salah atau host atau login.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -188,60 +221,72 @@ msgstr ""
 "firewall atau setting proxy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem up-to-date\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Tidak ada pemeriksaan"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Memeriksa Jaringan: tampaknya dinonaktifkan\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Memeriksa file konfigurasi: Tidak ada\n"
 
 #: ../mdkapplet:412
-#, fuzzy
+#, fuzzy, c-format
 msgid "Logs"
 msgstr "Log"
 
 #: ../mdkapplet:428
-#, fuzzy
+#, fuzzy, c-format
 msgid "Clear"
 msgstr "Bersihkan"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Keterangan..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Selalu jalankan ketika pembukaan"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Berikutnya"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Sebelumnya"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Lompati Wizard"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Sebelumnya"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Selamat Datang di Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -251,57 +296,68 @@ msgstr ""
 "(paket, konfigurasi perangkat keras) ke database terpusat agar Anda selalu\n"
 "diberi tahu update sekuriti dan upgrade yang berguna.\n"
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Buat Account Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Saya tak punya account Mandrakeonline dan saya ingin "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Berlangganan"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Katasandi:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Konfirmasi Katasandi:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Kontak mail:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Kebijakan Privacy Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Authentikasi"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Masukkan login, katasandi, dan nama mesin  Mandrakeonline Anda:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Nama mesin:"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Kirim konfigurasi"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -333,11 +389,18 @@ msgstr ""
 "Tambah lagi, Anda akan mendapat diskon servis di www.mandrakeexpert.com.\n"
 "Terakhir, Anda akan mendapatkan alias email namaanda@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Selesai"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Upload Anda sukses!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -345,7 +408,8 @@ msgstr ""
 "Mulai saat ini Anda akan menerima pemberitahuan keamanan dan upgrade\n"
 "dari Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -353,27 +417,28 @@ msgstr ""
 "Mandrakeonline memberi Anda kemampuan update otomatis.\n"
 "Sebuah program akan secara periodik menunggu update baru\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Upload Anda sukses!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Upgrade otomatis"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Negara:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Kesalahan"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Harap masukkan login"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -382,39 +447,48 @@ msgstr ""
 "Coba lagi!\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Alamat mail tak valid!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Membaca konfigurasi\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Mengirimkan konfigurasi..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Masalah koneksi"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Masalah terjadi ketika mengupload file, harap mencoba lagi"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Keluar dari Wizard\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeupdate gagal dihubungi, harap mencoba lagi."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Katasandi salah"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -431,8 +505,83 @@ msgstr ""
 " Ingat, Anda juga harus memberikan nama Mesin \n"
 " (hanya karakter alfabet)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Masalah dalam menghubungi server \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Selamat Datang di Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Selamat Datang di Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Katasandi salah"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Negara:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -448,25 +597,53 @@ msgstr ""
 "\n"
 "pemakaian:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - cetak pesan bantuan ini.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto       - Mandrakeupdate dijalankan secara otomatis.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - jalankan Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - update kunci.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate tidak bisa menghubungi situs, kami akan mencoba lagi."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Gagal meng-update paket dari media mdkupdate.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "About.."
 #~ msgstr "Tentang.."
 
@@ -484,19 +661,9 @@ msgstr "  --update       - update kunci.\n"
 #~ msgid "Email"
 #~ msgstr "Email"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Masalah dalam menghubungi server \n"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Gagal meng-update paket dari media mdkupdate.\n"
-
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Ya saya ingin update otomatis"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "Mandrakeupdate tidak bisa menghubungi situs, kami akan mencoba lagi."
-
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - hanya gunakan media keamanan.\n"
 
diff --git a/po/is.po b/po/is.po
index 4f0806ca..96e8c9af 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-03-02 00:27+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <isl@molar.is>\n"
@@ -17,22 +17,24 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Ef einhver vandræði eru - sendið póst til support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
 "Eftirfarandi myndskannar\n"
@@ -41,280 +43,317 @@ msgstr ""
 "eru tiltækir á kerfinu þínu\n"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Setja inn uppfærslur"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Stilla"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Uppfærslur"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Stilla nettengingu"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Stilla vef"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrake Uppfærsla"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Aðgerðir"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Stilla"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "Öryggisuppfærslur"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr ""
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Staða"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Loka"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Niður"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Virtual Network Connection"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Upp"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Niður"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Uppfærslur"
 
 #: ../mdkapplet:208
-#, fuzzy
+#, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Ræsa userdrake"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Tengist ...\n"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Tenging mistókst"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Óþekkt vél"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
-#, fuzzy
+#, fuzzy, c-format
 msgid "Wrong Password.\n"
 msgstr "Staðfestu lykilorð:"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Kerfisuppsetning"
 
 #: ../mdkapplet:348
-#, fuzzy
+#, fuzzy, c-format
 msgid "No check"
 msgstr "GNU Go tafl"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Annálar"
 
 #: ../mdkapplet:428
-#, fuzzy
+#, fuzzy, c-format
 msgid "Clear"
 msgstr "Dagatal"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Um..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Hætta"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Næsta"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Fyrra"
-
-#: ../mdkonline:88
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, c-format
 msgid "Skip Wizard"
 msgstr " Sleppa leiðbeiningu "
 
-#: ../mdkonline:102
-#, fuzzy
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Fyrra"
+
+#: ../mdkonline:104
+#, fuzzy, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Velkomin(n) í Mandrakelinux"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "MandrakelinuxKlúbb félagi"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr ""
 
-#: ../mdkonline:106
-#, fuzzy
+#: ../mdkonline:108
+#, fuzzy, c-format
 msgid "Subscribe"
 msgstr "Scribus"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Notandi:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Lykilorð:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Staðfestu lykilorð:"
 
-#: ../mdkonline:113
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, c-format
 msgid "Mail contact:"
 msgstr "Netfang:"
 
-#: ../mdkonline:120
-#, fuzzy
+#: ../mdkonline:122
+#, fuzzy, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux tilleggjendur"
 
-#: ../mdkonline:126
-#, fuzzy
+#: ../mdkonline:128
+#, fuzzy, c-format
 msgid "Authentification"
 msgstr "Auðkenning"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:132
-#, fuzzy
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, fuzzy, c-format
 msgid "Machine name:"
 msgstr "Jarðsprengjuleikur"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Hljóðuppsetning"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -334,45 +373,52 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Ljúka"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr ""
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:150
-#, fuzzy
+#: ../mdkonline:151
+#, fuzzy, c-format
 msgid "Country:"
 msgstr "Land"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Villa"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "Reyndu aftur"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -381,42 +427,48 @@ msgstr ""
 " Vinsamlega reyndu aftur\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Ekki gilt netfang!\n"
 
-#: ../mdkonline:200
-#, fuzzy
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, fuzzy, c-format
 msgid "Reading configuration\n"
 msgstr "Endurlesa stillingar"
 
 #: ../mdkonline:205
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending configuration..."
 msgstr "Hljóðuppsetning"
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Tenging mistókst"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
-#, fuzzy
+#: ../mdkonline:252
+#, fuzzy, c-format
 msgid "Quitting Wizard\n"
 msgstr "Skjáborðsálfurinn (stillingar)"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Ekki var hægt að tengjast Mandrakeonline reynið aftur síðar"
 
-#: ../mdkonline:291
-#, fuzzy
+#: ../mdkonline:286
+#, fuzzy, c-format
 msgid "Wrong password"
 msgstr "Ekkert lykilorð"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -427,8 +479,83 @@ msgid ""
 " (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Vandræði við tengingu við miðlara\n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Velkomin(n) í Mandrakelinux"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Velkomin(n) í Mandrakelinux"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Ekkert lykilorð"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Land"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -443,22 +570,53 @@ msgstr ""
 "\n"
 "notkun:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - prenta þetta.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto       - Mandrakeupdate keyrt sjálvirkt.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - ræsa Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - uppfæra lykla.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate gat ekki tengst þjóninum, við reynum aftur."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Gat ekki uppfært pakka frá mdkupdate miðli.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Configuration"
 #~ msgstr "Stillingar"
 
@@ -469,19 +627,10 @@ msgstr "  --update       - uppfæra lykla.\n"
 #~ msgid "Email"
 #~ msgstr "Netfang"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Vandræði við tengingu við miðlara\n"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Gat ekki uppfært pakka frá mdkupdate miðli.\n"
-
 #, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "  --applet       - ræsa Mandrakeupdate.\n"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate gat ekki tengst þjóninum, við reynum aftur."
-
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - nota aðeins öryggismiðil.\n"
 
diff --git a/po/it.po b/po/it.po
index bf83e2bc..5975945b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-31 16:19+0200\n"
 "Last-Translator: Daniele Pighin <daniele@dcs.it>\n"
 "Language-Team: italian <timl@freelists.org>\n"
@@ -20,10 +20,12 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Il tuo sistema è aggiornato"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -32,151 +34,188 @@ msgstr ""
 "support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Il sistema è occupato. Attendi ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Nuovi aggiornamenti disponibili per il tuo sistema"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Servizio non configurato. Clicca su \"Configura il servizio\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La rete è disattivata. Prova a riconfigurare la rete"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servizio non attivato. Clicca su \"Sito web online\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Installa aggiornamenti"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Configura il servizio"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Controlla aggiornamenti"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Sito online"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Configura la rete"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Configura adesso!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet aggiornamenti Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Azioni"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Configura"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Controlla aggiornamenti"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Visualizza i log"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Stato"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Chiudi"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Disattiva"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Connessione alla rete: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Attiva"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Disattiva"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Ultimo controllo: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Aggiornamenti: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Sto avviando drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Sto avviando mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Sembra che Mandrakeonline sia stato reinstallato, ricarico l'applet ..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Calcolo dei nuovi aggiornamenti in corso...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Connessione in corso con"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Sto controllando... Ci sono aggiornamenti disponibili\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Stato ignoto"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Servizi online disabilitati .Contatta il sito Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Password errata.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Azione, host o login errati.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -185,58 +224,72 @@ msgstr ""
 "il firewall o le impostazioni del proxy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Il sistema è aggiornato\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Nessun controllo"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controllo la rete: sembra disattivata\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Controllo il file di configurazione: Non presente\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Log"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Cancella"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Informazioni su..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Lanciare sempre all'avvio"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Esci"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Successivo"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Indietro"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Salta la procedura guidata"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Indietro"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Benvenuto su Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -247,55 +300,68 @@ msgstr ""
 "informato su aggiornamenti del software mirati alla produttività e alla "
 "sicurezza.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Crea un account per Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Non ho un account su Mandrakeonline e vorrei "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Registrarmi"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Nome utente:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Conferma password:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Contatto email:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Politica di Mandrakelinux sulla privacy"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Identificazione"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Immetti nome utente, password e nome computer per Mandrakeonline:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Nome computer:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Invia configurazione"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -329,11 +395,18 @@ msgstr ""
 "Infine, un alias di posta elettronica tuo_nome@mandrakeonline.net verrà "
 "creato per te."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Fine"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Trasmissione completata con successo!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -341,7 +414,8 @@ msgstr ""
 "Da ora in poi riceverai avvisi sulla sicurezza e sugli\n"
 "aggiornamenti grazie a Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -349,27 +423,28 @@ msgstr ""
 "Mandrakeonline ti offre la possibilità di automatizzare gli aggiornamenti.\n"
 "Un programma in attesa di nuovi aggiornamenti sarà eseguito periodicamente\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Trasmissione completata con successo!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Aggiornamenti automatici"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Nazione:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Errore"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Fornisci un nome utente"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -378,38 +453,48 @@ msgstr ""
 "Per favore, riprova\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Non è un indirizzo di email valido!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Lettura della configurazione in corso\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Invio della configurazione in corso..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problema di connessione"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "C'è stato un problema in upload, per favore riprova"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Chiusura in corso\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Non è stato possibile contattare Mandrakeonline, riprova piú tardi"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Password errata"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -426,8 +511,83 @@ msgstr ""
 " Ricorda che devi fornire anche un nome per il tuo computer \n"
 " (sono ammessi solo caratteri alfabetici)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Benvenuto su Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Benvenuto su Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Password errata"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Nazione:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -443,18 +603,49 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - stampa questo messaggio d'aiuto.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate avviato automaticamente.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - avvia Mandrakelinux Update.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Aggiorna chiavi\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Non è stato possibile contattare Mandrakeonline, riprova piú tardi"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 7067044f..3202ae89 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-20 10:56+0900\n"
 "Last-Translator: BANDO Yukiko\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,10 +18,12 @@ msgstr ""
 "X-Generator: KBabel 1.0.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "新しい更新はありません"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -30,152 +32,189 @@ msgstr ""
 "メールしてください。"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "システムがビジー状態です。お待ち下さい..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "新しい更新があります"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "サービスが設定されていません。「サービスの設定」を選択して下さい。"
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "ネットワークが未接続です。ネットワークを設定して下さい。"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "サービスが有効になっていません。「Onlineウェブサイト」を選択して下さい。"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "システムを更新"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "サービスの設定"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "更新をチェック"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Onlineウェブサイト"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "ネットワークの設定"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "設定して下さい"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux 更新アプレット"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "動作"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "設定"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "更新をチェック"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "ログを見る"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "状態"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "閉じる"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "未接続"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "ネットワーク接続: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "接続"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "未接続"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "前回チェック: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "更新: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnectを起動\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "更新アプレットを起動\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline が再インストールされたようです。アプレットを更新中 ..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "新しい更新を計算中...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "接続しています"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "チェック中... 新しい更新があります\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "不明な状態"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Onlineサービスが無効になっています。Mandrakeonline に連絡して下さい。\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "パスワード誤り\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "動作、ホスト、ログイン名のいずれかが誤り\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -184,58 +223,72 @@ msgstr ""
 "確認して下さい。\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "新しい更新はありません\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "チェックなし"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ネットワーク確認: 無効化されているようです\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "設定ファイル確認: ファイルがありません\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "ログ"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "クリア"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "情報.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "起動時に常に開始する"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "終了"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "次へ"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "戻る"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "ウィザードを省略"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "戻る"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Mandrakeonline へようこそ"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -245,55 +298,68 @@ msgstr ""
 "個別にお知らせするために、あなたのシステムに関する情報\n"
 "(パッケージやハードウェアの設定)を集中データベースに送信します。\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Mandrakeonline のアカウント作成"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Mandrakeonline にアカウントを持っていないので... "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "入会する"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "ログイン:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "パスワード確認:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "メールアドレス:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux プライバシー方針"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "認証"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Mandrakeonline のログイン名・パスワード・マシン名を入力して下さい:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "マシン名:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "設定を送信"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -329,11 +395,18 @@ msgstr ""
 "適用されます。\n"
 "手続完了後、あなたの username@mandrakeonline.net をメールでお送りします。"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "終る"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "送信成功"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -341,7 +414,8 @@ msgstr ""
 "これからはセキュリティその他の更新情報を Mandrakeonline \n"
 "がお知らせします。"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -349,27 +423,28 @@ msgstr ""
 "Mandrakeonline をご利用頂くとシステムの更新を自動化できます。\n"
 "チェックプログラムが新しい更新情報を定期的に調べに行きます。\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "送信成功"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "自動アップグレード"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "国名:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "エラー"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "ログイン名を入力してください"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -378,39 +453,49 @@ msgstr ""
 "やり直してください\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "メールアドレスが無効です\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "設定読み込み中\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "設定を送信中..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "接続トラブル"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "ファイル送信中に問題が発生しました。やり直して下さい。"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Wizard を出る\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Mandrakeonline に接続できませんでした。しばらくたってからやり直して下さい。"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "パスワード誤り"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -428,8 +513,83 @@ msgstr ""
 "注意：マシン名も必要です。\n"
 " (アルファベットのみ可)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "サーバ接続中にエラーが発生\n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline へようこそ"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline へようこそ"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "パスワード誤り"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "国名:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -444,22 +604,53 @@ msgstr ""
 "\n"
 "使用方法 :\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - このヘルプメッセージを出力する。\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto       - Mandrakeupdateを自動的に起動する。\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdateを起動する\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - キー更新\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdateはこのサイトに接続できません。再試行します。"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "mdkupdateメディアからのパッケージ更新ができません。\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Configuration"
 #~ msgstr "設定読み込み中\n"
@@ -468,12 +659,6 @@ msgstr "  --update       - キー更新\n"
 #~ msgid "Checking ..."
 #~ msgstr "接続トラブル"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "サーバ接続中にエラーが発生\n"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "mdkupdateメディアからのパッケージ更新ができません。\n"
-
 #, fuzzy
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Mandrakeonline へようこそ"
@@ -485,9 +670,6 @@ msgstr "  --update       - キー更新\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "はい、自動アップデートしたい"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdateはこのサイトに接続できません。再試行します。"
-
 #, fuzzy
 #~ msgid "Mandrakelinux Online Team"
 #~ msgstr "Mandrakeonline へようこそ"
diff --git a/po/ka.po b/po/ka.po
index bf02f755..996b586d 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-26 04:53+0400\n"
 "Last-Translator: Aiet Kolkhi <aiet@qartuli.net>\n"
 "Language-Team: Georgian <aiet@qartuli.com>\n"
@@ -14,283 +14,355 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
-#, fuzzy
+#, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "სისტემა განახლებულია\n"
 
 #: ../mdkapplet:67
-msgid "Service configuration problem. Please check logs and send mail to support@mandrakeonline.net"
-msgstr "პრობლემა სერვისების კონფიგურაციაში. გთხოვთ გადაამოწმოთ ღრიცხვის ფაილები (logs) და გამოაგზავნოთ ფოსტა მისმართზე support@mandrakeonline.net"
+#, c-format
+msgid ""
+"Service configuration problem. Please check logs and send mail to "
+"support@mandrakeonline.net"
+msgstr ""
+"პრობლემა სერვისების კონფიგურაციაში. გთხოვთ გადაამოწმოთ ღრიცხვის ფაილები "
+"(logs) და გამოაგზავნოთ ფოსტა მისმართზე support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "სისტემა დაკავებულია. მოთმინება იქონიეთ..."
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "თქვენი სისტემას განახლება არ ჭირდება"
 
 #: ../mdkapplet:85
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "სერვისი არ არსებობს. დააწკაპუნეთ „კონფიგურირება“-ზე"
 
 #: ../mdkapplet:91
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network is down. Please configure your network"
 msgstr "ქსელი მიუწვდომელია. ამოირჩიეთ „ქსელის კონფიგურირება“"
 
 #: ../mdkapplet:97
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "სერვისი არ არსებობს. დააწკაპუნეთ „კონფიგურირება“-ზე"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
-msgstr "ამ გამოშვების (Release) მხარდაჭერა არ გამაჩნია (ან მოძველებულია, ან development release არის)"
+msgstr ""
+"ამ გამოშვების (Release) მხარდაჭერა არ გამაჩნია (ან მოძველებულია, ან "
+"development release არის)"
 
-#: ../mdkapplet:108
-#: ../mdkapplet:157
+#: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "განახლებების ინსტალირება"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "ქსელის კონფიგურირება"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "განახლებების შეამოწმება"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Online WebSite"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "ქსელის კონფიგურირება"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "კონფიგურირება ახლა!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "მენდრეიქის განახლების აპლეტი"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "მოქმედებები"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "კონფიგურაცია"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "განახლებების შემოწმება"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "აჩვენე აღრიცხვები"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "სტატუსი"
 
-#: ../mdkapplet:167
-#: ../mdkapplet:422
+#: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "დახურვა"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "ძინავს"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "ქსელის კავშირი:"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "ღვიძავს"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "ძინავს"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "ბოლო შემოწმება:"
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "ახალი განახლებები:"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "ვიძახებ drakconnect-ს\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "ვიძახებ mdkupdate --applet-ს\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
-msgstr "როგორ ჩანს Mandrakeonline ხელმეორედ იქნა ინსტალირებული. ხელახლა ვიძახებ აპლეტს..."
+msgstr ""
+"როგორ ჩანს Mandrakeonline ხელმეორედ იქნა ინსტალირებული. ხელახლა ვიძახებ "
+"აპლეტს..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "ვანგარიშობ გასაახლებელ პაკეტებს...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "ვუკავშირდები:"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "ვამოწმებ... არსებობს გასაახლებელი პაკეტები\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "Development release-ის მხარდაჭერა სერვისს არ გააჩნია"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "release ძალიან ძველია და service-ს მისი მხარდაჭერა არ გააჩნია"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "უცნობი მდგომარეობა"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
-msgstr "ონლაინ მომსახურებები შეწყვეტილია. მიაკითხეთ Mandrakeonline-ის ვებგვერდს\n"
+msgstr ""
+"ონლაინ მომსახურებები შეწყვეტილია. მიაკითხეთ Mandrakeonline-ის ვებგვერდს\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "არასწორი პაროლი\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "არასწორი მოქმედება, ჰოსტი ან შესვლა.\n"
 
 #: ../mdkapplet:259
-msgid "Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
-msgstr "თქვენი ქსელის პარამეტრებში რაღაც გაუგებრობაა (გადაამოწმეთ route, firewall ან proxy პარამეტრები)\n"
+#, c-format
+msgid ""
+"Something is wrong with your network settings (check your route, firewall or "
+"proxy settings)\n"
+msgstr ""
+"თქვენი ქსელის პარამეტრებში რაღაც გაუგებრობაა (გადაამოწმეთ route, firewall ან "
+"proxy პარამეტრები)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "სისტემა განახლებულია\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "შეამოწმების გარეშე"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ვამოწმებ ქსელს: როგორც ჩანს გამორთულია\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "ვამოწმებ config ფაილს: არა იძებნება\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "ლოგები (აღრიცხვები)"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "ამოშლა"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "შესახებ..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "მუდამ გამოიძახე სისტემის ჩატვირთვისას (startup)"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "გასვლა"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "შემდეგი"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "წინა"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "ჯადოქარის დასრულება"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "წინა"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "კეთილი იყოს თქვენი ფეხი Mandrakeonline-ზე."
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 "ეს ასისტენტი დაგეხმარებათ თქვენი კონფიგურაციის განახლებაში\n"
-"(პაკეტები, აპარატურის კონფიგურაცია) ცენტრალურ მონაცემთა ბაზაში, იმისთვის, რომ\n"
-"თქვენ ავტომატურად შეიტყოთ უსაფრთხობასთან დაკავშირებულ და მნიშვნელოვან გაუმჯობესებებზე.\n"
+"(პაკეტები, აპარატურის კონფიგურაცია) ცენტრალურ მონაცემთა ბაზაში, იმისთვის, "
+"რომ\n"
+"თქვენ ავტომატურად შეიტყოთ უსაფრთხობასთან დაკავშირებულ და მნიშვნელოვან "
+"გაუმჯობესებებზე.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Mandrakeonline-ზე ანგარიშის გახსნა"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "მე არ მაქვს Mandrakeonline ანგარიში, თუმცა მინდა მქონდეს"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "გაწევრიანება"
 
-#: ../mdkonline:110
-#: ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "მომხმარებელი:"
 
-#: ../mdkonline:111
-#: ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "პაროლი:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "გაიმეორეთ პაროლი:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "ელფოსტით კავშირი:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux-ის პირადი უფლებების პოლისი"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "რეგისტრაცია"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "შეიყვანეთ თქვენი Mandrakeonline-ის მომხმარებლის სახელი, პაროლი და სისტემის სახელი:"
+msgstr ""
+"შეიყვანეთ თქვენი Mandrakeonline-ის მომხმარებლის სახელი, პაროლი და სისტემის "
+"სახელი:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "სისტემის სახელი (Machine name):"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "კონფიგურაცის გადაგზავნა"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -299,12 +371,15 @@ msgid ""
 "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"
+"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."
+"Finally, an email alias with your username@mandrakeonline.net will be "
+"provided to you."
 msgstr ""
 "იმისათვის, რომ გამოიყენოთ Mandrakeonline-ის სერვისი, ჩვენ ვაპირებთ\n"
 "თქვენი კონფიგურაციის განახლებას.\n"
@@ -316,56 +391,63 @@ msgstr ""
 "თუ თქვენ ეს არ გსურთ, ან არ გინდათ სერვისის გამოყენება, გთხოვთ\n"
 "დააჭიროთ 'სტოპ!'-ს. თუ 'შემდეგი'-ს დააჭერთ, მაშინ უფლებას გვეძლევა\n"
 "შეგატყობინოთ უსაფრთხოებასთან დაკავშირებული და მნიშვნელოვანი\n"
-"გაუმჯობესებების შესახებ. ასევე ისარგებლებთ ფასდაკლებული ფასიანი მომსახურებით\n"
+"გაუმჯობესებების შესახებ. ასევე ისარგებლებთ ფასდაკლებული ფასიანი "
+"მომსახურებით\n"
 "www.mandrakeexpert.com.-ზე\n"
 "და ბოლოს, თქვენ მიიღებთ ელფოსტის ალიასს მომხმარებელი@mandrakeonline.net."
 
-#: ../mdkonline:143
-#: ../mdkonline:212
-#: ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "დამთავრება"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "განახლება წარმატებით დაგვირგვინდა!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
 msgstr ""
-"Mandrakeonline-ის მეშვეობით დღეიდან თქვენ მიიღებთ უსაფრთხოებასთან დაკავშირებულ\n"
+"Mandrakeonline-ის მეშვეობით დღეიდან თქვენ მიიღებთ უსაფრთხოებასთან "
+"დაკავშირებულ\n"
 "და მნიშვნელოვან გაუმჯობესებების განცხადებებს."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 "Mandrakeonline გაძლევთ საშუალებას ავტომატურად განაახლოთ სისტემა.\n"
-"თქვენს სისტემაზე რეგულარურად გაიშვება პროგრამა, რომელიც განახლებებს დაელოდება\n"
-
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "განახლება წარმატებით დაგვირგვინდა!"
+"თქვენს სისტემაზე რეგულარურად გაიშვება პროგრამა, რომელიც განახლებებს "
+"დაელოდება\n"
 
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "ავტომატიზირებული განახლება"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "ქვეყანა:"
 
-#: ../mdkonline:179
-#: ../mdkonline:184
-#: ../mdkonline:186
-#: ../mdkonline:188
+#: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "შეცდომა"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "გთხოვთ მიუთითოთ შესასვლელი სახელი"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -374,79 +456,199 @@ msgstr ""
 " გთხოვთ ცადოთ ისევ\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "გთხოვთ სწორი მისამართი შეიყვანოთ!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "ვკითხულობ კონფიგურაცას\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "ვაგზავნი კონფიგურაციას..."
 
-#: ../mdkonline:214
-#: ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "კავშირის პრობლემა"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "ფაილების ატვირთვისას პრობლემებია. გთხოვთ კვლავ ცადოთ"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "ოსტატის დასრულება\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeonline-ს ვერ ვუკავშირდები. გთხოვთ მოგვიანებით სცადოთ"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "არასწორი პაროლი"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to Mandrakeonline.\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-ზე დასაკავშირებლად. გაითვალისწინეთ, რომ თქვენ ასევე უნდა მიუთითოთ სისტემის სახელი(Machine name) \n"
+" ამ უკანასკნელის გასაკეთებლად მიუბრუნდით პირველ მოქმედებას Mandrakeonline-ზე "
+"დასაკავშირებლად. გაითვალისწინეთ, რომ თქვენ ასევე უნდა მიუთითოთ სისტემის "
+"სახელი(Machine name) \n"
 " (ნებადართულია მხოლოდ ანბანის ასოები)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "კეთილი იყოს თქვენი ფეხი Mandrakeonline-ზე."
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "კეთილი იყოს თქვენი ფეხი Mandrakeonline-ზე."
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "არასწორი პაროლი"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "ქვეყანა:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate ვერსია %s\n"
 "საავტორო უფლებები (C) %s Mandrakesoft.\n"
-"პროგრამა უფასო გახლავთ და ნებადართულია მისი GNU GPL ლიცენზიის პირობების თანახმად გავრცელება.\n"
+"პროგრამა უფასო გახლავთ და ნებადართულია მისი GNU GPL ლიცენზიის პირობების "
+"თანახმად გავრცელება.\n"
 "\n"
 "გამოყენება:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate-ის ავტომატური გამოძახებ.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - გამოიძახე Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - განახლების კვანძები\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeonline-ს ვერ ვუკავშირდები. გთხოვთ მოგვიანებით სცადოთ"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 67f71353..f83e21ff 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\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"
@@ -15,237 +15,271 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "문의사항은 support@mandrakeonline.net로 메일 주세요.\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "네트웍 어댑터를 찾을 수 없습니다!"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
-#, fuzzy
+#, fuzzy, c-format
 msgid "Install updates"
 msgstr "테마 설치"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "서비스 설정"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "업데이트 버전"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "네트웍 설정"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "설정사항 읽는 중\n"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "맨드레이크 프라이버시 정책"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "동작"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "설정"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "보안 업데이트"
 
 #: ../mdkapplet:160
-#, fuzzy
+#, fuzzy, c-format
 msgid "See logs"
 msgstr "+5초 탐색"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "상태"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "닫기"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "아래로"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "네트웍 환경 설정"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "위로"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "아래로"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "업데이트 버전"
 
 #: ../mdkapplet:208
-#, fuzzy
+#, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "사용자드레이크 실행"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "연결 문제"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "연결 문제"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "알 수 없는 호스트 이름"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "잘못된 암호\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "시스템 모드"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "로그"
 
 #: ../mdkapplet:428
-#, fuzzy
+#, fuzzy, c-format
 msgid "Clear"
 msgstr "달력"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "정보..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "종료"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "다음"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "이전"
-
-#: ../mdkonline:88
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, c-format
 msgid "Skip Wizard"
 msgstr "NFS 마법사"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "이전"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "맨드레이크 온라인에 잘 오셨습니다."
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -256,59 +290,68 @@ msgstr ""
 "이는 님께 보안 업데이트나 유용한 업그레이드에 대해 지속적으로 알리기 위함입니"
 "다.\n"
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "맨드레이크 온라인에 잘 오셨습니다."
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "맨드레이크 온라인에 계정이 없으며, 새로 만들고 싶습니다."
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "구독"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "로그인:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "암호:"
 
-#: ../mdkonline:112
-#, fuzzy
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, fuzzy, c-format
 msgid "Confirm Password:"
 msgstr "암호:"
 
-#: ../mdkonline:113
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, c-format
 msgid "Mail contact:"
 msgstr "편지 지켜보기"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "맨드레이크 프라이버시 정책"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "인증"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "맨드레이크온라인 사용자명, 암호, 컴퓨터 이름을 입력하세요:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "컴퓨터 이름:"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "설정사항 읽는 중\n"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -341,11 +384,18 @@ msgstr ""
 "받으실 수도 있습니다.\n"
 "또한, 「사용자명@mandrakeonline.net」의 이메일 별칭을 부여받게 됩니다."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "완료"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "성공적으로 전송되었습니다!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -353,7 +403,8 @@ msgstr ""
 "이제부터 보안과 업그레이드에 대한 정보를 \n"
 "맨드레이크 온라인을 통해 받아 보실 수 있습니다."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -361,72 +412,77 @@ msgstr ""
 "맨들레크 온라인은 님께 자동업데이트 기능을 제공합니다.\n"
 "새로운 업데이트를 확인하기 위하여 프로그램이 정기적으로 실행될 것입니다.\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "성공적으로 전송되었습니다!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "자동 업그레이드"
 
-#: ../mdkonline:150
-#, fuzzy
+#: ../mdkonline:151
+#, fuzzy, c-format
 msgid "Country:"
 msgstr "컨트리"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "오류"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "다시 시도하세요."
 
 #: ../mdkonline:186
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
 msgstr "암호가 일치하지 않습니다."
 
 #: ../mdkonline:188
-#, fuzzy
+#, fuzzy, c-format
 msgid "Not a valid mail address!\n"
 msgstr "유효한 주소를 입력하세요!"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "설정사항 읽는 중\n"
 
 #: ../mdkonline:205
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending configuration..."
 msgstr "설정사항 읽는 중\n"
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "연결 문제"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "마법사 종료 중\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "맨드레이크 업데이트가 사이트에 접속하지 못했습니다. 다시 시도할 것입니다."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "잘못된 암호"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -442,8 +498,83 @@ msgstr ""
 "또한 컴퓨터 이름도 입력해야 한다는 것을 알아두세요.\n"
 "(컴퓨터 이름은 알파뱃만 허용됩니다.)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "맨드레이크 온라인에 잘 오셨습니다."
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "맨드레이크 온라인에 잘 오셨습니다."
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "잘못된 암호"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "컨트리"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -458,22 +589,54 @@ msgstr ""
 "\n"
 "usage:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 이 도움말 출력.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr ""
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr ""
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr ""
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"맨드레이크 업데이트가 사이트에 접속하지 못했습니다. 다시 시도할 것입니다."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Configuration"
 #~ msgstr "설정사항 읽는 중\n"
@@ -490,11 +653,6 @@ msgstr ""
 #~ msgstr "예, 자동 업데이트하고 싶습니다."
 
 #, fuzzy
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "맨드레이크 업데이트가 사이트에 접속하지 못했습니다. 다시 시도할 것입니다."
-
-#, fuzzy
 #~ msgid "Mandrakelinux Online Team"
 #~ msgstr "맨드레이크 온라인에 잘 오셨습니다."
 
diff --git a/po/ky.po b/po/ky.po
index 3ecf92f1..914aea05 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ky\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-05-03 11:41+0600\n"
 "Last-Translator: Timur Jamakeev <ztimur@mail.ru>\n"
 "Language-Team: Kyrgyz\n"
@@ -17,280 +17,339 @@ msgstr ""
 "X-Generator: KBabel 1.0.1\n"
 
 #: ../mdkapplet:61
-#, fuzzy
+#, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "Система жаңылоону талап кылбайт\n"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Система бош эмес. Күтүү ..."
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Сиздин системаңыз үчүн мүмкүн болгон жаңылоолор жок"
 
 #: ../mdkapplet:85
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Кызмат мүмүкүн эмес. \"конфигурацияны\" басыңыз"
 
 #: ../mdkapplet:91
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Тармак иштеген эмес. \"Тармакты конфигурациялоону\" басыңыз"
 
 #: ../mdkapplet:97
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Кызмат мүмүкүн эмес. \"конфигурацияны\" басыңыз"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Жаңылоолорду орнотуу"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Тармакты конфигурациялоо"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Жаңылоолорду текшерүү"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Онлайндагы веб-сайт"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Тармакты конфигурациялоо"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Азыр конфигурациялоо!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Updates апплети"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Аракеттер"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Конфигурациялоо"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Жаңылоолорду текшерүү"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Логдорду кара"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Абалы"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Жабуу"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Төмөн"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Тармак байланышы: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Жогору"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Төмөн"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Акыркы текшерүү: "
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Жаңы жаңылоолор: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect иштетүү\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "mdkupdate --applet иштетүү\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Жаңы жаңылоолор эсептелүүдө...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Төмөнкүгө туташуу"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Текшерүү... Жаңылоолор мүмүкүн\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr ""
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Онлайн кызматы өчүрүлгөн. Mandrakeonline сайты менен байланышыңыз\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Туура эмес пароль.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Туура эмес аракет, же хост, же логин.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Система жаңылоону талап кылбайт\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Текшерүүсүз"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Тармак текшерилүүдө: өчүрүлгөн көрүнөт\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Конфиг файлы текшерилүүдө: жок\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Логдор"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Тазалоо"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Жөнүндө.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Чыгуу"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Кийинки"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Мурунку"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Устаны коё берүү"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Мурунку"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Mandrakeonline кош келиңиз"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Mandrakeonline аккаунтун түзүү"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Менде Mandrakeonline акаунту жок жана менин каалом"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Жазылуу"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Логин:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Паролду кайталоо:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Почта байланышы:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux коопсуздук саясаты"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Аутентификация"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Mandrakeonline логинин, паролун жана машина атын киргизиңиз:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Машинанын аты:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Конфигурацияны жөнөтүү"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -310,43 +369,52 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Аяктоо"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Сыртка жүктөө ийгиликтүү!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Сыртка жүктөө ийгиликтүү!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "автоматтык жаңылоолор"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Өлкө:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Ката"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Логинди көрсөтүңүз"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -355,38 +423,48 @@ msgstr ""
 " Кайталаңыз\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Туура эмес почта адреси!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Конфигурация окулууда\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Конфигурация жөнөтүлүүдө..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Туташуу проблемасы"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Устадан чыгуу\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeonline туташылбады, кийинчерээк кайталаңыз"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Туура эмес пароль"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -397,8 +475,83 @@ msgid ""
 " (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "Логин жана пароль 12 символдон кем болушу керек\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Атайын символдор мүмкүн эмес\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Бардык талааларды толтуруңуз\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "Email туура эмес\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "Мындай аккаунт бар\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Сервер менен туташуу проблемасы \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline кош келиңиз"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline кош келиңиз"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Туура эмес пароль"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Өлкө:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -408,22 +561,53 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - бул маалыматты чыгаруу.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate автоматтык түрдө иштетүү.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdate иштетүү.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - ачкычтарды жаңылоо\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeonline туташылбады, кийинчерээк кайталаңыз"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "mdkupdate булагынан пакеттерди жаңылоо мүмкүн эмес.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Конфигурация проблемасы. \"конфигурацияны\" кайра иштетиңиз"
 
@@ -454,42 +638,21 @@ msgstr "  --update       - ачкычтарды жаңылоо\n"
 #~ msgid "Creation"
 #~ msgstr "Түзүү"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "Логин жана пароль 12 символдон кем болушу керек\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Атайын символдор"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Атайын символдор мүмкүн эмес\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Бош талаалар"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Бардык талааларды толтуруңуз\n"
-
 #~ msgid "Email"
 #~ msgstr "Email"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "Email туура эмес\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "Мындай аккаунт бар\n"
-
 #~ msgid "Change account"
 #~ msgstr "Аккаунтту өзгөртүү"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Сервер менен туташуу проблемасы \n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Сервер проблемасы"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "mdkupdate булагынан пакеттерди жаңылоо мүмкүн эмес.\n"
-
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Mandrakeonline серверинин жообу\n"
 
diff --git a/po/lt.po b/po/lt.po
index 62cd12f2..15bd5f0c 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2003-02-20 13:28+0200\n"
 "Last-Translator: Darius Liepuonis <dariusle@takas.lt>\n"
 "Language-Team: Lithuanian <>\n"
@@ -15,11 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -27,284 +28,327 @@ msgstr ""
 "Dėl visų kilusių problemų galite rašyti adresu support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Tavo sistemoje nerasta jokia tinklo plokštė!"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
-#, fuzzy
+#, fuzzy, c-format
 msgid "Install updates"
 msgstr "Įdiegti sistemą"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Nustatyti servisus"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Atnaujinti"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Nustatyti tinklą"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Skaitau nustatymus\n"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux valdymo centras %s\n"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Veiksmai"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Nustatyti"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "Saugumo atnaujinimai"
 
 #: ../mdkapplet:160
-#, fuzzy
+#, fuzzy, c-format
 msgid "See logs"
 msgstr "Siekti +5s"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Statusas"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Uždaryti"
 
 #: ../mdkapplet:202
-#, fuzzy
-msgid "Down"
-msgstr "Atlikta"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Tinklo konfigūravimas"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr ""
 
+#: ../mdkapplet:202
+#, fuzzy, c-format
+msgid "Down"
+msgstr "Atlikta"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Atnaujinti"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Sujungimo klaida"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Sujungimo klaida"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nežinomas vartotojas."
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Neteisingas slaptažodis.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemos režimas"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logai"
 
 #: ../mdkapplet:428
-#, fuzzy
+#, fuzzy, c-format
 msgid "Clear"
 msgstr "Kalendorius"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Apie..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Išeiti"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Sekantis"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Ankstesnis"
-
-#: ../mdkonline:88
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, c-format
 msgid "Skip Wizard"
 msgstr "Praleisti vedlį"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Ankstesnis"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Sveiki atvykę į Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Sveiki atvykę į Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Aš neturiu Mandrakeonline sąskaitos bet noriu "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Užsiprenumeruoti"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Vardas:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Slaptažodis"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Patvirtinkite slaptažodį:"
 
-#: ../mdkonline:113
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, c-format
 msgid "Mail contact:"
 msgstr "E-pašto kontaktas:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autentifikacija"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Įveskite savo Mandrakeonline sąskaitos vardą ir slaptažodį:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Mašinos vardas:"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Skaitau nustatymus\n"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -324,11 +368,18 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Baigti"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Jūsų siuntimas buvo sėkmingas!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -336,7 +387,8 @@ msgstr ""
 "Nuo dabar jūs gausite pranešimus apie saugumo pataisas \n"
 "ir atnaujinimus."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -344,29 +396,28 @@ msgstr ""
 "MandrakeOnlina jums siųlo galimybę automatizuoti jūsų atnaujinimus.\n"
 "Programa reguleriai pasileis jūsų sistemoje laukdama atnaujinimų\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Jūsų siuntimas buvo sėkmingas!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatizuoti Atnaujinimai"
 
-#: ../mdkonline:150
-#, fuzzy
+#: ../mdkonline:151
+#, fuzzy, c-format
 msgid "Country:"
 msgstr "Kantri"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Klaida"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "Prašom bandyti vėl"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -375,42 +426,50 @@ msgstr ""
 " Pabandyk dar kartą\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Neteisingas e-pašto adresas!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Skaitau nustatymus\n"
 
 #: ../mdkonline:205
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending configuration..."
 msgstr "Skaitau nustatymus\n"
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Sujungimo klaida"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Baigti vedlį\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 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:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Neteisingas slaptažodis"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -421,8 +480,83 @@ msgid ""
 " (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Sveiki atvykę į Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Sveiki atvykę į Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Neteisingas slaptažodis"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Kantri"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -438,25 +572,55 @@ msgstr ""
 " \n"
 "naudojimas:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - parodyti šį pagalbos langa.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - atnaujinti visa informaciją.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - atnaujinti visa informaciją.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - atnaujinti visa informaciją.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Mandrakeupdate negali prisijungti prie tarnybinės stoties, pabandysime "
+"vėliau."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Negaliu atnaujinti paketų sarašo iš mdkupdate šaltinio. \n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Configuration"
 #~ msgstr "Skaitau nustatymus\n"
@@ -465,9 +629,6 @@ msgstr "  --applet       - atnaujinti visa informaciją.\n"
 #~ msgid "Checking ..."
 #~ msgstr "Sujungimo klaida"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Negaliu atnaujinti paketų sarašo iš mdkupdate šaltinio. \n"
-
 #, fuzzy
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Sveiki atvykę į Mandrakeonline"
@@ -479,11 +640,6 @@ msgstr "  --applet       - atnaujinti visa informaciją.\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Taip, aš noriu automatinių atnaujinimų"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "Mandrakeupdate negali prisijungti prie tarnybinės stoties, pabandysime "
-#~ "vėliau."
-
 #, fuzzy
 #~ msgid "Mandrakelinux Online Team"
 #~ msgstr "Sveiki atvykę į Mandrakeonline"
diff --git a/po/ltg.po b/po/ltg.po
index 927e5d99..4aecc1f3 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-02-17 17:39+0200\n"
 "Last-Translator: Unknown\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -16,22 +16,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Problemu gadīnī syutit e-posta viesti iz support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
 "Sekuojūši skeneri\n"
@@ -40,217 +42,249 @@ msgstr ""
 "ir pīejami iz jiusu sistemys.\n"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Uzstuodeit jaunynuojumus"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Konfigurēt"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Modernizeijumi"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Teikla konfigureišona"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Nūlosu konfiguraceju\n"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux privātuma politika"
 
 #: ../mdkapplet:155
-#, fuzzy
+#, fuzzy, c-format
 msgid "Actions"
 msgstr "Darbeiba"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Konfigurēt"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "Atvārtū portu puorbaude"
 
 #: ../mdkapplet:160
-#, fuzzy
+#, fuzzy, c-format
 msgid "See logs"
 msgstr "Meklēt +5s"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Stuovūklis"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Aizvērt"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Iz leju"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Jauns pīslāgums"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Iz augšu"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Iz leju"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Modernizeijumi"
 
 #: ../mdkapplet:208
-#, fuzzy
+#, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Palaist userdrake"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Dasaslādzu ...\n"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Pīslāguma problema"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nazynuoms hostdatora vuords"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Napareizs paroļs.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemys režims"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Žurnali"
 
 #: ../mdkapplet:428
-#, fuzzy
+#, fuzzy, c-format
 msgid "Clear"
 msgstr "Kalendars"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Par..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Izīt"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Tuoļuok"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Atpakaļ"
-
-#: ../mdkonline:88
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, c-format
 msgid "Skip Wizard"
 msgstr "Meistars"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Atpakaļ"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Laipni lyudzam Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -261,59 +295,69 @@ msgstr ""
 "uz centralizeitu datubāzi, itys vyss teik dareits ar mierķi, lai jius tyktu\n"
 "informeits par drūšeibys uzlobuojumim i cytim vierteigim jaunumim.\n"
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Laipni lyudzam Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Maņ nav Mandrakelinux Online konta, i es grybu tū īgiut"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Dasaraksteit"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Lītuotuojs:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Apstyprynuot paroli:"
 
-#: ../mdkonline:113
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, c-format
 msgid "Mail contact:"
 msgstr "Posta trauksme"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux privātuma politika"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autentifikaceja"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Īvodit jiusu Mandrakeonline lītuotuojvuordu, paroli i datora nūsaukumu:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Datora nūsaukums:"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Nūlosu konfiguraceju\n"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -348,11 +392,18 @@ msgstr ""
 "Vysbeidzūt, jiusim tiks izveiduota e-posta puoradresacejis adrese\n"
 "lītuotuojs@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Beigt"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Nūsyuteišona beja veiksmeiga!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -360,7 +411,8 @@ msgstr ""
 "Niule pasateicūt Mandrakeonline jius sajimsit\n"
 "paziņuojumus par drūšeibys i cytim jaunynuojumim."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -368,69 +420,76 @@ msgstr ""
 "Mandrakeonline pīduovoj īspieju automatizēt jaunynuojumus.\n"
 "Jiusu sistema regulari palaiss programmu, kas gaideis jaunynuojumus\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Nūsyuteišona beja veiksmeiga!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatizeita uzlobuošona"
 
-#: ../mdkonline:150
-#, fuzzy
+#: ../mdkonline:151
+#, fuzzy, c-format
 msgid "Country:"
 msgstr "Kauntrī"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Klaida"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "Lyudzu mieginit vēlreiz"
 
 #: ../mdkonline:186
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
 msgstr "Parolis nasakreit"
 
 #: ../mdkonline:188
-#, fuzzy
+#, fuzzy, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Lyudzu, īvodit dereigu adresi!"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Nūlosu konfiguraceju\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Syutu konfiguraceju..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Pīslāguma problema"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Izeju nu vedņa\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeupdate navar dasaslēgt da servera, pamieginuosim vāluok"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Napareizs paroļs"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -448,8 +507,83 @@ msgstr ""
 "Īvārojit, ka jiusim juonūruoda ari datora nūsaukums \n"
 "(atļauti tikai latiņu alfabeta burti)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Laipni lyudzam Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Laipni lyudzam Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Napareizs paroļs"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Kauntrī"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -465,25 +599,53 @@ msgstr ""
 "\n"
 "pīlītuojums:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - drukuot itū paliedzeibys tekstu.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - atjaunuot vysu informaceju.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - atjaunuot vysu informaceju.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - atjaunuot vysu informaceju.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate navar dasaslēgtda servera, mieginuosim vāluok."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Nav īspiejams atjaunuot pakūtnis nu mdkupdate medium.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Configuration"
 #~ msgstr "Nūlosu konfiguraceju\n"
@@ -492,9 +654,6 @@ msgstr "  --applet       - atjaunuot vysu informaceju.\n"
 #~ msgid "Checking ..."
 #~ msgstr "Dasaslādzu ...\n"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Nav īspiejams atjaunuot pakūtnis nu mdkupdate medium.\n"
-
 #, fuzzy
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Laipni lyudzam Mandrakeonline"
@@ -506,9 +665,6 @@ msgstr "  --applet       - atjaunuot vysu informaceju.\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Da, es vālūs automatiskus jaunynuojumus"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate navar dasaslēgtda servera, mieginuosim vāluok."
-
 #, fuzzy
 #~ msgid "Mandrakelinux Online Team"
 #~ msgstr "Laipni lyudzam Mandrakeonline"
diff --git a/po/lv.po b/po/lv.po
index a89fb575..0c328ae5 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\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"
@@ -16,237 +16,271 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Problēmu gadījumā sūtiet vēstuli uz support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Jūsu sistēmā nav tīkla adaptera!"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
-#, fuzzy
+#, fuzzy, c-format
 msgid "Install updates"
 msgstr "Instalēt tēmas"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Servisu konfigurēšana"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Atjaunināt"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Tīkla konfigurēšana"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Nolasu konfigurāciju\n"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux privātuma politika"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Darbības"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Konfigurēt"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "Drošības atjauninājumi"
 
 #: ../mdkapplet:160
-#, fuzzy
+#, fuzzy, c-format
 msgid "See logs"
 msgstr "Meklēt +5s"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Statuss"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Aizvērt"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Uz leju"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Virtuālā tīkla pieslēgums"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Uz augšu"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Uz leju"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Atjaunināt"
 
 #: ../mdkapplet:208
-#, fuzzy
+#, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Izpildīt userdrake"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Pieslēguma problēma"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Pieslēguma problēma"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nezināms servera vārds"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Nepareiza parole.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistēmas režīms"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Žurnāli"
 
 #: ../mdkapplet:428
-#, fuzzy
+#, fuzzy, c-format
 msgid "Clear"
 msgstr "Kalendārs"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Par..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Iziet"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Tālāk"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Atpakaļ"
-
-#: ../mdkonline:88
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, c-format
 msgid "Skip Wizard"
 msgstr "NFS meistars"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Atpakaļ"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Laipni lūdzam Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -257,59 +291,69 @@ 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:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Laipni lūdzam Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Man nav Mandrakelinux Online konta, un es vēlos "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Parakstīties"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Lietotājs:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Apstiprināt paroli:"
 
-#: ../mdkonline:113
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, c-format
 msgid "Mail contact:"
 msgstr "Pasta novērotājs"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux privātuma politika"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autentifikācija"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Ievadiet jūsu Mandrakeonline lietotājvārdu, paroli un datora nosaukumu:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Datora nosaukums:"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Nolasu konfigurāciju\n"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -344,11 +388,18 @@ msgstr ""
 "Visbeidzot, jums tiks izveidota e-pasta pāradresācijas adrese\n"
 "lietotājs@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Beigt"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Nosūtīšana bija veiksmīga!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -356,7 +407,8 @@ msgstr ""
 "Tagad pateicoties Mandrakeonline jūs saņemsit\n"
 "paziņojumus par drošības un citiem jauninājumiem."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -364,71 +416,76 @@ 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:144
-msgid "Your upload was successful!"
-msgstr "Nosūtīšana bija veiksmīga!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatizēta uzlabošana"
 
-#: ../mdkonline:150
-#, fuzzy
+#: ../mdkonline:151
+#, fuzzy, c-format
 msgid "Country:"
 msgstr "Kantrī"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Kļūda"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "Lūdzu mēģiniet vēlreiz"
 
 #: ../mdkonline:186
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
 msgstr "Paroles nesakrīt"
 
 #: ../mdkonline:188
-#, fuzzy
+#, fuzzy, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Ievadiet, lūdzu, derīgu adresi!"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Nolasu konfigurāciju\n"
 
 #: ../mdkonline:205
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending configuration..."
 msgstr "Nolasu konfigurāciju\n"
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Pieslēguma problēma"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Izeju no vedņa\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 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:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Nepareiza parole"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -446,8 +503,83 @@ msgstr ""
 "Ievērojiet, ka jums jānorāda arī datora nosaukums \n"
 "(atļauti tikai latīņu alfabēta burti)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Laipni lūdzam Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Laipni lūdzam Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Nepareiza parole"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Kantrī"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -462,25 +594,53 @@ msgstr ""
 "\n"
 "Pielietojums:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - drukāt šo palīdzības tekstu.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate nevar pieslēgties serverim, mēģināsim vēlāk"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Configuration"
 #~ msgstr "Nolasu konfigurāciju\n"
@@ -497,10 +657,6 @@ msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 #~ msgstr "Jā, es vēlos automātiskus jauninājumus"
 
 #, fuzzy
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate nevar pieslēgties serverim, mēģināsim vēlāk"
-
-#, fuzzy
 #~ msgid "Mandrakelinux Online Team"
 #~ msgstr "Laipni lūdzam Mandrakeonline"
 
diff --git a/po/mdkonline.pot b/po/mdkonline.pot
index aa201433..4c8375bb 100644
--- a/po/mdkonline.pot
+++ b/po/mdkonline.pot
@@ -1,289 +1,372 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-msgid ""
-"Service configuration problem. Please check logs and send mail to "
-"support@mandrakeonline.net"
+#, c-format
+msgid "Service configuration problem. Please check logs and send mail to support@mandrakeonline.net"
 msgstr ""
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr ""
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr ""
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr ""
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr ""
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr ""
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr ""
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr ""
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr ""
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr ""
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr ""
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr ""
 
 #: ../mdkapplet:202
-msgid "Down"
+#, c-format
+msgid "Network Connection: "
 msgstr ""
 
 #: ../mdkapplet:202
-msgid "Network Connection: "
+#, c-format
+msgid "Up"
 msgstr ""
 
 #: ../mdkapplet:202
-msgid "Up"
+#, c-format
+msgid "Down"
 msgstr ""
 
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr ""
 
 #: ../mdkapplet:208
-msgid "Launching drakconnect\n"
+#, c-format
+msgid ""
+"Launching drakconnect\n"
+""
 msgstr ""
 
 #: ../mdkapplet:212
-msgid "Launching mdkupdate --applet\n"
+#, c-format
+msgid ""
+"Launching mdkupdate --applet\n"
+""
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-msgid "Computing new updates...\n"
+#, c-format
+msgid ""
+"Computing new updates...\n"
+""
 msgstr ""
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr ""
 
 #: ../mdkapplet:249
-msgid "Checking... Updates are available\n"
+#, c-format
+msgid ""
+"Checking... Updates are available\n"
+""
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr ""
 
 #: ../mdkapplet:256
-msgid "Online services disabled. Contact Mandrakeonline site\n"
+#, c-format
+msgid ""
+"Online services disabled. Contact Mandrakeonline site\n"
+""
 msgstr ""
 
 #: ../mdkapplet:257
-msgid "Wrong Password.\n"
+#, c-format
+msgid ""
+"Wrong Password.\n"
+""
 msgstr ""
 
 #: ../mdkapplet:258
-msgid "Wrong Action or host or login.\n"
+#, c-format
+msgid ""
+"Wrong Action or host or login.\n"
+""
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
-"Something is wrong with your network settings (check your route, firewall or "
-"proxy settings)\n"
+"Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
+""
 msgstr ""
 
 #: ../mdkapplet:263
-msgid "System is up-to-date\n"
+#, c-format
+msgid ""
+"System is up-to-date\n"
+""
 msgstr ""
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
-msgid "Checking Network: seems disabled\n"
+#, c-format
+msgid ""
+"Checking Network: seems disabled\n"
+""
 msgstr ""
 
 #: ../mdkapplet:364
-msgid "Checking config file: Not present\n"
+#, c-format
+msgid ""
+"Checking config file: Not present\n"
+""
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr ""
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr ""
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr ""
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr ""
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr ""
 
-#: ../mdkonline:88
-msgid "Previous"
+#: ../mdkonline:90
+#, c-format
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:88
-msgid "Skip Wizard"
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
 msgstr ""
 
-#: ../mdkonline:102
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr ""
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
+""
 msgstr ""
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr ""
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr ""
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr ""
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr ""
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr ""
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -292,125 +375,273 @@ msgid ""
 "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"
+"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."
+"Finally, an email alias with your username@mandrakeonline.net will be provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr ""
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
+""
 msgstr ""
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr ""
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr ""
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr ""
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
+""
 msgstr ""
 
 #: ../mdkonline:188
-msgid "Not a valid mail address!\n"
+#, c-format
+msgid ""
+"Not a valid mail address!\n"
+""
 msgstr ""
 
-#: ../mdkonline:200
-msgid "Reading configuration\n"
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
+msgid ""
+"Reading configuration\n"
+""
 msgstr ""
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154 ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr ""
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
-msgid "Quitting Wizard\n"
+#: ../mdkonline:252
+#, c-format
+msgid ""
+"Quitting Wizard\n"
+""
 msgstr ""
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr ""
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\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 ""
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid ""
+"Login and password should be less than 12 characters\n"
+""
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid ""
+"Special characters are not allowed\n"
+""
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid ""
+"Please fill in all fields\n"
+""
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid ""
+"Email not valid\n"
+""
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid ""
+"Account already exist\n"
+""
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid ""
+"Problem connecting to server \n"
+""
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, c-format
+msgid "Mandrakeonline"
+msgstr ""
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "wrong password:"
+msgstr ""
+
+#: ../mdkonline_tui:160
+#, c-format
+msgid "Country"
+msgstr ""
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU GPL.\n"
 "\n"
 "usage:\n"
+""
+msgstr ""
+
+#: ../mdkupdate:55
+#, c-format
+msgid ""
+"  --help         - print this help message.\n"
+""
 msgstr ""
 
 #: ../mdkupdate:56
-msgid "  --help         - print this help message.\n"
+#, c-format
+msgid ""
+"  --auto         - Mandrakeupdate launched automatically.\n"
+""
 msgstr ""
 
 #: ../mdkupdate:57
-msgid "  --auto         - Mandrakeupdate launched automatically.\n"
+#, c-format
+msgid ""
+"  --applet       - launch Mandrakeupdate.\n"
+""
 msgstr ""
 
 #: ../mdkupdate:58
-msgid "  --applet       - launch Mandrakeupdate.\n"
+#, c-format
+msgid ""
+"  --update       - Update keys\n"
+""
 msgstr ""
 
-#: ../mdkupdate:59
-msgid "  --update       - Update keys\n"
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
 msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+
+#: ../mdkupdate:173
+#, c-format
+msgid ""
+"Unable to update packages from mdkupdate medium.\n"
+""
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid "Mandrakeupdate could not upload the diff files. Send a mail to support [at] mandrakeonline [dot] net"
+msgstr ""
+
diff --git a/po/mk.po b/po/mk.po
index bfbc51f4..11a36732 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-03 21:44+0200\n"
 "Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -18,10 +18,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Вашиот систем е ажуриран"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -30,155 +32,192 @@ msgstr ""
 "испратете пошта на  support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Системот е зафатен. Ве молиме почекајте ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Достапни се нови ажурирања за вашиот систем"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Сервисот не е конфигуриран. Ве молиме притиснете на \"конфигурај го сервисот"
 "\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Мрежата не работи. Ве молиме конфигурирајте ја вашата мрежа"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Сервисот не е вклучен. Ве молиме притиснете на \"Онлајн Веб сајт\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Инсталирај надоградувања"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Конфигурирај го сервисот"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Провери за ажурирање"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Онлајн Веб сајт"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Конфигурирај мрежа"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Конфигурирај Веднаш!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Аплет за ажурирање на Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Акции"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Конфигурирај"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Провери за ажурирање"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Види логови"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Статус"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Затвори"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Долу"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Мрежна конекција: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Горе"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Долу"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Последна проверка: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Ажурирања: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Вклучувам drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Вклучувам mdkupdate --аплет\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Изгледа дека Mandrakeonline е повторно инсталиран, го превчитувам "
 "аплетот ...."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Ги пресметувам новите ажурирања...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Се поврзувам со"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Проверувам... Пакетите за ажурирање се достапни\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Непозната држава"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Онлајн сервисите се оневозможени. Контактирајте со сајтот Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Погрешна лозинка.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Погрешна акција или компјутер или логирање.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -187,58 +226,72 @@ msgstr ""
 "firewall или прокси подесувањата)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Системот е ажуриран\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Без проверка"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверувам мрежа: изгледа е оневозможена\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Проверувам конфигурациона датотека: Не е достапна\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Логови"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Исчисти"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "За..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Секогаш стартувај при подигање"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Напушти"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Следен"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Претходно"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Прескокни Волшебник"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Претходно"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Добредојдовте во Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -248,55 +301,68 @@ msgstr ""
 "(пакети, хардверска конфигурација) во централизирана база на податоци\n"
 "за да ве известува за сигурносни ажурирања и корисни надоградувања.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Создади Mandrakeonline сметка"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Немам Mandrakeonline сметка, но сакам"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Зачлени се"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Логин:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Потврди ја лозинката:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Пошта за контакт:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux Полиса за приватноста"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Афтентикација"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Внесете го вашиот Mandrakeonline логин, лозинка и име на машината:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Име на машината:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Испрати ја конфигурацијата"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -332,11 +398,18 @@ msgstr ""
 "www.mandrakeexpert.com.\n"
 "И за крај, добивате email прекар со вашето корисничкоиме@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Заврши"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Вашето испраќање е успешно!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -344,7 +417,8 @@ msgstr ""
 "Од сега па понатаму ќе добивате известувања за \n"
 "сигурност и ажурирања, благодарение на Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -352,27 +426,28 @@ msgstr ""
 "Mandrakeonline ви ја нуди способноста за автоматско ажурирање.\n"
 "Програма ќе работи регуларно на вашиот систем чекајќи за нови ажирирања\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Вашето испраќање е успешно!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "автоматски надоградувања"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Држава:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Грешка"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Ве молиме внесете логин"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -381,38 +456,48 @@ msgstr ""
 " Ве молиме обидете се повторно\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Невалидна email адреса!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Читам конфигурација\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Испраќам конфигурација..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Проблем со конекцијата"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Проблем при испраќање на датотеките, ве молиме обидете се повторно"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Излегувам од волшебникот\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Не можам да контактирам со Mandrakeonline, ве молам обидете се подоцна"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Погрешна лозинка"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -429,8 +514,83 @@ msgstr ""
 " Внимавајте, истотака треба да внесете и име на машината \n"
 " (дозволени се само алфабетски карактери)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Добредојдовте во Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Добредојдовте во Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Погрешна лозинка"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Држава:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -445,22 +605,53 @@ msgstr ""
 "\n"
 "употреба:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - ја печати оваа помошна порака.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Автоматско вклучување на Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Вклучување на Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - ажурирање на клучевите\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Не можам да контактирам со Mandrakeonline, ве молам обидете се подоцна"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Конфигурациони проблеми. Повторно отворете го \"конфигурирај\""
 
diff --git a/po/mn.po b/po/mn.po
index 0b7deaa0..eb369bfe 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\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"
@@ -16,277 +16,339 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Та гарсан асуудлаа support@mandrakeonline.net рүү илгээнэ үү\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr ""
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr ""
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr ""
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr ""
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr ""
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Үйлдлүүл"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Тохируулах"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr ""
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr ""
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Төлөв"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Хаах"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Доош"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr ""
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr ""
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Доош"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr ""
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Холболтын асуудлууд"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr ""
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
-#, fuzzy
+#, fuzzy, c-format
 msgid "Wrong Password.\n"
 msgstr "Нууц үг:"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
-#, fuzzy
+#, fuzzy, c-format
 msgid "Logs"
 msgstr "Нэвтрэх нэр:"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Цэвэрлэх"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Тухай..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Гарах"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Дараах"
 
-#: ../mdkonline:88
-msgid "Previous"
+#: ../mdkonline:90
+#, c-format
+msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:88
-msgid "Skip Wizard"
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
 msgstr ""
 
-#: ../mdkonline:102
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr ""
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr ""
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr ""
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Нэвтрэх нэр:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Нууц үг:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Нууц үгээ бататгах:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr ""
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -306,43 +368,52 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Дуусгах"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr ""
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr ""
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Алдаа"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr ""
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -351,39 +422,48 @@ msgstr ""
 " Дахин оролдож үзнэ үү\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Зөв биш э-шуудангийн хаяг! \n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Холболтын асуудлууд"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr ""
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeupdate вэб хуудас руу хүрч чадахгүй байна, бид дахин оролдоё."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr ""
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -394,8 +474,83 @@ msgid ""
 " (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, c-format
+msgid "Mandrakeonline"
+msgstr ""
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Нууц үг:"
+
+#: ../mdkonline_tui:160
+#, c-format
+msgid "Country"
+msgstr ""
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -411,39 +566,60 @@ msgstr ""
 "\n"
 "Ашиглалт: \n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - Бүх мэдээллийг шинэчлэх.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Бүх мэдээллийг шинэчлэх.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - Бүх мэдээллийг шинэчлэх.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate вэб хуудас руу хүрч чадахгүй байна, бид дахин оролдоё."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "„mdkupdate“ хэрэгслээс багцуудыг шинэчилэхэд алдаа.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Email"
 #~ msgstr "Э-Захиа"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "„mdkupdate“ хэрэгслээс багцуудыг шинэчилэхэд алдаа.\n"
-
 #, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "  --applet       - Бүх мэдээллийг шинэчлэх.\n"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "Mandrakeupdate вэб хуудас руу хүрч чадахгүй байна, бид дахин оролдоё."
-
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - Зөвхөн хамгаалалтын хэрэгсэлд хэрэглэ.\n"
 
diff --git a/po/ms.po b/po/ms.po
index b9140465..73ee04c1 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\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"
@@ -16,11 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -28,224 +29,259 @@ msgstr ""
 "Untuk sebarang masalah sila hantar emel kepada support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Konfigurasikan penjimatan tenaga bagi sistem anda"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
-#, fuzzy
+#, fuzzy, c-format
 msgid "Install updates"
 msgstr "Install"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Peranti dikonfigurasikan:\n"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Kemaskini sekuriti"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Konfigurasikan Gema"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Membaca konfigurasi\n"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Polisi Peribadi Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Aksi"
 
 #: ../mdkapplet:158
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure"
 msgstr "Konfigurasikan ..."
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "Kemaskini sekuriti"
 
 #: ../mdkapplet:160
-#, fuzzy
+#, fuzzy, c-format
 msgid "See logs"
 msgstr "Lihat +5s"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Status"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Tutup"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Turun"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Perhubungan"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Naik"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Turun"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr ""
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Masalah perhubungan"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nama hos tidak diketahui"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Salah katalaluan.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
-#, fuzzy
+#, fuzzy, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Periksa sistem fail\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Log"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Kosongkan"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Keterangan..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Lanjut"
 
-#: ../mdkonline:88
-#, fuzzy
-msgid "Previous"
-msgstr "Pralihat"
-
-#: ../mdkonline:88
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, c-format
 msgid "Skip Wizard"
 msgstr " Langkau Wizard"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, fuzzy, c-format
+msgid "Previous"
+msgstr "Pralihat"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Selamat Datang di Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -255,58 +291,68 @@ msgstr ""
 "(pakej, konfigurasi peekakasan) ke pangkalan data pusat agar Anda selalu\n"
 "diberitahu kemaskini sekuriti dan upgrade yang berguna.\n"
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Selamat Datang di Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Saya tak punya account Mandrakeonline dan saya ingin "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Ikut"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Katalaluan:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Sahkan Katalaluan:"
 
-#: ../mdkonline:113
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, c-format
 msgid "Mail contact:"
 msgstr "Hubung mail:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Polisi Peribadi Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Otentifikasi"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Masukkan login, katalaluan, dan nama mesin  Mandrakeonline Anda:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Nama mesin:"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Membaca konfigurasi\n"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -340,11 +386,18 @@ msgstr ""
 "Tambahan pula, Anda akan mendapat diskaun servis di www.mandrakeexpert.com.\n"
 "Terakhir, Anda akan mendapatkan alias email namaanda@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Selesai"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Upload Anda berjaya!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -352,7 +405,8 @@ msgstr ""
 "Mulai saat ini Anda akan menerima pengumuman sekuriti dan upgrade\n"
 "dari Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -360,29 +414,28 @@ msgstr ""
 "Mandrakeonline memberi Anda kemampuan update automatik.\n"
 "Sebuah program akan berjalan secara periodik menunggu untuk kemaskini baru\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Upload Anda berjaya!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "upgrade automatik"
 
-#: ../mdkonline:150
-#, fuzzy
+#: ../mdkonline:151
+#, fuzzy, c-format
 msgid "Country:"
 msgstr "Kawalan:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Ralat"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "Mainkan cereka dan lagu"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -391,40 +444,48 @@ msgstr ""
 " Sila cuba lagi\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Alamat mail yang tidak sah!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Membaca konfigurasi\n"
 
 #: ../mdkonline:205
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending configuration..."
 msgstr "Membaca konfigurasi\n"
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Masalah perhubungan"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Keluar Wizard\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeupdate gagal dihubungi, sila cuba sekali lagi."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Salah katalaluan"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -441,8 +502,83 @@ msgstr ""
 " Ingat, Anda juga harus memberikan nama Mesin \n"
 " (hanya karektor alfabet sahaj dibenarkan)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Masalah menyambung ke pelayan \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Selamat Datang di Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Selamat Datang di Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Salah katalaluan"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Kawalan:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -457,37 +593,56 @@ msgstr ""
 "\n"
 "penggunaan:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - kemaskini semua maklumat.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - kemaskini semua maklumat.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - kemaskini semua maklumat.\n"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Masalah menyambung ke pelayan \n"
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate gagal dihubungi, sila cuba sekali lagi."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Gagal mengemaskini pakej dari media mdkupdate.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Gagal mengemaskini pakej dari media mdkupdate.\n"
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
 
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Ya saya ingin upgrade automatik"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate gagal dihubungi, sila cuba sekali lagi."
-
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - hanya guna media keselamatan.\n"
 
diff --git a/po/mt.po b/po/mt.po
index e1231c4a..b0b67921 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-03 19:13+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -18,10 +18,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Is-sistema tiegħek hija aġġornata"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -30,153 +32,190 @@ msgstr ""
 "lilsupport@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Is-sistema hija okkupata. Stenna ftit ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Hemm aġġornamenti ġodda għas-sistema tiegħek"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Is-servizz għadu mhux konfigurat. Ikklikkja fuq \"Ikkonfigura s-servizz\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "In-network mhux imtella'. Jekk jogħġbok issettja n-network."
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "is-servizz mhux attivat. Jekk jogħġbok klikkja fuq \"Sit online\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Installa aġġornamenti"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Ikkonfigura s-servizz"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Iċċekkja għal aġġornamenti"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Sit online"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Ikkonfigura n-network"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Ikkonfigura issa"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet għall-aġġornamenti Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Azzjonijiet"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Ikkonfigura"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Iċċekkja aġġornamenti"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Ara logs"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Stat"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Agħlaq"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "isfel"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Konnessjoni network:"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Fuq"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "isfel"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "L-aħħar li ċċekkjajt: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Aġġornamenti: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Qed jitħaddem drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Qed jitħaddem mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline jidher li reġa' ġie installat, qed terġa' tittella' l-"
 "applet ..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Qed jiġu kalkulati aġġornamenti ġodda...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Qed issir konnessjoni ma'"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Qed jiġu ċċekkjati... hemm aġġornamenti disponibbli\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Stat mhux magħruf"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Servizzi online mhux attivi. Ikkuntattja s-sit ta' Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Password ħażina.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Azzjoni, login jew server ħażin.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -185,58 +224,72 @@ msgstr ""
 "firewall jew proxy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Is-sistema hija aġġornata\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Ebda ċċekkjar"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Qed niċċekkja n-network... jidher li mitfi\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Qed jiġi ċċekkjat fajl ta' konfigurazzjoni: mhux preżenti\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logs"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Ħassar"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Dwar.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Dejjem ħaddem mat-tlugħ"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Oħroġ"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Li jmiss"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Ta' qabel"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Aqbeż saħħar"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Ta' qabel"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Merħba għal Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -246,55 +299,68 @@ msgstr ""
 "(pakketti, konfigurazzjoni tal-magna) lill database ċentrali sabiex\n"
 "tinżamm infurmat dwar aġġornamenti ta' sigurtà u oħrajn utli.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Oħloq kont Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "M'għandix kont fuq Mandrakeonline u nixtieq "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Nabbona"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Ikkonferma password:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Kuntatt imejl:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Polza ta' privatezza Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Awtentikazzjoni"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Daħħal il-login, password u isem tal-kompjuter għal Mandrakeonline:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Isem tal-kompjuter:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Ibgħat konfigurazzjoni"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -330,11 +396,18 @@ msgstr ""
 "minn skonti fuq servizzi oħra bil-ħlas minn www.mandrakeexpert.com.\n"
 "Finalment, jinħoloqlok indirizz tal-imejl username@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Spiċċa"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "It-trasferiment tal-informazzjoni rnexxa."
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -342,7 +415,8 @@ msgstr ""
 "Minn issa 'l quddiem int tirċievi notifiki dwar \n"
 "sigurtà u aġġornamenti minngħand Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -351,27 +425,28 @@ msgstr ""
 "awtomatikament.\n"
 "Regularment jitħaddem programm fuq is-sistema biex jistenna aġġornamenti.\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "It-trasferiment tal-informazzjoni rnexxa."
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Aġġornamenti awtomatiċi"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Pajjiż:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Problema"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Jekk jogħġbok ipprovdi login"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -380,38 +455,48 @@ msgstr ""
 "Jekk jogħġbok erġa' pprova\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Dan mhux indirizz tal-imejl validu!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Qed tinqara' l-konfigurazzjoni\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Qed tintbagħat konfigurazzjoni..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problema fil-konnessjoni"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Problema waqt li jintbagħtu l-fajls, erġa' pprova"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Ħiereġ is-saħħar\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeonline ma setax jiġi kuntattjat, ipprova iżjed tard"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Password ħażina"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -427,8 +512,83 @@ msgstr ""
 "Innota li trid tipprovdi wkoll isem ta' kompjuter (karattri alfabetiċi biss "
 "aċċettati)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Merħba għal Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Merħba għal Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Password ħażina"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Pajjiż:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -444,18 +604,49 @@ msgstr ""
 "\n"
 "użu:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - uri dan il-messaġġ ta' għajnuna.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate jitħaddem awtomatikament.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - ħaddem Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Aġġorna ċifrarji\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeonline ma setax jiġi kuntattjat, ipprova iżjed tard"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/nb.po b/po/nb.po
index afd8e7b6..51c07cb4 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-18 18:08+0200\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
@@ -20,10 +20,12 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Systemet ditt er oppdatert"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -32,153 +34,190 @@ msgstr ""
 "support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Systemet er opptatt. Vennligst vent ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Nye oppdateringer er tilgjengelig for ditt system"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "Tjenesten er ikke konfigurert. Vennligst klikk på \"Konfigurer tjenesten\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Nettverket er nede. Vennligst konfigurerer nettverket ditt"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Tjenesten er ikke aktivert. Vennligst klikk på \"Online-nettsted\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Installer oppdateringer"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Konfigurer tjenesten"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Sjekk etter oppdateringer"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Online Nettsted"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Konfigurer nettverk"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Konfigurer nå!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Updates-panelprogram"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Handlinger"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Konfigurer"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Sjekk etter oppdateringer"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Se logger"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Status"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Lukk"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Nede"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Nettverkstilkobling"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Oppe"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Nede"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Siste sjekk: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Oppdateringer: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Starter drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Starter mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline ser ut til å være reinstallert, laster inn panelprogram på "
 "nytt ...."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Sjekker nye oppdateringer...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Kobler til"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Sjekker... Opdateringer er tilgjengelig\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Ukjent tilstand"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Onlinetjenester deaktivert. Kontakt Mandrakeonline-siden\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Feil passord.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Feil Handling eller vert eller  brukernavn.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -187,58 +226,72 @@ msgstr ""
 "proxy-oppsett).\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet er oppdatert\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Ingen sjekk"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sjekker nettverk. ser ut til å være deaktivert\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Sjekker konfigurasjonsfil. Ikke til stede\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logger"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Nullstill"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Om.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Kjør alltid under oppstart"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Neste"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Forrige"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Hopp over veiviser"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Forrige"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Velkommen til Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -248,55 +301,68 @@ msgstr ""
 "(pakker, maskinvarekonfigurasjon) til en sentral database for å holde\n"
 "deg informert om sikkerhetsoppdatering og verdifulle oppgraderinger\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Opprett en Mandrakeonline-konto"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Jeg har ingen Mandrakeonline-konto og jeg ønsker å "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Abonnere"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Brukernavn:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Bekreft passord:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Epostkontakt:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux retningslinjer for personvern"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autentisering"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Tast inn ditt Mandrakeonline-brukernavn, passord og maskinnavn:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Maskinnavn:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Send konfigurasjon"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -333,11 +399,18 @@ msgstr ""
 "Til slutt så vil et epostalaias med ditt brukernavn@mandrakeonline.net bli "
 "tilbudt til deg."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Fullfør"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Din opplasting var vellykket!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -345,7 +418,8 @@ msgstr ""
 "Fra nå av vil du motta sikkerhets- og oppdateringsannonseringer \n"
 "takket være Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -354,27 +428,28 @@ msgstr ""
 "Et program vil kjøre regelmessig på ditt system i vente på nye "
 "oppdateringer\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Din opplasting var vellykket!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatiserte oppgraderinger"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Land:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Feil"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Vennligst oppgi et brukernavn"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -383,40 +458,50 @@ msgstr ""
 " Vennligst prøv på nytt\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Ikke en gyldig epostadresse!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Leser konfigurasjon\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Sender konfigurasjon..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Tilkoblingsproblem"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Problem oppstod under opplasting av filer, vennligst prøv igjen"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Avslutter veiviser\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 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:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Feil passord"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -434,8 +519,83 @@ msgstr ""
 " Vær oppmerksom på at du også må oppgi maskinnavn \n"
 " (bare alfabetiske tegn er tillatt)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "Brukernavn og passord bør være på mindre enn 12 tegn\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Spesialtegn er ikke tillatt\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Vennligst fyll ut alle felter\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "Epost ikke gyldig\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "Konto eksisterer allerede\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Problem med å koble til tjener \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Velkommen til Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Velkommen til Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Feil passord"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Land:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -451,22 +611,53 @@ msgstr ""
 "\n"
 "bruk:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - skriv denne hjelp beskjeden.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate kjørt automatisk.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - start Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Oppdater nøkler\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate kunne ikke kontakte stedet, vi vil prøve igjen."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Kunne ikke oppdatere pakker fra mdkupdate-medium.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Konfigurasjonsproblemer. Kjør \"konfigurer\" på nytt"
 
@@ -497,42 +688,21 @@ msgstr "  --update       - Oppdater nøkler\n"
 #~ msgid "Creation"
 #~ msgstr "Opprettelse"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "Brukernavn og passord bør være på mindre enn 12 tegn\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Spesialtegn"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Spesialtegn er ikke tillatt\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Tomme felter"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Vennligst fyll ut alle felter\n"
-
 #~ msgid "Email"
 #~ msgstr "Epost"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "Epost ikke gyldig\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "Konto eksisterer allerede\n"
-
 #~ msgid "Change account"
 #~ msgstr "Skift konto"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Problem med å koble til tjener \n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Tjenerproblem"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Kunne ikke oppdatere pakker fra mdkupdate-medium.\n"
-
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Svar fra Mandrakeonline-tjener\n"
 
@@ -548,9 +718,6 @@ msgstr "  --update       - Oppdater nøkler\n"
 #~ msgid "Checking..."
 #~ msgstr "Sjekker..."
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate kunne ikke kontakte stedet, vi vil prøve igjen."
-
 #~ msgid "Test critical"
 #~ msgstr "Test kritisk"
 
diff --git a/po/nl.po b/po/nl.po
index fd3d253e..4450cc45 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-24 14:39+0200\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Nederlands\n"
@@ -19,10 +19,12 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Uw systeem is bijgewerkt"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -31,150 +33,187 @@ msgstr ""
 "support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Systeem is bezig. Even geduld..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Nieuwe herzieningen zijn beschikbaar voor uw systeem"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Dienst niet ingesteld. Klik op \"Dienst configureren\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Netwerk niet actief. Configureer uw netwerk"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Dienst niet geactiveerd. Klik alstublieft op \"Webstek\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Uitgave niet ondersteund (te oud, of een ontwikkelingsuitgave)"
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Herzieningen installeren"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Dienst configureren"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Herzieningen nagaan"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Webstek"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Netwerk configureren"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Nu configureren!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux herzieningen-applet"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Akties"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Configureren"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Herzieningen nagaan"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Logboeken inzien"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Status"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Sluiten"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Inactief"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Netwerkverbinding: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Actief"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Inactief"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Laatste controle: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Herzieningen: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect wordt gestart\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Mdkupdate --applet wordt gestart\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline lijkt opnieuw geïnstalleerd te zijn, herladen applet..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Nieuwe herzieningen nagaan...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Verbinding aan het maken met"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Bezig met controleren... Herzieningen zijn beschikbaar\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "Ontwikkelingsuitgaven worden niet ondersteund door deze dienst"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "Te oude uitgaven worden niet ondersteund door deze dienst"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Onbekende toestand"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online diensten uitgeschakeld. Zie de Mandrakeonline webstek\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Wachtwoord onjuist.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Onjuiste actie of host of gebruikersnaam.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -183,58 +222,72 @@ msgstr ""
 "firewall- of proxy-instellingen)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Systeem is bijgewerkt\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Geen controle"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controle van het netwerk: lijkt uitgeschakeld te zijn\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Controle van het instellingsbestand: niet aanwezig\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logboek"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Wissen"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Info.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Altijd starten bij systeemstart"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Volgende"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Vorige"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Wizard overslaan"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Vorige"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Welkom bij MandrakeOnline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -245,55 +298,68 @@ msgstr ""
 "u op de hoogte te kunnen houden van beveiligingsherzieningen en nuttige "
 "opwaarderingen.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "MandrakeOnline account aanmaken"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Ik heb geen MandrakeOnline account en wil "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Aanmelden"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Gebruikersnaam:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Wachtwoord bevestigen:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Mailadres: "
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux privacy-beleid"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Verificatie"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Voer uw MandrakeOnline gebruikersnaam, wachtwoord en computernaam in:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Computernaam:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Configuratie verzenden"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -327,11 +393,18 @@ msgstr ""
 "www.mandrakeexpert.com.\n"
 "Tot slot krijg u een e-mailadres met 'uw gebruikersnaam'@mandrakeonline.net ."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Voltooien"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Het versturen is gelukt!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -339,7 +412,8 @@ msgstr ""
 "Vanaf nu ontvangt u beveiligings- en\n"
 "herzieningsaankondigingen dankzij MandrakeOnline"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -348,27 +422,28 @@ msgstr ""
 "Een programma in uw systeem zal regelmatig kijken of er nieuwe herziene\n"
 "versies zijn\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Het versturen is gelukt!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "geautomatiseerde herzieningen"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Land:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Fout"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Geef alstublieft uw gebruikersnaam"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -377,40 +452,50 @@ msgstr ""
 "Probeer het opnieuw\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Geen geldig emailadres\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Lezen instellingen\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Configuratie sturen"
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Verbindingsprobleem"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Probleem met het versturen van de gegevens, probeert u het opnieuw"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Bezig met afsluiten wizard\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Er kon geen verbinding met MandrakeOnline gemaakt worden, probeert u het "
 "later nog eens."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Wachtwoord onjuist"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -428,8 +513,83 @@ msgstr ""
 " Weest u zich ervan bewust dat u ook een computernaam moet invoeren \n"
 " (alleen letters zijn toegestaan)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Welkom bij MandrakeOnline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Welkom bij MandrakeOnline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Wachtwoord onjuist"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Land:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -445,18 +605,51 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help          - deze gebruiksaanwijzing.tonen\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - MandrakeUpdate automatisch starten.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - MandrakeUpdate starten.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - sleutels bijwerken\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Er kon geen verbinding met MandrakeOnline gemaakt worden, probeert u het "
+"later nog eens."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
index be598e8a..ce350fdf 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-25 20:55+0200\n"
 "Last-Translator: Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>\n"
 "Language-Team: polski <pl@li.org>\n"
@@ -18,10 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Oprogramowanie systemu jest aktualne"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -30,152 +32,189 @@ msgstr ""
 "support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "System jest zajęty. Proszę czekać ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Dostępne są nowe aktualizacje dla Twojego systemu"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Usługa jest nieskonfigurowana. Kliknij na \"Konfiguracja usługi\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sieć jest wyłączona. Skonfiguruj sieć"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Usługa jest nieaktywna. Kliknij na Witryna internetowa\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Zainstaluj aktualizacje"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Konfiguracja usługi"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Sprawdź aktualizacje"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Witryna internetowa"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Skonfiguruj sieć"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Skonfiguruj teraz!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Aplet aktualizacji Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Operacje"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Skonfiguruj"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Sprawdź aktualizacje"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Zobacz dziennik"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Stan"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Zamknij"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "W dół"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Połączenie sieciowe: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "W górę"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "W dół"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Ostatnie sprawdzenie: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Aktualizacje: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Uruchamianie programu drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Uruchamianie polecenia mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Mandrakeonline prawdopodobnie zostało przeinstalowane. Ładowanie apletu ...."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Przetwarzanie nowych aktualizacji...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Łączenie z"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Sprawdzanie... Uaktualnienia są dostępne\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Nieznany stan"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Usługi internetowe są wyłączone. Skontaktuj się z witryną Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Złe hasło.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Niepoprawna operacja, komputer lub nazwa użytkownika.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -184,58 +223,72 @@ msgstr ""
 "zaporę sieciową lub ustawienia pośrednika)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "System jest aktualny\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Bez sprawdzania"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sprawdzanie sieci: wygląda na wyłączoną\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Sprawdzanie pliku konfiguracyjnego: brak pliku\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Dziennik"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Wyczyść"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "O programie"
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Uruchamiaj przy starcie"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Następny"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Wstecz"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Pomiń druida"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Wstecz"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Witamy w Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -245,55 +298,68 @@ msgstr ""
 "(pakiety, konfiguracja sprzętowa) do centralnej bazy danych, aby\n"
 "móc lepiej informować cię o odpowiednich uaktualnieniach.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Utwórz konto Mandrakeonline "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Nie posiadam konta Mandrakeonline i chcę je otrzymać "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Zasubskrybuj"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Potwierdź hasło:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Kontakt pocztowy:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Zastrzeżenie prywatności Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Uwierzytelnienie"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Wprowadź swój login Mandrakeonline, hasło i nazwę komputera:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Nazwa komputera:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Wyślij konfigurację"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -327,11 +393,18 @@ msgstr ""
 "na www.mandrakeexpert.com.\n"
 "Otrzymasz także alias pocztowy login@mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Zakończ"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Informacje zostały pomyślnie przesłane!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -339,7 +412,8 @@ msgstr ""
 "Od tej chwili dzięki Mandrakeonline będziesz otrzymywać \n"
 "informacje o wykrytych błędach i uaktualnieniach."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -347,27 +421,28 @@ msgstr ""
 "Mandrakeonline umożliwia Ci zautomatyzowanie uaktualnień.\n"
 "Program będzie uruchamiał się regularnie i oczekiwał na uaktualnienia\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Informacje zostały pomyślnie przesłane!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatyczne uaktualnienia"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Kraj:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Błąd"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Podaj login"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -376,39 +451,49 @@ msgstr ""
 "Spróbuj ponownie\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "To nie jest poprawny adres e-mail!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Wczytywanie konfiguracji\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Przesyłanie konfiguracji..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problem z połączeniem"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Podczas wysyłania plików wystąpił błąd. Spróbuj ponownie."
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Opuszczanie druida\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Nie można nawiązać połączenia z Mandrakeonline. Spróbuj ponownie później."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Niepoprawne hasło"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -424,8 +509,83 @@ msgstr ""
 "połączenia z Mandrakeonline. Nie zapomnij podać nazwy komputera\n"
 " (przyjmowane są tylko znaki alfanumeryczne)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Witamy w Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Witamy w Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Niepoprawne hasło"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Kraj:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -441,18 +601,50 @@ msgstr ""
 "\n"
 "użycie:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - wyświetla ten komunikat pomocy.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - automatyczne uruchamiane Mandrakeupdate .\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - uruchamia Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - uaktualnia klucze\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Nie można nawiązać połączenia z Mandrakeonline. Spróbuj ponownie później."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 6c74ad21..38e4b42c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-21 22:29+0200\n"
 "Last-Translator: Jose Jorge <jjorge@free.fr>\n"
 "Language-Team: português <pt@li.org>\n"
@@ -21,10 +21,12 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "O sistema está actualizado"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -33,152 +35,190 @@ msgstr ""
 "um e-mail para support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "O sistema está ocupado. Espere ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Há actualizações disponíveis para o seu sistema"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 "O serviço não está configurado. Por favor carregue em \"Configurar o serviço"
 "\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "A rede está desligada. Por favor configure a sua rede"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "O serviço não está activado. Por favor carregue em \"Site Em Linha\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
-msgstr "Versão não suportada (versão demasiado antiga, ou versão de desenvolvimento)"
+msgstr ""
+"Versão não suportada (versão demasiado antiga, ou versão de desenvolvimento)"
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instalar actualizações"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Configurar o serviço"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Verificar actualizações"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Site Em Linha"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Configurar a Rede"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Configurar Agora!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet de Actualização Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Acções"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Configurar"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Verificar actualizações"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Ver os registos"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Estatuto"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Fechar"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Desligado"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Ligação à Rede : "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Ligado"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Desligado"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Última verificação : "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Actualizações : "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "A iniciar drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "A iniciar mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline parece estar instalado de novo, recarrego o applet..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "A procurar novas actualizações...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "A ligar a"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "A verificar... há actualizações disponíveis\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "Versão de desenvolvimento não suportada pelo serviço"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "Versão demasiado antiga não suportada pelo serviço"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Estado desconhecido"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Serviços em linha inactivos. Contacte o site Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Senha errada.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Erro na acção ou no anfitrião ou na identificação.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -187,58 +227,72 @@ msgstr ""
 "caminho (route), do pára-fogo (firewall) ou do proxy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "O sistema está actualizado\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Nenhuma verificação"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificação da Rede : parece desligada\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "A verificar o ficheiro de configuração : não presente\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Registos"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Limpar"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Acerca de ..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Lançar sempre ao arrancar"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Sair"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Saltar o Assistente"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Bem-vindo a Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -248,55 +302,69 @@ msgstr ""
 "(pacotes, lista do material) a uma base centralizada para\n"
 "o manter informado das actualizações de segurança e novas versoes úteis.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Criar uma Conta Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Eu não tenho uma conta Mandrakeonline e quero "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Inscrever-me"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Identificador:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Confirme a Senha :"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Contacto mail :"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Regras de privacidade Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autenticação"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
-msgstr "Escreva o seu identificador Mandrakeonline, a senha e o nome da máquina:"
+msgstr ""
+"Escreva o seu identificador Mandrakeonline, a senha e o nome da máquina:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Nome da máquina :"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Enviar a Configuração"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -332,11 +400,18 @@ msgstr ""
 "Enfim, um alias de email da forma utilizador@mandrakeonline.net vai-lhe ser "
 "fornecido."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Acabar"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "O seu envio conseguiu!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -344,7 +419,8 @@ msgstr ""
 "A partir de agora vai receber os anúncios de segurança\n"
 "e de novas versões graças a Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -353,27 +429,28 @@ msgstr ""
 "Um programa vai ser lançado regularmente no seu sistema esperando "
 "actualizações.\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "O seu envio conseguiu!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Actualizações automáticas"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "País :"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Erro"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Por favor indique um utilizador"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -382,38 +459,49 @@ msgstr ""
 " Por favor tente outra vez\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Não é um email válido!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "A ler a configuração\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "A enviar a configuração..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problema na ligação"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Houve um problema ao enviar os ficheiros, tente outra vez por favor"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Saindo de Assistente\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
-msgstr "Mandrakeonline não pode ser contactado, por favor tente outra vez mais tarde"
+msgstr ""
+"Mandrakeonline não pode ser contactado, por favor tente outra vez mais tarde"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Senha errada"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -430,8 +518,83 @@ msgstr ""
 " Seja atento ao facto que também deve indicar um nome de Máquina\n"
 " (só os Caráteres alfabéticos são aceites)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "O Identificante e a senha deveriam ter menos de 12 caráteres\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Os caráteres especiais não são permitidos\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Por favor preencha todas as zonas\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "O Email não é válido\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "A conta já existe\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Problema ao ligar ao servidor \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Bem-vindo a Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Bem-vindo a Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Senha errada"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "País :"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -446,22 +609,55 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostra esta mensagem de ajuda.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate lançado automáticamente.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - lança Mandrakeupdate..\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - actualiza as chaves\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Mandrakeupdate não conseguiu contactar o servidor, vai tentar outra vez."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+"Impossível actualizar pacotes a partir do média de actualização mdkupdate.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Problemas na configuração. Lance \"configurar\" outra vez"
 
@@ -492,44 +688,21 @@ msgstr "  --update       - actualiza as chaves\n"
 #~ msgid "Creation"
 #~ msgstr "Criação"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "O Identificante e a senha deveriam ter menos de 12 caráteres\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Caráteres especiais"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Os caráteres especiais não são permitidos\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Zonas vazias"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Por favor preencha todas as zonas\n"
-
 #~ msgid "Email"
 #~ msgstr "Email"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "O Email não é válido\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "A conta já existe\n"
-
 #~ msgid "Change account"
 #~ msgstr "Mudar a conta"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Problema ao ligar ao servidor \n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Problema de Servidor"
 
-#~ 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 "Response from Mandrakeonline server\n"
 #~ msgstr "Resposta do servidor Mandrakeonline\n"
 
@@ -539,10 +712,6 @@ msgstr "  --update       - actualiza as chaves\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Sim desejo instalar as novidades automáticamente"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "Mandrakeupdate não conseguiu contactar o servidor, vai tentar outra vez."
-
 #~ msgid "Register Now!"
 #~ msgstr "Inscrever-se Agora!"
 
@@ -626,4 +795,3 @@ msgstr "  --update       - actualiza as chaves\n"
 
 #~ msgid "Really abort? - Mandrakeonline"
 #~ msgstr "Sair mesmo? - Mandrakeonline"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bbd8cd26..ea3ded0e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-02 15:37-0300\n"
 "Last-Translator: Ricardo de Castilho <cast_brasil@ig.com.br>\n"
 "Language-Team: Português Brasileiro <linux_pt_BR@yahoogrupos.com.br>\n"
@@ -19,10 +19,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Seu sistema é moderno"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -31,152 +33,189 @@ msgstr ""
 "envie para support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistema ocupado. Aguarde ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Novas atualizações estão disponíveis para o seu sistema"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "O serviço não está configurado. Clique em \"configurar serviço\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sem conexão de rede. Por favor configure sua rede"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "O Serviço não está ativado. Por favor clique em \"Online Website\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instalar atualizações"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Configurar o serviço"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Verificar atualizações"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "WebSite Online"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Configurar rede"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Configurar Agora!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Aplicativo de atualizações Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Ações"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Configurar"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Verificar atualizações"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Ver logs"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Status"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Fechar"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Caida"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Conexão de rede: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Ativa"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Caida"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Última verificação: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Atualizações:"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lançando o drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Lançando o mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "O mandrakeonline parece ter sido reinstalado, recarregando o aplicativo."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Conferindo novas atualizações...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Conectando em"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verificando... Atualizações estão disponíveis\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Estado desconhecido"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Serviços on-line desativados.  Contate através do website Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Senha incorreta.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Erro na ação, host ou login.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -185,58 +224,72 @@ msgstr ""
 "as configurações proxy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistema ativo até \n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Não verificado"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Checando a Rede: parece inativa\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Checando Arquivo de Configuração: Não presente\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logs:"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Limpar"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Sobre.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Sempre iniciar no boot"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Sair"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Próx"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Pular Assistente"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Benvindo ao MandrakeonLine."
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -247,55 +300,68 @@ msgstr ""
 "de dados centralizada com o intuito de mantê-lo informado sobre\n"
 "atualizações de segurança e melhorias úteis.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Criar uma conta Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Eu ainda não tenho uma conta Mandrakeonline mas, desejo abrir uma "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Assinar"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Confirmar Senha:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "E-mail para contato:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Política de Privacidade Mandrakelinux."
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autenticação"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Digite seu login do Mandrakeonline, senha e o nome da máquina: "
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Nome da máquina:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Enviar Configuração"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -330,11 +396,18 @@ msgstr ""
 "Também um email com o seu nome de usuário@mandrakeonline.net \n"
 "será criado para você."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Fim"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Enviado com sucesso!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -342,7 +415,8 @@ msgstr ""
 "A partir de agora você receberá atualizações sobre segurança\n"
 "anúncios da MandrakeonLine."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -351,27 +425,28 @@ msgstr ""
 "atualizações. Um programa instalado no seu sistema verificará\n"
 "regularmente as novas atualizações.\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Enviado com sucesso!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Atualizações automáticas."
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "País:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Erro"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Forneça um login"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -380,38 +455,48 @@ msgstr ""
 " Por favor, tente de novo\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Endereço de email inválido\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Lendo configuração\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Enviando configuração..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problema de conexão"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Ocorreu um erro ao atualizar os arquivos, por favor tente novamente"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Saindo do assistente\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeonline não pôde ser contactado, por favor tente mais tarde"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Senha incorreta"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -427,8 +512,83 @@ msgstr ""
 " Será necessário fornecer um nome da máquina \n"
 " (somente caracteres alfanuméricos são permitidos)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Benvindo ao MandrakeonLine."
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Benvindo ao MandrakeonLine."
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Senha incorreta"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "País:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -444,18 +604,49 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - exibe esta mensagem de ajuda.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - lança Mandrakeupdate automaticamente.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - lança Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - atualiza chaves.\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeonline não pôde ser contactado, por favor tente mais tarde"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/ro.po b/po/ro.po
index a15cc0fc..59c3d5d7 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-22 16:05+0300\n"
 "Last-Translator: Ovidiu Constantin <ovidiusoft@gmail.com>\n"
 "Language-Team: Romanian <rtfs-project@lists.sourceforge.net>\n"
@@ -25,10 +25,12 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Sistemul dumneavoastră este actualizat"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -37,152 +39,189 @@ msgstr ""
 "trimiteţi mail la support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistemul este ocupat. Vă rugăm aşteptaţi..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Sunt disponibile noi actualizări pentru sistemul dumneavoastră"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Serviciul nu este configurat. Apăsaţi pe \"Configurează serviciul\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Reţeaua nu merge. Vă rog configuraţi-vă reţeaua"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Serviciul nu este activat. Apăsaţi pe \"Sit online\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Versiunea nu este suportată (versiunea este prea veche sau este versiune de "
 "dezvoltare)"
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instalare actualizări pentru sistem"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Configurează serviciul"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Verificare Actualizări"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Pagină web"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Configurare Reţea"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Setări"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Updates Applet"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Acţiuni"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Configurează"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Verifică actualizări"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Vezi logurile"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Statut"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Închide"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Oprită"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Conexiune Reţea:"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Pornită"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Oprită"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Ultima verificare:"
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Actualizări: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lansez drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Lansez mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline pare să fi fost reinstalat, reîncarc applet-ul ...."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Calculez actualizările noi...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Mă conectez la"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verific...Actualizări sunt disponibile\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "Versiunea de dezvoltare nu este suportată de serviciu"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "Versiunea este prea veche si nu este suportată de serviciu"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Stare necunoscută"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Servicii online dezactivate Contactaţi pagina de web Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Parolă greşită.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Acţiune sau Gazdă sau Login greşit.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -191,58 +230,72 @@ msgstr ""
 "proxy-ului)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemul este la zi cu actualizările\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Fără verificare"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificare Reţea:se pare că este dezactivată\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Verificare fisier de configurare: Nu este prezent\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Loguri"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Şterge"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Despre..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Lansează întotdeauna la pornire"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Ieşire"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Înapoi"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Precedentul"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Fără asistent"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Precedentul"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Bun venit la Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -252,56 +305,69 @@ 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:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Creează un cont Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Nu am un cont la Mandrakeonline şi vreau să"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Mă înscriu"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Cont:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Parolă:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Confirmare parolă:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Contact mail:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Politica de protejare a intimităţii"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr " Autentificare"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Introduceţi contul utilizator Mandrakeonline, parola şi numele maşinii:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Nume maşină:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Trimit Configurarea"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -338,11 +404,18 @@ msgstr ""
 "În fine, un alias email cu numeutilizator@mandrakeonline.net vă va fi "
 "furnizat."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Terminare"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Trimiterea a fost reuşită!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -350,7 +423,8 @@ msgstr ""
 "De acum veţi primi anunţuri despre securitare\n"
 "şi actualizări cu ajutorul Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -358,27 +432,28 @@ 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:144
-msgid "Your upload was successful!"
-msgstr "Trimiterea a fost reuşită!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Actualizări automate"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Ţara:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Eroare"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Vă rog să furnizaţi un login"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -387,39 +462,49 @@ msgstr ""
 "Incercaţi din nou\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Nu e o adresă de mail validă!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Citire configuraţie\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Trimitere configurare..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problemă la conectare"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "A apărut o problemă la încărcarea fişierelor, vă rog reînceraţi"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Terminare asistent\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Mandrakeonline nu a putut fi contactat, vă rog încercaţi din nou mai târziu"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Parolă greşită"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -437,8 +522,83 @@ msgstr ""
 " Va trebui de asemenea să furnizaţi un nume al maşinii \n"
 " (doar caracterele alfabetice sunt permise)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Bun venit la Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Bun venit la Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Parolă greşită"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Ţara:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -453,18 +613,50 @@ msgstr ""
 "\n"
 "Utilizare:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help             - afişează acest mesaj de ajutor.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate este lansat automat.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - lansează Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update          -actualizeaza cheile\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Mandrakeonline nu a putut fi contactat, vă rog încercaţi din nou mai târziu"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 64c930ee..dc7b3785 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-28 12:49+0300\n"
 "Last-Translator: Alice Lafox <alice@lafox.net>\n"
 "Language-Team: russian <cooker-i18n@linux-mandrake.com>\n"
@@ -18,10 +18,12 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Системе не требуются обновления"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -30,150 +32,187 @@ msgstr ""
 "support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Система занята. Ждите ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Для вашей системы доступны обновления"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Сервис не настроен. Зайдите в \"Настройку сервиса\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Сеть не доступна. Настройте вашу сеть"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Сервис не активирован. Зайдите на \"Online Website\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Установить обновления"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Настроить сервис"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Проверить обновления"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Онлайновый веб-сайт"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Настроить сеть"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Настроить сейчас!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Апплет Mandrakelinux Updates"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Действия"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Настроить"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Проверить обновления"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Просмотр журнала"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Статус"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Закрыть"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Вниз"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Сетевое подключение: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Вверх"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Вниз"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Последняя проверка: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Обновления: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Запускается drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Запускается mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Похоже, что Mandrakeonline переустановлен, перезагружается апплет..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Вычисляются новые обновления...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Выполняется подключение к"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Выполняется проверка... Обновления доступны\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Неизвестное состояние"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Онлайновые службы отключены. Зайдите на сайт Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Неверный пароль.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Неверное действие, хост или логин.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -182,58 +221,72 @@ msgstr ""
 "настройки прокси)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Системе не требуются обновления\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Без проверок"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверка сети: похоже отключена\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Проверка файла config: Отсутствует\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Логи"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Очистить"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "О программе..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Всегда запускать при старте"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Выход"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Следующий"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Назад"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Пропустить Мастер"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Назад"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Добро пожаловать в Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -244,55 +297,68 @@ msgstr ""
 "чтобы держать вас в курсе при появлении обновлений по безопасности \n"
 "и полезных апгрейдов.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Создать учетную запись Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "У меня нет учетной записи Mandrakeonline и я хочу ее получить"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Логин:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Подтвердить пароль:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Почтовый контакт:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Политика безопасности Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Аутентификация"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Введите свои логин Mandrakeonline, пароль и имя машины:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Имя машины:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Отправить конфигурацию"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -329,11 +395,18 @@ msgstr ""
 "И, наконец, вам будет предоставлен почтовый ящик с вашим именем\n"
 " на @mandrakeonline.net."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Завершить"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Выгрузка произведена успешно!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -341,7 +414,8 @@ msgstr ""
 "С этого момента вы будете получать уведомления\n"
 "по безопасности и обновлениям, благодаря Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -350,27 +424,28 @@ msgstr ""
 "Программа будет регулярно запускаться в вашей системе, ожидая новых "
 "обновлений\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Выгрузка произведена успешно!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "автоматизированные апгрейды"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Страна:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Ошибка"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Пожалуйста, укажите логин"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -379,39 +454,49 @@ msgstr ""
 " Попробуйте еще раз\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Недействительный почтовый адрес!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Считывается конфигурация\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Отправляется конфигурация..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Проблема подключения"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "При загрузке файлов возникла проблема, попробуйте снова"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Завершения работы мастера\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Не удается связаться с Mandrakeonline, попробуйте еще раз несколько позже"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Неверный пароль"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -429,8 +514,83 @@ msgstr ""
 " Обратите внимание, что вы также должны указать имя машины \n"
 " (допускаются только буквенные символы)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Добро пожаловать в Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Добро пожаловать в Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Неверный пароль"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Страна:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -446,18 +606,50 @@ msgstr ""
 "\n"
 "использование:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - вывод этого справочного сообщения.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - автоматический запуск Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - запуск Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - обновление ключей\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Не удается связаться с Mandrakeonline, попробуйте еще раз несколько позже"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/sc.po b/po/sc.po
index ea3efef8..af109013 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-sc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-28 13:36+0200\n"
 "Last-Translator:  <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -18,10 +18,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Su sistema est annoau"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -30,150 +32,187 @@ msgstr ""
 "a support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Su sistema est arrocau. Abeta ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Annous a disposta po su sistema tuu"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Serbìtziu no assetiau. Craca \"Assètia su Serbìtziu\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "S' arretza no andat. Assètia s' arretza tua."
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Serbìtziu no abivau. Craca \"Jassus Online\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Aposenta is annous"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Assètia su serbìtziu"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Controlla is Annous"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Jassu online"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Assètia Arretza"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Assètia Imoi!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet Mandrakelinux Updates"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Fainas"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Assètia"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Controlla is Annous"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Càstia is logs"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Stadu"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Serra"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "No andat"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Acàpiu a s'Arretza: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Andat"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "No andat"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Ùrtimu controllu: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Annous:"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Seu lancendi drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Seu lancedi mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline parit torrau a aposentai, càrrigu torra sa applet ...."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Seu carculendi atrus annous...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Seu acapiendi"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Seu controllendi... Disponeus de annous\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Stadu disconnotu"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Serbìtziu online disabilisau. Cuntata su jassu Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Password sballiada.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Faina o host o login sballiau.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -182,58 +221,72 @@ msgstr ""
 "route, de su firewall o de su proxy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Su sistema est annoau\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Nisçunu controllu"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Seu controllendi s'arretza: parit disabilisada\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Seu controllendi su config file: no ddui at\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logs"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Pulli"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Apitzus de..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Lança sempri a s' alluidura"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Bessi"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Sighit"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Pretzedenti"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Lassa a perdi su Wizard"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Pretzedenti"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Beni beniu in Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -243,55 +296,68 @@ msgstr ""
 "(pakitus e assètiu màkina) in d-unu database centralisau po ti podi\n"
 "apoderai informau de is annous de siguresa e de mellorias utilosas.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Crea unu Account Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "No tenju unu account Mandrakeonline e ddu bollu "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Sutascriri"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Cunfirma sa Password:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Cuntatu de Posta:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux Privacy Policy"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autèntiga"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Intra su login e password tuus Mandrakeonline e su nòmini màkina:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Nòmini màkina:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Manda s'assètiu"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -326,11 +392,18 @@ msgstr ""
 "Acabendi, unu alias email cun su username@mandrakeonline.net at' essi fruniu "
 "a tui."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Acabau"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "S' upload est acabau beni!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -338,7 +411,8 @@ msgstr ""
 "De imoi as' arriciri noas apitzus de siguresa e annous, \n"
 "gràtzias a Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -346,27 +420,28 @@ msgstr ""
 "Mandrakeonline ti donat de podi automatisai is annous tuus.\n"
 "Unu programa at a girai in su sistema, abetendi annous\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "S' upload est acabau beni!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Annous automàtigus"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Stadu:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Faddina"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Po prexeri, intra unu login"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -375,40 +450,50 @@ msgstr ""
 "Po prexeri, torra a provai\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "No est bivimentu email bonu!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Seu ligendi s' assètiu\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Seu mandendi s' assètiu..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Probrema de acàpiu"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Probrema carrighendi is file, torra a provai"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Seu bessendi de su Wizard\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "No apu pòtziu cuntatai Mandrakeonline, po prexeri, torra a provai prus a "
 "tradu"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Password sballiada"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -425,8 +510,83 @@ msgstr ""
 " Atentu, ca depis donai unu nòmini màkina \n"
 " (funt permìtias lìteras feti)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Beni beniu in Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Beni beniu in Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Password sballiada"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Stadu:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -436,18 +596,51 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr ""
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr ""
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr ""
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"No apu pòtziu cuntatai Mandrakeonline, po prexeri, torra a provai prus a "
+"tradu"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/sk.po b/po/sk.po
index f863c9c6..afbbe0ff 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-21 19:30+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandrake.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -16,216 +16,278 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Váš systém obsahuje všetky aktualizácie"
 
 #: ../mdkapplet:67
-msgid "Service configuration problem. Please check logs and send mail to support@mandrakeonline.net"
-msgstr "Nastal problém v konfigurácii služby. Prosím skontrolujte log súbory a pošlite e-mail na support@mandrakeonline.net"
+#, c-format
+msgid ""
+"Service configuration problem. Please check logs and send mail to "
+"support@mandrakeonline.net"
+msgstr ""
+"Nastal problém v konfigurácii služby. Prosím skontrolujte log súbory a "
+"pošlite e-mail na support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Systém je zaneprázdnený. Prosím čakajte ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Sú dostupné nové aktualizácie pre váš systém"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
-msgstr "Služba nie je nakonfigurovaná. Prosím kliknite na \"Konfigurovať službu\""
+msgstr ""
+"Služba nie je nakonfigurovaná. Prosím kliknite na \"Konfigurovať službu\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sieť je nedostupná. Prosím skontrolute vašu sieť"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Služba nie je aktivovaná. Prosím kliknite na \"Online Website\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
-msgstr "Táto verzia nie je podporovaná (je príliš stará alebo je vo fáze vývoja)"
+msgstr ""
+"Táto verzia nie je podporovaná (je príliš stará alebo je vo fáze vývoja)"
 
-#: ../mdkapplet:108
-#: ../mdkapplet:157
+#: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Inštalácia aktualizácií"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Nastaviť službu"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Skontrolovať aktualizácie"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Online web sajty"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Nastaviť sieť"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Nastaviť teraz!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux aktualizačný applet"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Akcie"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Nastaviť"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Skontrolovať aktualizácie"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Nahliadnuť do logov"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Stav"
 
-#: ../mdkapplet:167
-#: ../mdkapplet:422
+#: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Zatvoriť"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Dole"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Sieťové pripojenia:"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Hore"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Dole"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Posledná kontrola:"
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Aktualizácie:"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Spúšťanie drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Spúšťanie appletu mdkupdate\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline bude potrebné preinštalovať, znova nahrávam applet...."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Hľadanie nových aktualizácií...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Spájanie s"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Prehľadávanie... Sú dostupné nové aktualizácie\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "Vývojová verzia nie je podporovaná touto službou"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "Príliš stará verzia nie je podporovaná službou"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Neznámy stav"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online služby vypnuté. Kontaktujte stránku Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Zlé heslo.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
-msgstr "Nesprávna akcia, adresa hostiteľa alebo nesprávne prihlasovacie údaje\n"
+msgstr ""
+"Nesprávna akcia, adresa hostiteľa alebo nesprávne prihlasovacie údaje\n"
 
 #: ../mdkapplet:259
-msgid "Something is wrong with your network settings (check your route, firewall or proxy settings)\n"
-msgstr "Niečo s nastavením vašej siete nie je v poriadku (skontrolujte vaše pripojenie, firewall alebo nastavenie proxy)\n"
+#, c-format
+msgid ""
+"Something is wrong with your network settings (check your route, firewall or "
+"proxy settings)\n"
+msgstr ""
+"Niečo s nastavením vašej siete nie je v poriadku (skontrolujte vaše "
+"pripojenie, firewall alebo nastavenie proxy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Váš systém obsahuje všetky aktualizácie\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Žiadna kontrola"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrola siete: zrejme je vypnuté\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Kontrola konfiguračného súboru: Nebol nájdený\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logy"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Vyprázdniť"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "O.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Vždy spúšťať po štarte"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Koniec"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Ďalej"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Späť"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Prerušiť sprievodcu"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Späť"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Vítajte v Mandrakelinux Online"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -235,57 +297,68 @@ 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:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Vytvoriť Mandrakelinux Online účet"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Nemám konto na Mandrakeonline, ale želám si ho"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Vytvoriť"
 
-#: ../mdkonline:110
-#: ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Prihlasovacie meno:"
 
-#: ../mdkonline:111
-#: ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Potvrdiť heslo:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Mail kontakt:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Bezpečnostná politika Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Authentikácia"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Zadajte vaše prihlasovacie meno, heslo a názov počítača:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Meno počítača:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Odoslať konfiguráciu"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -294,12 +367,15 @@ msgid ""
 "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"
+"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."
+"Finally, an email alias with your username@mandrakeonline.net will be "
+"provided to you."
 msgstr ""
 "Aby ste mohli mať úžitok zo služieb na Mandrakeonline,\n"
 "je potrebné získanie vašej konfigurácie.\n"
@@ -308,21 +384,28 @@ msgstr ""
 "1) zoznam balíkov ktoré ste si nainštalovali\n"
 "2) vašu hardvérovú konfiguráciu\n"
 "\n"
-"Ak sa vám nepozdáva tento nápad alebo nevyžadujete používanie takýchto služieb\n"
-"kliknite na 'Zrušiť'. Kliknutím na 'Pokračovať' nám umožníte, aby sme vás informovali\n"
+"Ak sa vám nepozdáva tento nápad alebo nevyžadujete používanie takýchto "
+"služieb\n"
+"kliknite na 'Zrušiť'. Kliknutím na 'Pokračovať' nám umožníte, aby sme vás "
+"informovali\n"
 "o bezpečnostných aktualizáciách a užitočných iných vylepšeniach pomocou\n"
 "personalizovaného emailu.\n"
 "Môžete tiež zúžitkovať rôzne zľavy pre platené podporné služby na\n"
 "www.mandrakeexpert.com.\n"
 "Nakoniec, môžete získať emailový alias meno@mandrakeonline.net."
 
-#: ../mdkonline:143
-#: ../mdkonline:212
-#: ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Dokončiť"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Zaslanie bolo úspešné!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -330,7 +413,8 @@ msgstr ""
 "Odteraz budete môcť získavať oznámenia o bezpečnostných\n"
 "a funkčných aktualizáciách vďaka Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -338,30 +422,28 @@ 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:144
-msgid "Your upload was successful!"
-msgstr "Zaslanie bolo úspešné!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatické aktualizácie"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Krajina:"
 
-#: ../mdkonline:179
-#: ../mdkonline:184
-#: ../mdkonline:186
-#: ../mdkonline:188
+#: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Chyba"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Zadajte prosím prihlasovanie meno"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -370,58 +452,147 @@ msgstr ""
 " Skúste znova\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Nekorektná emailová adresa!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Načítavanie konfigurácie\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Zasielanie konfigurácie..."
 
-#: ../mdkonline:214
-#: ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problém s pripojením"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Pri odosielaní súborov nastal problém. Prosím, skúste ešte raz"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Ukončenie sa sprievodcu\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 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"
+msgstr ""
+"Mandrakeonline nie je možné skontaktovať, prosím skúste to neskôr znova"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Zlé heslo"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to Mandrakeonline.\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 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"
+" 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)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Vítajte v Mandrakelinux Online"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Vítajte v Mandrakelinux Online"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Zlé heslo"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Krajina:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -431,19 +602,50 @@ msgstr ""
 "\n"
 "použitie:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - vypísať túto pomoc.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate spustený automaticky.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - spustiť Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Obnoviť kľúče\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Mandrakeonline nie je možné skontaktovať, prosím skúste to neskôr znova"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 4c7a88f7..6025c2cc 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-26 10:02+0200\n"
 "Last-Translator: Gregor Pirnaver <gregor.pirnaver@mandrakeprinas.org>\n"
 "Language-Team: Slovenščina <lugos-slo@lugos.si>\n"
@@ -20,10 +20,12 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Vaš sistem je obnovljen"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -32,152 +34,189 @@ msgstr ""
 "pošto na support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistem je zaposlen. Počakajte ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Za vaš sistem so na voljo novi popravki"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Storitev ni na nastavljena. Prosim kliknite na \"Nastavi storitev\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Omrežje je nepovezano. Prosim nastavite vaše omrežje"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "Storitev ni aktivirana. Prosim kliknite na \"Internetna spletna stran\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Namesti popravke"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Nastavi storitev"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Preglej popravke"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Spletna stran na internetu"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Nastavljanje omrežja"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Nastavi Zdaj!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Vstavek Mandrakelinux za popravke"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Dejanja"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Nastavi"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Preglej popravke"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Poglej dnevnike"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Stanje"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Zapri"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Nepovezana"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Omrežne povezava: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Povezana"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Nepovezana"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Zadnji pregled: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Popravki: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect se zaganja\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Mandrakeupdate --applet se zaganja\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Izgleda, da je Mandrakeonline na novo nameščen, ponovno nalagam vstavek ..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Procesiranje novih popravkov ...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Povezovanje na"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Preverjanje ... Popravki so na voljo\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Neznano stanje"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Storitve na zvezi so onemogočene. Preverite stran Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Napačno geslo.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Napačno dejanje oz. gostitelj ali prijava.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -186,58 +225,72 @@ msgstr ""
 "požarni zid ali nastavitve proksija)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je obnovljen\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Brez pregleda"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Preverjam omrežje: izgleda onemogočeno\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Preverjam nastavitveno datotkeko: Ne obstaja\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Dnevniki"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Briši"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "O ..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Vedno zaženi ob zagonu"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Izhod"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Naslednja"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Nazaj"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Spusti čarovnika"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Nazaj"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "POzdravljeni v Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -247,56 +300,69 @@ msgstr ""
 "(paketov, sestava strojne opreme) v centralno bazo, tako da boste\n"
 "obveščeni o varnostnih in drugih uporabnih nadgradnjah.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Ustvari račun Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Računa Mandrakeonline še nimam in se želim "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Prijava"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Uporabniško ime:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Potrdi geslo:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Poštni kontakt:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux pravilo zasebosti"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Prijava v sistem"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Vnesite vaše Mandrakeonline uporabniško ime in geslo ter ime računalnika:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Ime računalnika:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Pošlji nastavitve"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -332,11 +398,18 @@ msgstr ""
 "Nenazadnje, dodelljen ti bo elektronski naslov s tvojim "
 "uporabniškimimenom@mandrakeonline.net. "
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Končaj"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Pošiljanje je bilo uspešno!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -344,7 +417,8 @@ msgstr ""
 "Od zdaj naprej boš prejemal varnostna\n"
 "in druga obvestila o nadgrajevanju zahvaljujoč Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -352,27 +426,28 @@ msgstr ""
 "Mandrakeonline ti omogoča, da avtomatiziraš nadgradnje.\n"
 "Program bo tekel redno v vašem sistemu čakajoč na nove nadgradnje\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Pošiljanje je bilo uspešno!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "avtomatiziranje Nadgradnje"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Država:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Napaka"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Prosim vpišite uporabniško ime"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -381,39 +456,49 @@ msgstr ""
 " Prosim, poskusite znova\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Neveljaven poštni naslov!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Berem nastavitve\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Pošiljanje nastavitev ..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problemi pri povezavi"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Težava ob prenosu datotek na strežnik, prosim poskusite znova"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Zapuščam čarovnika\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 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:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Napačno geslo"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -431,8 +516,83 @@ msgstr ""
 " Zavedajte se, da morate vnesti tudi ime računalnika\n"
 " (samo črke so sprejete)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "POzdravljeni v Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "POzdravljeni v Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Napačno geslo"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Država:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -448,18 +608,50 @@ msgstr ""
 "\n"
 "usage:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - izpiši to pomoč.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate se zažene samodejno.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - poženi Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - Obnovi ključe\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Povezovanje z Mandrakeonline je bilo neuspešno, prosim poskusite kasneje"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/sq.po b/po/sq.po
index f380da81..b030a849 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\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"
@@ -16,22 +16,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "Për çdo problem na dërgoni një e-mail në suppport@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
 "Skanerët e radhitur\n"
@@ -40,216 +42,249 @@ msgstr ""
 "janë lidhur direkt në sistemin tuaj.\n"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instaloi azhurnimet"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Konfiguro"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Azhurnimi"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Konfigurim i rrjetin"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Lexim i konfiguracionit\n"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux dhe jeta e juaj private"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Akcionet"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Konfiguro"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "Azhurnimet e sigurisë"
 
 #: ../mdkapplet:160
-#, fuzzy
+#, fuzzy, c-format
 msgid "See logs"
 msgstr "Kërkim +5s"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Statusi"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Mbylle"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Poshtë"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Lidhje Virtuale në Rrjet"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Lartë"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Poshtë"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Azhurnimi"
 
 #: ../mdkapplet:208
-#, fuzzy
+#, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Nise userdrake"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Lidhje e ballafaquar"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Lidhje e ballafaquar"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Ftues i pa njoftur"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Parulla e gabuar.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Modë i sistemit"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Të përditëshmet"
 
 #: ../mdkapplet:428
-#, fuzzy
+#, fuzzy, c-format
 msgid "Clear"
 msgstr "Kalendari"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Në lidhje me..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Dalje"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Tjetër"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Mbrapa"
-
-#: ../mdkonline:88
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, c-format
 msgid "Skip Wizard"
 msgstr " Asistenti i Parë Ndihmues "
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Mbrapa"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Mirë se Vini në Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -260,59 +295,68 @@ msgstr ""
 "qendrore\n"
 "që në fund të ju informon për azhurnimin e sigurisë.\n"
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Kontoja e Klubit Mandrake"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Nuk e posedon llogarin Mandrakeonline dhe dëshiroj të "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Nënshkrurje"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Parulla:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Konfirmoje Parullën:"
 
-#: ../mdkonline:113
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, c-format
 msgid "Mail contact:"
 msgstr "Kontakt Mail:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux dhe jeta e juaj private"
 
-#: ../mdkonline:126
-#, fuzzy
+#: ../mdkonline:128
+#, fuzzy, c-format
 msgid "Authentification"
 msgstr "Vërtetësimi"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Hyni loginin, parullën dhe emrin e makinës suaj në Mandrakeonline:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Emri i Makinës:"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Konfigurimi i zërit"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -349,11 +393,18 @@ msgstr ""
 "Më ne fund, një alias i adresës elektronike në formë të emrit "
 "tuaj@mandrakeonline..net do të furnizohet për ju"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Mbaro"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Dërgesa e juaj ishte me sukses!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -361,7 +412,8 @@ msgstr ""
 "Prej ketij momenti Mandrakeonline do të ju dërgon azhurnimet\n"
 "e reja të sigurisë."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -370,28 +422,28 @@ msgstr ""
 "Një program do të starton rregulisht në makinën tuaj për pritjen e "
 "azhurnimeve të reja.\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Dërgesa e juaj ishte me sukses!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Azhurnim automatikë"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Vendi:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Gabim"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "Ju lutemi provoni edhe një herë"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -400,41 +452,49 @@ msgstr ""
 " Ju lutemi provoni edhe një herë\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Nuk është një adresë e-mail valide!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Lexim i konfiguracionit\n"
 
 #: ../mdkonline:205
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending configuration..."
 msgstr "Lexim i konfiguracionit\n"
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Lidhje e ballafaquar"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Mbyllja e Asistentit\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 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:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Parulla e gabuar"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -452,8 +512,83 @@ msgstr ""
 "Shënoni se ju duhet ta shkruani emrin e Makinës suaj \n"
 "(vetëm shkronjat alfabetike janë të autorizuara)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Problem gjatë lidhjes në server \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mirë se Vini në Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mirë se Vini në Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Parulla e gabuar"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Vendi:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -468,42 +603,60 @@ msgstr ""
 "\n"
 "përdorim:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - çfaqe këtë lajm ndihmues.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - azhurnoi të gjitha informacionet.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - azhurnoi të gjitha informacionet.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - azhurnoi të gjitha informacionet.\n"
 
-#~ msgid "Email"
-#~ msgstr "Emaili"
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Mandrakeupdate nuk mund të kontaktoj sitin, ne do të mundohemi edhe një herë."
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Problem gjatë lidhjes në server \n"
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "I pa mundur azhurnimi i pakove nga mdkupdate mesatar.\n"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "I pa mundur azhurnimi i pakove nga mdkupdate mesatar.\n"
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
+#~ msgid "Email"
+#~ msgstr "Emaili"
 
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Po unë dëshiroj azhurmim automatikë"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "Mandrakeupdate nuk mund të kontaktoj sitin, ne do të mundohemi edhe një "
-#~ "herë."
-
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - përdore vetëm medianin e sigurimit.\n"
 
diff --git a/po/sr.po b/po/sr.po
index 1448ece4..7718d142 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\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"
@@ -17,11 +17,12 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -30,11 +31,12 @@ msgstr ""
 "net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
 "Следећи скенери\n"
@@ -43,279 +45,317 @@ msgstr ""
 "су директно повезани на ваш систем.\n"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Инсталирај update-ове"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Подеси"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Ажурирање"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Подеси мрежу"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Подеси веб"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrake Update"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Акције"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Подеси"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "Сигурносне надоградње"
 
 #: ../mdkapplet:160
-#, fuzzy
+#, fuzzy, c-format
 msgid "See logs"
 msgstr "Тражи +5s"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Статус"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Затвори"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Доле"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Конекција за Виртуелни Мрежу"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "горе"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Доле"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Ажурирање"
 
 #: ../mdkapplet:208
-#, fuzzy
+#, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Покрени userdrake"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Проблем са повезивањем"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Непознато име хоста"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
-#, fuzzy
+#, fuzzy, c-format
 msgid "Wrong Password.\n"
 msgstr "Потврди лозинку:"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Системски мод"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
-#, fuzzy
+#, fuzzy, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Недостаје конфигурациони фајл %s.\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Лог записи"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Очисти"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "О..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Заврши"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Следећа"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Претходни"
-
-#: ../mdkonline:88
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, c-format
 msgid "Skip Wizard"
 msgstr "Прескочи Чаробњака"
 
-#: ../mdkonline:102
-#, fuzzy
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Претходни"
+
+#: ../mdkonline:104
+#, fuzzy, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Добродошли у Mandrakelinux"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Mandrakeclub Рачун"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr ""
 
-#: ../mdkonline:106
-#, fuzzy
+#: ../mdkonline:108
+#, fuzzy, c-format
 msgid "Subscribe"
 msgstr "Scribus"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Потврди лозинку:"
 
-#: ../mdkonline:113
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, c-format
 msgid "Mail contact:"
 msgstr "Адреса ел.поште:"
 
-#: ../mdkonline:120
-#, fuzzy
+#: ../mdkonline:122
+#, fuzzy, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux-ов избор"
 
-#: ../mdkonline:126
-#, fuzzy
+#: ../mdkonline:128
+#, fuzzy, c-format
 msgid "Authentification"
 msgstr "Аутентификација"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:132
-#, fuzzy
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, fuzzy, c-format
 msgid "Machine name:"
 msgstr "Минице"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Подешавање звука"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -335,44 +375,52 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Крај"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr ""
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Земља:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Грешка"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "Пробајте поново"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -381,42 +429,48 @@ msgstr ""
 " Покушајте поново\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Е-mail адреса није исправна!\n"
 
-#: ../mdkonline:200
-#, fuzzy
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, fuzzy, c-format
 msgid "Reading configuration\n"
 msgstr "Поново уносим конфигурацију: "
 
 #: ../mdkonline:205
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending configuration..."
 msgstr "Подешавање звука"
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Проблем са повезивањем"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Изађи из Чаробњака\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeupdate не може да контактира сајт, покушаћемо поново."
 
-#: ../mdkonline:291
-#, fuzzy
+#: ../mdkonline:286
+#, fuzzy, c-format
 msgid "Wrong password"
 msgstr "Без лозинке"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -427,8 +481,83 @@ msgid ""
 " (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Проблем при повезивању на сервер \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Добродошли у Mandrakelinux"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Добродошли у Mandrakelinux"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Без лозинке"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Земља:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -444,44 +573,63 @@ msgstr ""
 "\n"
 "употреба:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - приказује ову поруку.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - ажурира све информације.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - ажурира све информације.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - ажурира све информације.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate не може да контактира сајт, покушаћемо поново."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Не могу да ажурирам пакете са mdkupdate медија.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Configuration"
 #~ msgstr "Конфигурација"
 
 #~ msgid "Email"
 #~ msgstr "Адреса ел.поште:"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Проблем при повезивању на сервер \n"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Не могу да ажурирам пакете са mdkupdate медија.\n"
-
 #, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "  --applet       - ажурира све информације.\n"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate не може да контактира сајт, покушаћемо поново."
-
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - користи само сигурносне медије.\n"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 7b4b0b42..206a3b6f 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\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"
@@ -17,11 +17,12 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -30,11 +31,12 @@ msgstr ""
 "net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
 "Sledeći skeneri\n"
@@ -43,279 +45,317 @@ msgstr ""
 "su direktno povezani na vaš sistem.\n"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Instaliraj update-ove"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Podesi"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Ažuriranje"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Podesi veb"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrake Update"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Akcije"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Podesi"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "Sigurnosne nadogradnje"
 
 #: ../mdkapplet:160
-#, fuzzy
+#, fuzzy, c-format
 msgid "See logs"
 msgstr "Traži +5s"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Status"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Zatvori"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Dole"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Konekcija za Virtuelni Mrežu"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "gore"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Dole"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Ažuriranje"
 
 #: ../mdkapplet:208
-#, fuzzy
+#, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokreni userdrake"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Problem sa povezivanjem"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Nepoznato ime hosta"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
-#, fuzzy
+#, fuzzy, c-format
 msgid "Wrong Password.\n"
 msgstr "Potvrdi lozinku:"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemski mod"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
-#, fuzzy
+#, fuzzy, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Nedostaje konfiguracioni fajl %s.\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Log zapisi"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Očisti"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "O..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Završi"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Sledeća"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Prethodni"
-
-#: ../mdkonline:88
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, c-format
 msgid "Skip Wizard"
 msgstr "Preskoči Čarobnjaka"
 
-#: ../mdkonline:102
-#, fuzzy
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Prethodni"
+
+#: ../mdkonline:104
+#, fuzzy, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Dobrodošli u Mandrakelinux"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Mandrakeclub Račun"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr ""
 
-#: ../mdkonline:106
-#, fuzzy
+#: ../mdkonline:108
+#, fuzzy, c-format
 msgid "Subscribe"
 msgstr "Scribus"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Potvrdi lozinku:"
 
-#: ../mdkonline:113
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, c-format
 msgid "Mail contact:"
 msgstr "Adresa el.pošte:"
 
-#: ../mdkonline:120
-#, fuzzy
+#: ../mdkonline:122
+#, fuzzy, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux-ov izbor"
 
-#: ../mdkonline:126
-#, fuzzy
+#: ../mdkonline:128
+#, fuzzy, c-format
 msgid "Authentification"
 msgstr "Autentifikacija"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:132
-#, fuzzy
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, fuzzy, c-format
 msgid "Machine name:"
 msgstr "Minice"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Podešavanje zvuka"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -335,44 +375,52 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Kraj"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr ""
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Zemlja:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Greška"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "Probajte ponovo"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -381,42 +429,48 @@ msgstr ""
 " Pokušajte ponovo\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "E-mail adresa nije ispravna!\n"
 
-#: ../mdkonline:200
-#, fuzzy
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, fuzzy, c-format
 msgid "Reading configuration\n"
 msgstr "Ponovo unosim konfiguraciju: "
 
 #: ../mdkonline:205
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending configuration..."
 msgstr "Podešavanje zvuka"
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problem sa povezivanjem"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Izađi iz Čarobnjaka\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 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:291
-#, fuzzy
+#: ../mdkonline:286
+#, fuzzy, c-format
 msgid "Wrong password"
 msgstr "Bez lozinke"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -427,8 +481,83 @@ msgid ""
 " (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Problem pri povezivanju na server \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Dobrodošli u Mandrakelinux"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Dobrodošli u Mandrakelinux"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Bez lozinke"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Zemlja:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -444,44 +573,63 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - prikazuje ovu poruku.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - ažurira sve informacije.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - ažurira sve informacije.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - ažurira sve informacije.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate ne može da kontaktira sajt, pokušaćemo ponovo."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Ne mogu da ažuriram pakete sa mdkupdate medija.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Configuration"
 #~ msgstr "Konfiguracija"
 
 #~ msgid "Email"
 #~ msgstr "Adresa el.pošte:"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Problem pri povezivanju na server \n"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Ne mogu da ažuriram pakete sa mdkupdate medija.\n"
-
 #, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "  --applet       - ažurira sve informacije.\n"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate ne može da kontaktira sajt, pokušaćemo ponovo."
-
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - koristi samo sigurnosne medije.\n"
 
diff --git a/po/sv.po b/po/sv.po
index abdff8f6..f64fcceb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-09 19:02+0200\n"
 "Last-Translator: Kenneth Krekula <kenneth.krekula@kiruna.se>\n"
 "Language-Team:  <sv@li.org>\n"
@@ -22,10 +22,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Ditt system är uppdaterat"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -34,150 +36,187 @@ msgstr ""
 "skicka e-post till support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Systemet är upptaget. Var god vänta ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Nya uppdateringar finns tillgängliga för ditt system"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Tjänsten är ej konfigurerad. Klicka på \"Konfigurera tjänsten\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Nätverket är nere. Var vänlig konfigurera ditt nätverk."
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Tjänsten är ej aktiverad. Klicka på \"Online webbsajt\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Installera uppdateringar"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Konfigurera tjänsten"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Kontrollera om det finns uppdateringar"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Online webbsajt"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Konfigurera nätverket"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Konfigurera nu!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux uppdateringsapplet"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Åtgärder"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Konfigurera"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Kontrollera om det finns uppdateringar"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Kontrollera loggar"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Status"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Stäng"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Ner"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Nätverksanslutning: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Upp"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Ner"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Sist kontrollerat: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Uppdateringar: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Startar drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Startar mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline verkar ha ominstallerats,startar om applet ...."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Beräknar nya uppdateringar...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Ansluter till"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Kontrollerar... Uppdateringar finns tillgängliga\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Okänd status"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online tjänster avaktiverade. Kontakta Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Felaktigt lösenord.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Fel åtgärd eller värd eller login.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -186,58 +225,72 @@ msgstr ""
 "brandväggs- eller proxyinställningar)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet är uppdaterat\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Ingen kontroll"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrollerar nätverk: verkar avaktiverat\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Kontrollerar konfigurationsfil: Ej tillgänglig\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Loggar"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Töm"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Om.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Kör alltid vid uppstart"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Avsluta"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Nästa"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Föregående"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Skippa guide"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Föregående"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Välkommen till Mandrakelinux Online"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -248,55 +301,68 @@ msgstr ""
 "databas för att kunna hålla dig informerad om säkerhetsuppdateringar\n"
 "och andra användbara uppdateringar.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Skapa ett Mandrakeonline konto"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Jag har inget Mandrakelinux Online-konto och jag vill "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Användarnamn:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Bekräfta lösenord:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "E-postadress:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakes integritetspolicy"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Autentisering"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Ange ditt Mandrakeonline-användarnamn, lösenord och datornamn:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Datornamn:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Skicka konfiguration"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -333,11 +399,18 @@ msgstr ""
 "Slutligen kommer ett e-postalias med ditt användarnamn@mandrakeonline.net "
 "att tillhandahållas dig."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Klar"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Uppladdningen lyckades!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -345,7 +418,8 @@ msgstr ""
 "Från och med nu kommer du att få säkerhets-\n"
 "och uppdateringsannonseringar tack vare Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -354,27 +428,28 @@ msgstr ""
 "Ett program kommer regelbundet att köras på systemet och vänta på nya "
 "uppdateringar.\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Uppladdningen lyckades!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "automatiska uppdateringar"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Land:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Fel"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Var vänlig ange användarnamn"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -383,38 +458,48 @@ msgstr ""
 " Försök igen.\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Inte en giltig e-postadress.\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Läser konfiguration\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Skickar konfiguration..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Anslutningsproblem"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Ett fel inträffade när filerna laddades upp, var vänlig försök igen"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Avslutar guiden\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeonline kunde inte kontaktas, var vänlig försök igen senare"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Felaktigt lösenord"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -432,8 +517,83 @@ msgstr ""
 " Var medveten om att du måste ange ett datornamn \n"
 " (bara alfabetiska tecken är tillåtna)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Välkommen till Mandrakelinux Online"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Välkommen till Mandrakelinux Online"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Felaktigt lösenord"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Land:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -448,18 +608,49 @@ msgstr ""
 "\n"
 "användning:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - visa det här hjälpmeddelandet.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate startas automatiskt.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - starta Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Uppdatera nycklar\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeonline kunde inte kontaktas, var vänlig försök igen senare"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 3f163a22..c17f82c4 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2002-08-23 20:02-0400\n"
 "Last-Translator: prabu <prabu_anand2000@yahoo.com>\n"
 "Language-Team: Tamil\n"
@@ -16,236 +16,271 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "பிழைகளை ஆங்கிலத்தில் ெதரிவிக்க support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "வலையமைப்பு அட்ைட எதுவும் காணப்படவில்ைல"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
-#, fuzzy
+#, fuzzy, c-format
 msgid "Install updates"
 msgstr "உருகருக்களை நிறுவுங்கள்"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "வடிவமை"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "புதுப்பித்தல்கள்"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "வலையமைப்பாக்கங்களை வடிவமையுங்கள்"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "மாண்டிரேக் கொள்கை"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "செயல்கள்"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "வடிவமை"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "பாதுகாப்பு புதுப்பித்தல்"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr ""
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "நிலவரம்"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "மூடு"
 
 #: ../mdkapplet:202
-#, fuzzy
-msgid "Down"
-msgstr "முடிந்தது"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "தொலைப்புழங்கி"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr ""
 
+#: ../mdkapplet:202
+#, fuzzy, c-format
+msgid "Down"
+msgstr "முடிந்தது"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "புதுப்பித்தல்கள்"
 
 #: ../mdkapplet:208
-#, fuzzy
+#, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "டிரேக்பயனரை துவக்கு"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "தெரியாத பயனர்"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "தவறான கடவுச்சொல்\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "இயக்க முறைமை"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "பதிவுகள்"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "துடை"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "பற்றி..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "வெளிச்செல்"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "அடுத்து"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "முன்னது"
-
-#: ../mdkonline:88
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, c-format
 msgid "Skip Wizard"
 msgstr "மாயாவியைத் தவிர்"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "முன்னது"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -255,64 +290,74 @@ msgstr ""
 "புதிய நிரல்களை அனுப்ப வடிவமைப்பு விவரங்களை ஓர் தரவுத்தளத்திற்கு\n"
 "அனுப்பி வைக்கும்.\n"
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "மாண்ட்ரேக் க்ளப் கணக்கு"
 
 # inserted a \n because Mandrakeonline has a bug, it doens't wrap long
 # lines and the end of the line is not visible on the window...
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr ""
 "மாண்டிரேக் இணையத்தளத்ளத்தில் எனக்கு\n"
 "பயனர்கணக்கு இல்லை.எனக்கொன்று "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "வேண்டும்"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "பயனர்கணக்கின் பெயர்"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "கடவுச்சொல்"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "கடவுச்சொல்லை உறுதிச் செய்:"
 
-#: ../mdkonline:113
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, c-format
 msgid "Mail contact:"
 msgstr "மின்னஞ்சல் முகவரி:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "மாண்டிரேக் கொள்கை"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "நல்குாிமை"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "உங்கள் மாண்டிரேக் இணையத்தள பயனர்கணக்கின்\n"
 "பெயர்,கடவுச்சொல்லை அடிக்கவும்"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "கணிணியின் பெயர்"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "ஒலி வடிவமைப்பு"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -345,11 +390,18 @@ msgstr ""
 "சென்று உதவி பெறலாம்\n"
 "கடைசியாக பயனர்கணக்கின் பெயர்@mandrakeonline.net உங்களுக்கு அளிக்கப்படும்"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "முடிந்தது"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "உங்கள் மேலேற்றுதல் வெற்றியடைந்தது"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -357,7 +409,8 @@ msgstr ""
 "இப்போது முதல் நீங்கள் மாண்டிரேக் இணையத்தளத்திலிருந்து\n"
 "பாதுகாப்பு, புதிய நிரல் பற்றி அறியலாம்"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -365,29 +418,28 @@ msgstr ""
 "மாண்டிரேக் இணையம் உங்கள் கணிணியில் புதிய நிரல்களை நிறுவும்\n"
 "புதிய நிரல் பற்றி அறிய உங்கள் கணிணியில் நிரல் ஓடிக்கொண்டிருக்கும்\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "உங்கள் மேலேற்றுதல் வெற்றியடைந்தது"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "புதிய நிரல்களை நிறுவ"
 
-#: ../mdkonline:150
-#, fuzzy
+#: ../mdkonline:151
+#, fuzzy, c-format
 msgid "Country:"
 msgstr "நாடு "
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "பிழை"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "மீண்டும் முயற்சித்து பார்க்கவும்"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -396,42 +448,50 @@ msgstr ""
 "தயவுசெய்து மீண்டும் முயன்று பார்க்கவும்\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "சரியான மின்னஞ்சல் முகவரி அல்ல!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
 
 #: ../mdkonline:205
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending configuration..."
 msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "மாயாவியை விட்டு வெளிச்செல்\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "மாண்ட்ேரக்புதுப்பி  இணையத்தளத்துடன் தொடர்பு \n"
 "கொள்ள முடியவில்லை,பிறகு முயலுங்கள்"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "தவறான கடவுச்சொல்"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -448,8 +508,83 @@ msgstr ""
 "செல்லவும் ஆனால் ஆங்கில்த்தில் கணிணிக்குப் பெயரிட வேண்டும்\n"
 "எழுத்துகள் மடடுமே பயனிக்கலாம்"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "சேவையகத்தோடு  இணைவதில் பிழை நேர்ந்துள்ளது\n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "தவறான கடவுச்சொல்"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "நாடு "
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -464,42 +599,61 @@ msgstr ""
 "\n"
 "பயன்பாடு\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - இந்த உதவியை காட்டு.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       -அைனத்து  விவரங்களையும் புதுப்பிக்கவும்\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       -அைனத்து  விவரங்களையும் புதுப்பிக்கவும்\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       -அைனத்து  விவரங்களையும் புதுப்பிக்கவும்\n"
 
-#~ msgid "Email"
-#~ msgstr "மின்னஞ்சல் "
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"மாண்ட்ேரக்புதுப்பி  இணையத்தளத்துடன் தொடர்பு \n"
+"கொள்ள முடியவில்லை,பிறகு முயலுங்கள்"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "சேவையகத்தோடு  இணைவதில் பிழை நேர்ந்துள்ளது\n"
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்திலிருந்து ெமன்ெபாருைள புதுப்பிக்க முடியவில்ைல\n"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்திலிருந்து ெமன்ெபாருைள புதுப்பிக்க முடியவில்ைல\n"
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
+#~ msgid "Email"
+#~ msgstr "மின்னஞ்சல் "
 
 #~ msgid "Yes I want automated updates"
 #~ msgstr "ஆம், எனக்கு நிரல்கள் தானகவே மேம்படுத்தப்பட வேண்டும்"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "மாண்ட்ேரக்புதுப்பி  இணையத்தளத்துடன் தொடர்பு \n"
-#~ "கொள்ள முடியவில்லை,பிறகு முயலுங்கள்"
-
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - பாதுகாப்பு ஊடகத்தை மட்டும் பயன்படுத்து.\n"
 
diff --git a/po/tg.po b/po/tg.po
index d004f8b9..f01d6bc6 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-28 16:30+0000\n"
 "Last-Translator: Abrorova <H_Abrorova@rambler.ru>\n"
 "Language-Team: Tajik\n"
@@ -25,10 +25,12 @@ msgstr ""
 "X-Generator: KBabel 1.0.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Системаи навкуниро талаб намекунад"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -37,154 +39,191 @@ msgstr ""
 "support@mandrakeonline.net пайём фиристед"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Система банд аст. Интизор шавед ..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Барои системаи шумо навсозиҳои дастрасанд"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Хидматрасон танзим нашудааст. Ба \"Танзимкунии хидмат\" ангушт занед"
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Шабака дастрас нест. Марҳамат кардашабакаи худро танзим кунед"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Хидмат фаъол нагаштааст. Ба \"Пойгоҳи шабакавӣ\" ангушт занед"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Кор гузоштани навигариҳо"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Танзимкунии хидмат"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Тафтиши Навкуниҳо"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "WebПойгоҳи Ғайрихудмухтор"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Танзимкунии Шабака"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Ҳозир Танзим кунед!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Апплети Mandrakelinux Навкунӣ"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Амалиёт"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Ба танзим даровардан"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Навкуниҳоро тафтиш кунед"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Ба номнависҳо нигаред"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Вазъият"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Пӯшидан"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Ба поён"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Пайвастшавии Шабакавӣ:  "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Ба боло"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Ба поён"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Тафтиши охирон: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Навсозӣ: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Сардиҳии drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Сардиҳии mdkupdate --апплет\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "Дар назар чунин аст, ки Mandrakeonline боз коргузорӣ шудааст, бозборкунии "
 "апплет ...."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Ҳисобкунии навозиҳои тоза...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Пайвастшавӣ ба"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Тафтишкунӣ... Навкуниҳо имконпазиранд\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Ҳолати номаълум"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Хидматрасониҳои ғайрихудмухтор хомӯш карда мешаванд. Ба пойгоҳи "
 "Mandrakeonline пайваст шавед\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Гузарвожаи нодуруст.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Амалиёти нодурусти ё соҳиб ё ворид.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -193,58 +232,72 @@ msgstr ""
 "проксии худро санҷед)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Системаи навкуниро талаб намекунад\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Бе тафтишот"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Тафтиши Шабака: эҳтимолан хомӯш карда шудааст\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Тафтиши файли config: ҳозир нест\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Воридҳо"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Пок кардан"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Дар бораи..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Ҳамеша дар оғозёбӣ сар додан"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Баромадан"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Оянда"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Гузашта"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Радкунии Устод"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Гузашта"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Марҳамат ба Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -256,56 +309,69 @@ msgstr ""
 "барои шуморо хабардор доштан оид ба навигариҳои бехатарӣ\n"
 "ва афзоишҳои фоиданок ёрӣ хоҳад расонд.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Офаридани Ҳисоби Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Ман ҳисоботи MandrakeOline надорам ва доштан мехоҳам "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Обуна шудан"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Номи дохилӣ:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Гузарвожа:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Тасдиқи Гузарвожа:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Пайвасти постӣ:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Сиёсати Шахсии Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Саҳеҳӣ"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Ворикунанадаи Mandrakeonline-и худро, гузарвожа ва номи мошинаро ворид кунед:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Номи мошина:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Фиристодани Танзимкунӣ"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -341,11 +407,18 @@ msgstr ""
 "”“Охирин, пости электронӣ бо номи корванди@mandrakeonline.net шумо ба““шумо "
 "таъмин карда мешавад.”"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Итмом"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Боркунии шумо бо муваффақият ноил гардид!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -353,7 +426,8 @@ msgstr ""
 "Ба туфайли Mandrakeonline аз ин лаҳза эътибран шумо ахбороти \n"
 "оиди бехатарӣ ва навкуниҳоро қабул хоҳед кард."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -362,27 +436,28 @@ msgstr ""
 "Барнома доимо ар системаи шумо иҷро мегардад ва то навкуниҳои оянда интизор "
 "мешавад.\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Боркунии шумо бо муваффақият ноил гардид!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "афзоишҳои Худкоршуда"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Давлат:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Хатогӣ"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Марҳамат карда ба воридкунанда таъмин кунед"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -391,40 +466,50 @@ msgstr ""
 " Лутфан такрор кунед\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Суроғаи пост ҳақиқӣ нест!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Танзимдарорӣ хонда шуда истодааст\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Танзимкуниҳо фиристода шуда истодаанд..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Муаммои пайвастагӣ"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Ҳангоми боркунии файлҳо мушкилие рух дод, бори дигар кӯшиш кунед"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Баромад аз Устод\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Пайвастшавӣ бо Mandrakeonline нашуда истодаст, марҳамат карда дертар бори "
 "дигар кӯшиш кунед"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Гузарвожаи нодуруст"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -442,8 +527,83 @@ msgstr ""
 " Таваҷӯҳ фармоед, ки шумо инчунин номи Мошинаро низ бояд ворид кунед \n"
 " (танҳо аломатҳои ҳарфӣ иҷозат дода мешаванд)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Марҳамат ба Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Марҳамат ба Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Гузарвожаи нодуруст"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Давлат:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -459,22 +619,55 @@ msgstr ""
 "\n"
 "истифода:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - чопи ин пайғоми ёрӣ.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate ба таври худкор сар дода мешавад.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - сардиҳии MandrakeНавкунӣ.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Навкунии калидҳо\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Пайвастшавӣ бо Mandrakeonline нашуда истодаст, марҳамат карда дертар бори "
+"дигар кӯшиш кунед"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Мушкилоти танзимкунӣ. Аз нав \"танзимкунӣ\"-ро бор кунед"
 
diff --git a/po/th.po b/po/th.po
index 07408f58..ae076feb 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\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"
@@ -17,276 +17,339 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "หากมีปัญหาใดๆ ให้ส่งอีเมล์ไปยัง support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr ""
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr ""
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr ""
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr ""
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr ""
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "การกระทำ"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "ตั้งค่า"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr ""
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr ""
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "สถานภาพ"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "ปิด"
 
 #: ../mdkapplet:202
-msgid "Down"
+#, c-format
+msgid "Network Connection: "
 msgstr ""
 
 #: ../mdkapplet:202
-msgid "Network Connection: "
+#, c-format
+msgid "Up"
 msgstr ""
 
 #: ../mdkapplet:202
-msgid "Up"
+#, c-format
+msgid "Down"
 msgstr ""
 
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr ""
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "ปัญหาการคอนเน็ค"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "ปัญหาการคอนเน็ค"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr ""
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr ""
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "ล็อก"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr ""
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "เกี่ยวกับ..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "ออก"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "ถัดไป"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "ก่อน"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr ""
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "ก่อน"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr ""
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr ""
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr ""
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr ""
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "ล็อกอิน:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr ""
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr ""
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr ""
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr ""
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -306,82 +369,100 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "เสร็จแล้ว"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr ""
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr ""
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr ""
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr ""
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
 msgstr ""
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr ""
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr ""
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "ปัญหาการคอนเน็ค"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr ""
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeupdate ไม่สามารถติดต่อกับไซต์ จะลองพยายามอีกครั้ง"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr ""
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -392,8 +473,83 @@ msgid ""
 " (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, c-format
+msgid "Mandrakeonline"
+msgstr ""
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "รหัสผ่าน:"
+
+#: ../mdkonline_tui:160
+#, c-format
+msgid "Country"
+msgstr ""
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -408,39 +564,61 @@ msgstr ""
 "\n"
 "วิธีใช้:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - แสดงข้อความช่วยเหลือ\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - อัพเดทข้อมูลทั้งหมด\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - อัพเดทข้อมูลทั้งหมด\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - อัพเดทข้อมูลทั้งหมด\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate ไม่สามารถติดต่อกับไซต์ จะลองพยายามอีกครั้ง"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "ไม่สามารถอัพเดทแพ็จเกจจากมีเดียของ mdkupdate \n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Checking ..."
 #~ msgstr "ปัญหาการคอนเน็ค"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "ไม่สามารถอัพเดทแพ็จเกจจากมีเดียของ mdkupdate \n"
-
 #, fuzzy
 #~ msgid "Launching Mandrakeupdate\n"
 #~ msgstr "  --applet       - อัพเดทข้อมูลทั้งหมด\n"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate ไม่สามารถติดต่อกับไซต์ จะลองพยายามอีกครั้ง"
-
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - ใช้มีเดียที่มีความปลอดภัยเท่านั้น\n"
 
diff --git a/po/tl.po b/po/tl.po
index 5fc1c913..03a7eb38 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-05-20 19:04+0800\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -18,168 +18,200 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
-#, fuzzy
+#, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "Ang Sistema ay naka-update\n"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Abala ang sistema. Maghintay ..."
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Walang mga available na update para sa iyong sistema"
 
 #: ../mdkapplet:85
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Service ay hindi available. I-click ang \"Configuration\""
 
 #: ../mdkapplet:91
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Down ang network. I-click ang \"I-configure ang Network\""
 
 #: ../mdkapplet:97
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Service ay hindi available. I-click ang \"Configuration\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "I-install ang mga update"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "I-configure ang Network"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Suriin ang mga Update"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Online WebSite"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "I-configure ang Network"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "I-configure Ngayon!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Updates Applet"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Mga Aksiyon"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "I-configure"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Suriin ang mga update"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Tingnan ang mga log"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Kalagayan"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Isara"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Down"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Network Connection: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Up"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Down"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Huling pagsuri: "
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Mga Bagong Update: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Inilulunsad ang drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Inilulunsad ang mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Naghahanap ng mga bagong update...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Kumukonekta sa"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Nagsusuri... mayroong mga Update\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Di-kilalang state"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Naka-disable ang mga online service. Makipag-alam sa Mandrakeonline site\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Maling password.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Maling aksyon o host o login.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -188,58 +220,72 @@ msgstr ""
 "route, firewall o proxy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Ang Sistema ay naka-update\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Walang pagsuri"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sinusuri ang Network: tila naka-disable\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Sinusuri ang config file: Wala\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Mga Log"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "I-clear"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Tungkol sa.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Quit"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Kasunod"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Nakaraan"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Laktawan ang Wizard"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Nakaraan"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Maligayang pagdating sa Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -250,55 +296,68 @@ msgstr ""
 "para mapaalam sa iyo ang tungkol sa mga update sa seguridad at mga\n"
 "kapakipakinabang na mga upgrade.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Gumawa ng Mandrakeonline Account"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Wala akong Mandrakeonline account at gusto kong "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Mag-subscribe"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Ulitin ang Password:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Mail contact:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux Privacy Policy"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Authentification"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Ipasok ang iyong Mandrakeonline login, password at pangalan ng makina:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Pangalan ng makina:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Ipadala ang Configuration"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -338,11 +397,18 @@ msgstr ""
 "net)\n"
 "ay ibibigay sa iyo."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Wakas"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Nagtagumpay ang iyong upload!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -350,7 +416,8 @@ msgstr ""
 "Mula ngayon ikaw ay makakatanggap ng mga announcement\n"
 "tungkol sa seguridad at update salamat sa Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -359,27 +426,28 @@ msgstr ""
 "ang mga update. May program na tatakbo tuwina sa iyong sistema na\n"
 "maghihintay para sa mga bagong update.\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Nagtagumpay ang iyong upload!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "naka-automate na mga Upgrade"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Bansa:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Error"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Magbigay ng login"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -388,38 +456,48 @@ msgstr ""
 " Pakisubukan muli\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Hindi balidong mail address!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Binabasa ang configuration\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Ipinapadala ang configuration..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Problema sa koneksyon"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Lumalabas ng Wizard\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Hindi ma-contact ang Mandrakeonline, pakisubukan muli mamaya"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Maling password"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -437,8 +515,83 @@ msgstr ""
 " Tandaan na dapat kang magbigay ng pangalan ng Makina \n"
 " (mga alphabetical na character lamang ang tatanggapin)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "Ang login at password ay dapat mas maikli sa 12 character\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Hindi pinapayagan ang mga special character\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Pakipuno lahat ng field\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "Email hindi balido\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "Mayroon nang account\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Problema sa pagkonekta sa server \n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Maligayang pagdating sa Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Maligayang pagdating sa Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Maling password"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Bansa:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -454,22 +607,53 @@ msgstr ""
 "\n"
 "paggamit:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - i-print ang mensaheng tulong na ito.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate ay nakalunsad ng automatic.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - ilunsad ang Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - mga Update key\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Hindi ma-contact ang Mandrakeonline, pakisubukan muli mamaya"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "Hindi ma-update ang mga package mula sa medium ng mdkupdate.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr "Problema sa config. Ilunsad muli ang \"I-configure\""
 
@@ -500,38 +684,17 @@ msgstr "  --update       - mga Update key\n"
 #~ msgid "Creation"
 #~ msgstr "Paggawa"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "Ang login at password ay dapat mas maikli sa 12 character\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Mga special character"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Hindi pinapayagan ang mga special character\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Mga blangkong field"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Pakipuno lahat ng field\n"
-
 #~ msgid "Email"
 #~ msgstr "Email"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "Email hindi balido\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "Mayroon nang account\n"
-
 #~ msgid "Change account"
 #~ msgstr "Baguhin ang account"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Problema sa pagkonekta sa server \n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Problema sa Server"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "Hindi ma-update ang mga package mula sa medium ng mdkupdate.\n"
diff --git a/po/tr.po b/po/tr.po
index f020bcce..56ee15a6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-02-26 20:24+0200\n"
 "Last-Translator: S. Alp ŞENYER <ssenyer@linux-sevenler.org>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -18,11 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -31,216 +32,259 @@ msgstr ""
 "gönderebilirsiniz\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Güncellemeleri kur"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Ağı Yapılandır"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Güncellemeleri Kontrol Et"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Online WebSite"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Ağı Yapılandır"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Yapılandır"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux Güncelleme Uygulamacığı"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Eylemler"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Yapılandır"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "Güncellemeleri Kontrol Et"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Günlüğü göster"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Durum"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Kapat"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Aşağı"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Ağ Bağlantısı:"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Yukarı"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Aşağı"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Son Kontrol:"
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Yeni Güncellemeler:"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Güncellemeleri Kontrol Et"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Bağlantı problemi"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr ""
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Yanlış parola.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
 #: ../mdkapplet:348
-#, fuzzy
+#, fuzzy, c-format
 msgid "No check"
 msgstr "Son Kontrol:"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
-#, fuzzy
+#, fuzzy, c-format
 msgid "Logs"
 msgstr "Giriş:"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Temizle"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Hakkında..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Çıkış"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "İleri"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Önceki"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Sihirbazı Atla"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Önceki"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Mandrakeonline'na Hoşgeldiniz"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -251,56 +295,68 @@ msgstr ""
 "oluşturulacak ve sisteminiz hakkında güvenlik yamaları ve güncellemelerden\n"
 "her an haberdar olacaksınız.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Mandrakelinux Online Hesabı Oluştur"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 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:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Kayıt Ol"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Giriş:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Parolayı Onayla:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Posta bağlantısı:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux Gizlilik Politikası"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Yetkilendirme"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Mandrakeonline kullanıcıadınızı , parolanızı ve makine adını giriniz:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Makine adı:"
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "Yapılandırma"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -333,11 +389,18 @@ 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:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Son"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Göndermeniz tamamlanmıştır!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -346,7 +409,8 @@ msgstr ""
 "hakkında ki tüm gelişmeler ve güvenlik açıkları size bildirilecektir.\n"
 "Mandrakesoft teşekkürlerini sunar..."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -355,27 +419,28 @@ msgstr ""
 "Sistemizde belirli aralıklarla çalışacak ve\n"
 "güncellemeleri takip edecek olan bir programdır\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Göndermeniz tamamlanmıştır!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "otomatik Güncellemeler"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Ülke:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Hata"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Lütfen bir kullanıcı adı edinin"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -384,40 +449,50 @@ msgstr ""
 "Lütfen tekrar deneyin\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Geçerli bir EPosta adresi değil\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Yapılandırmanız okunuyor\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Yapılandırma gönderiliyor..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Bağlantı problemi"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Sihirbaz Kapatılıyor\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Mandrakeonline sitesine bağlantı sağlanamadı, sonra lütfen daha sonra tekrar "
 "deneyin."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Yanlış parola"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -435,8 +510,83 @@ msgstr ""
 " Bir Makine adı tanımladığınıza emin olun. \n"
 " ( sadece karakter bazlı makine adları geçerlidir)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "Kullanıcı adı ve şifre 12 karakterden küçük olmalıdır\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Özel karakterler kullanılamaz\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Lütfen tüm alanları doldurun\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "Geçersiz EPosta\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "Böyle bir hesap zaten var\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Sunucuya bağlanırken hata oluştu\n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline'na Hoşgeldiniz"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline'na Hoşgeldiniz"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Yanlış parola"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Ülke:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -452,25 +602,54 @@ msgstr ""
 "\n"
 "kullanımı:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - bu yardım mesajını görüntüler.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr " --update        - Mandrake Update'yi çalıştır.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr " --update        - Mandrakelinux Update'yi çalıştır.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr " --update        - Mandrakelinux Update'yi çalıştır.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Mandrakeupdate sitesine bağlantı sağlanamadı, sonra tekrar deneyeceğiz."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "mdkupdate medyasından paketler güncellenemiyor.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Launch Mandrakelinux Update"
 #~ msgstr "Mandrakelinux Update Uygulamasını Çalıştır"
 
@@ -490,42 +669,21 @@ msgstr " --update        - Mandrakelinux Update'yi çalıştır.\n"
 #~ msgid "Creation"
 #~ msgstr "Oluşturulma"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "Kullanıcı adı ve şifre 12 karakterden küçük olmalıdır\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Özel karakterler"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Özel karakterler kullanılamaz\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Boş alanlar"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Lütfen tüm alanları doldurun\n"
-
 #~ msgid "Email"
 #~ msgstr "EPosta"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "Geçersiz EPosta\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "Böyle bir hesap zaten var\n"
-
 #~ msgid "Change account"
 #~ msgstr "Hesabı değiştir"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Sunucuya bağlanırken hata oluştu\n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Sunucu Hatası"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "mdkupdate medyasından paketler güncellenemiyor.\n"
-
 #, fuzzy
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Mandrakeonline'na Hoşgeldiniz"
@@ -537,10 +695,6 @@ msgstr " --update        - Mandrakelinux Update'yi çalıştır.\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Evet otomatik güncellemeleri istiyorum"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr ""
-#~ "Mandrakeupdate sitesine bağlantı sağlanamadı, sonra tekrar deneyeceğiz."
-
 #~ msgid "Register Now!"
 #~ msgstr "Şimdi Kayıt Ol!"
 
diff --git a/po/uk.po b/po/uk.po
index 1b861480..0735b069 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-16 00:27+0300\n"
 "Last-Translator: Taras Boychuk <btr1@ukrpost.net>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -21,10 +21,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Система поновлена"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -33,150 +35,187 @@ msgstr ""
 "листа на support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Система зайнята. Зачекайте..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Є нові поновлення для Вашої системи"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Служба не налаштована. Натисніть на \"Налаштувати службу\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Мережа вимкнена. Будь ласка, налаштуйте мережу"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Служба не ввімкнена. Натисніть на \"Online Website\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Встановити поновлення"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Налаштувати службу"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Перевірити поновлення"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Online WebSite"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Налаштувати мережу"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Налаштувати вже!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Аплет Поновлення Мандрейклінакса"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Дії"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Налаштувати"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Перевірити поновлення"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Переглянути журнал"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Стан"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Закрити"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Вимкнути"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Під'єднання до мережі:"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Увімкнути"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Вимкнути"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Остання перевірка:"
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Поновлення: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Запускається drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Запускається аплет mdkupdate\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Здається, Mandrakeonline було перевстановлено, перезавантажую аплет..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Перевіряються нові поновлення...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Під'єднуюсь до"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Перевірка... Поновлення готові \n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Невідомий стан"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Онлайнові послуги вимкнено. Зверніться до сайту Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Неправильний пароль.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Направильна дія, машина або пароль.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -185,58 +224,72 @@ msgstr ""
 "або налаштування проксі)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Система поновлена\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Немає перевірок"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Перевірка мережі: здається, вимкнена\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Перевірка конфігураційного файла: немає\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Журнал"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Очистити"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Про..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Завжди виконувати при завантаженні"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Вийти"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Вперед"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Назад"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Оминути Помічника"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Назад"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Ласкаво просимо до Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -246,55 +299,68 @@ msgstr ""
 "(пакунки, конфігурацію системи) до централізованої бази,\n"
 "щоб інформувати Вас про поновлення безпеки та інші корисні оновлення.\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Створити рахунок Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "В мене немає рахунку Mandrakeonline і я хочу "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Підписатися"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Ім'я:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Підтвердіть пароль:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Поштовий контакт:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux Privacy Policy"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Аутентифікація"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Введіть своє ім'я на Mandrakeonline, пароль та назву машини: "
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Назва машини:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Відіслати конфігурацію"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -330,11 +396,18 @@ msgstr ""
 "username@mandrakeonline.net.\n"
 "На завершення, Вам буде надано електронну адресу username@mandrakeonline.net"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Завершити"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "звантаження пройшло успішно!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -342,7 +415,8 @@ msgstr ""
 "Відтепер завдяки Mandrakeonline Ви отримуватимете оновлення безпеки \n"
 "оголошення про поновлення."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -350,27 +424,28 @@ msgstr ""
 "Mandrakeonline пропонує Вам можливість автоматизувати поновлення.\n"
 "Програма регулярно виконуватиметься і очікуватиме нових поновлень\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "звантаження пройшло успішно!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "автоматичні Оновлення"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Країна:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Помилка"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Будь ласка, вкажіть ім'я"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -379,40 +454,50 @@ msgstr ""
 "Спробуйте ще раз\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Неправильна електронна адреса!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Читається конфігурація\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Надсилається конфігурація..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Проблеми зі з'єднанням"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "При звантаженні файлів сталася проблема, спробуйте ще раз"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Вихід з Помічника\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Неможливо встановити зв'язок з Mandrakeonline, будь ласка, спробуйте ще раз "
 "пізніше"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Неправильний пароль"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -429,8 +514,83 @@ msgstr ""
 " Знайте, що Ви повинні також вказати назву машини \n"
 " (можна використовувати тільки алфавітні символи)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Ласкаво просимо до Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Ласкаво просимо до Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Неправильний пароль"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Країна:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -446,18 +606,51 @@ msgstr ""
 "\n"
 "використання:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help        - вивести цю довідку.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate виконується автоматично.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - виконати Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - поновити ключі\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Неможливо встановити зв'язок з Mandrakeonline, будь ласка, спробуйте ще раз "
+"пізніше"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/uz.po b/po/uz.po
index a514484a..28fafdc5 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-06-27 23:53+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -17,276 +17,339 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Янгиланишларни ўрнатиш"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Тармоқни мослаш"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Янгиланишларни текшириш"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Тармоқни мослаш"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr ""
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Амаллар"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Мослаш"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Янгиланишларни текшириш"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Логларни кўриш"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Ҳолати"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Ёпиш"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Ишламаяпти"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Тармоқ: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Ишлаяпти"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Ишламаяпти"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Охирги текширув:"
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Янги янгиланишлар: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Алоқа ўрнатилмоқда"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr ""
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Махфий сўз нотўғри.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Логлар"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Тозалаш"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Ҳақида"
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Чиқиш"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Кейингиси"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Олдингиси"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Ёрдамчисиз"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Олдингиси"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Mandrakeonline'га марҳамат"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Mandrakeonline ҳисобини яратиш"
 
-#: ../mdkonline:106
-#, fuzzy
+#: ../mdkonline:108
+#, fuzzy, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "MandrakeOnline ҳисобини яратиш"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Аъзо бўлиш"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Фойдаланувчи:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Махфий сўз:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Махфий сўзни тасдиқланг:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Тасдиқлаш"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Компьютернинг номи:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr ""
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -306,43 +369,52 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Тайёр"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr ""
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Автоматлаштирилган янгиланишлар"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Давлат:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Хато"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr ""
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -351,39 +423,49 @@ msgstr ""
 " Илтимос яна уриниб кўринг\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Электрон почта ҳақиқий эмас!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Мосламалар жўнатилмоқда..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Алоқа ўрнатишда муаммо"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Ёрдамчидан чиқилмоқда\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Mandrakeonline билан алоқа ўрнатиб бўлмади. Илтимос кейинроқ уриниб кўринг"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Махфий сўз нотўғри"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -394,8 +476,83 @@ msgid ""
 " (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "Фойдаланувчи ва махфий сўз 12 та белгидан кам бўлиши керак\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Махсус белгилар мумкин эмас\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Илтимос ҳамма майдонларни тўлдиринг\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "Электрон почта ҳақиқий эмас\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "Ҳисоб аллақачон мавжуд\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Серверга уланишда муаммо\n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline'га марҳамат"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline'га марҳамат"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Махфий сўз нотўғри"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Давлат:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -410,23 +567,54 @@ msgstr ""
 "\n"
 "Фойдаланиш:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - шу ёрдам хабарини кўрсатиш.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - MandrakeUpdate хизматини ишга тушириш.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdate хизматини ишга тушириш.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Калитларни янгилаш.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Mandrakeonline билан алоқа ўрнатиб бўлмади. Илтимос кейинроқ уриниб кўринг"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Configuration"
 #~ msgstr "Мослаш"
 
@@ -442,35 +630,17 @@ msgstr "  --update       - Калитларни янгилаш.\n"
 #~ msgid "Creation"
 #~ msgstr "Яратиш"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "Фойдаланувчи ва махфий сўз 12 та белгидан кам бўлиши керак\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Махсус белгилар"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Махсус белгилар мумкин эмас\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Бўш майдонлар"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Илтимос ҳамма майдонларни тўлдиринг\n"
-
 #~ msgid "Email"
 #~ msgstr "Электрон почта"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "Электрон почта ҳақиқий эмас\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "Ҳисоб аллақачон мавжуд\n"
-
 #~ msgid "Change account"
 #~ msgstr "Ҳисобни ўзгартириш"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Серверга уланишда муаммо\n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Сервер муаммоси"
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index 4327ead3..8a8b88e4 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-06-27 23:53+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -17,276 +17,339 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr ""
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Yangilanishlarni o'rnatish"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Tarmoqni moslash"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Yangilanishlarni tekshirish"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Tarmoqni moslash"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr ""
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr ""
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Amallar"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Moslash"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Yangilanishlarni tekshirish"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Loglarni ko'rish"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Holati"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Yopish"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Ishlamayapti"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Tarmoq: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Ishlayapti"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Ishlamayapti"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Oxirgi tekshiruv:"
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "Yangi yangilanishlar: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Aloqa o'rnatilmoqda"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr ""
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Maxfiy so'z noto'g'ri.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr ""
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr ""
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Loglar"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Tozalash"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Haqida"
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Chiqish"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Keyingisi"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Oldingisi"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Yordamchisiz"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Oldingisi"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Mandrakeonline'ga marhamat"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Mandrakeonline hisobini yaratish"
 
-#: ../mdkonline:106
-#, fuzzy
+#: ../mdkonline:108
+#, fuzzy, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "MandrakeOnline hisobini yaratish"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "A'zo bo'lish"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Foydalanuvchi:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Maxfiy so'z:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Maxfiy so'zni tasdiqlang:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr ""
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr ""
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Tasdiqlash"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Kompyuterning nomi:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr ""
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -306,43 +369,52 @@ msgid ""
 "provided to you."
 msgstr ""
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Tayyor"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr ""
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
 msgstr ""
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr ""
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Avtomatlashtirilgan yangilanishlar"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Davlat:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Xato"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr ""
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -351,39 +423,49 @@ msgstr ""
 " Iltimos yana urinib ko'ring\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Elektron pochta haqiqiy emas!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr ""
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Moslamalar jo'natilmoqda..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Aloqa o'rnatishda muammo"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Yordamchidan chiqilmoqda\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 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:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Maxfiy so'z noto'g'ri"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -394,8 +476,83 @@ msgid ""
 " (only alphabetical characters are admitted)"
 msgstr ""
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr "Foydalanuvchi va maxfiy so'z 12 ta belgidan kam bo'lishi kerak\n"
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr "Maxsus belgilar mumkin emas\n"
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr "Iltimos hamma maydonlarni to'ldiring\n"
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr "Elektron pochta haqiqiy emas\n"
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr "Hisob allaqachon mavjud\n"
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "Serverga ulanishda muammo\n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline'ga marhamat"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline'ga marhamat"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Maxfiy so'z noto'g'ri"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Davlat:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -410,23 +567,54 @@ msgstr ""
 "\n"
 "Foydalanish:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - shu yordam xabarini ko'rsatish.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - MandrakeUpdate xizmatini ishga tushirish.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdate xizmatini ishga tushirish.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Kalitlarni yangilash.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Mandrakeonline bilan aloqa o'rnatib bo'lmadi. Iltimos keyinroq urinib ko'ring"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Configuration"
 #~ msgstr "Moslash"
 
@@ -442,35 +630,17 @@ msgstr "  --update       - Kalitlarni yangilash.\n"
 #~ msgid "Creation"
 #~ msgstr "Yaratish"
 
-#~ msgid "Login and password should be less than 12 characters\n"
-#~ msgstr "Foydalanuvchi va maxfiy so'z 12 ta belgidan kam bo'lishi kerak\n"
-
 #~ msgid "Special characters"
 #~ msgstr "Maxsus belgilar"
 
-#~ msgid "Special characters are not allowed\n"
-#~ msgstr "Maxsus belgilar mumkin emas\n"
-
 #~ msgid "Empty fields"
 #~ msgstr "Bo'sh maydonlar"
 
-#~ msgid "Please fill in all fields\n"
-#~ msgstr "Iltimos hamma maydonlarni to'ldiring\n"
-
 #~ msgid "Email"
 #~ msgstr "Elektron pochta"
 
-#~ msgid "Email not valid\n"
-#~ msgstr "Elektron pochta haqiqiy emas\n"
-
-#~ msgid "Account already exist\n"
-#~ msgstr "Hisob allaqachon mavjud\n"
-
 #~ msgid "Change account"
 #~ msgstr "Hisobni o'zgartirish"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "Serverga ulanishda muammo\n"
-
 #~ msgid "Server Problem"
 #~ msgstr "Server muammosi"
diff --git a/po/vi.po b/po/vi.po
index 639333ec..9e991ae3 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-21 12:59+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Gnome-Vi <Gnomevi-list@lists.sourceforge.net>\n"
@@ -15,10 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Hệ thống của bạn đã cập nhật"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -27,150 +29,187 @@ msgstr ""
 "support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Hệ thống đang bận, hãy chờ...."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "Có cập nhật mới cho hệ thống của bạn"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Chưa cấu hình dịch vụ. Hãy nhấn \"Cấu hình dịch vụ\""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Network chưa có. Hãy cấu hình network !"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Dịch vụ chưa được kích hoạt. Hãy nhấn chuột lên \"Website Trực Tuyến\""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Cài đặt các cập nhật"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Cấu hình dịch vụ"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Kiểm tra cập nhật"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "WebSite Trực Tuyến"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Cấu hình network"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Cấu hình bây giờ!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Applet Cập Nhật Mandrakelinux"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Hành động"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Cấu hình"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Kiểm tra cập nhật"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Xem log"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Trạng thái"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Đóng"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Xuống"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Kết nối mạng:"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "Lên"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Xuống"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Lần kiểm tra cuối:"
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Cập nhật:"
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Chạy drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Chạy mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline có vẻ được cài đặt lại, đang nạp lại applet ...."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Tính toán các cập nhật mới...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Kết nối tới"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Kiểm tra... Đang có bản cập nhật mới\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Trạng thái không xác định"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Dịch vụ trực tuyến bị tắt. Hãy liên lạc với Mandrakeonline site\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Sai mật khẩu.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Sai hành động, host, đăng nhập.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -179,58 +218,72 @@ msgstr ""
 "lửa, proxy)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Hệ thống đã cập nhật mới\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Không kiểm tra"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kiểm tra mạng: có lẽ chưa bật chạy\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Kiểm tra tập tin cấu hình: không tồn tại\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Logs"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Xóa sạch"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Giới thiệu"
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "Luôn chạy khi khởi động"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Thoát"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Tiến"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Về trước"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Bỏ qua đồ thuật"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Về trước"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Chào Mừng Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -240,55 +293,68 @@ 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:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Tạo tài khoản Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Tôi không có tài khoản Mandrakelinux Online và muốn lập một cái "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "Đăng ký"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "Đăng nhập:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Mật khẩu:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Xác Nhận Mật Khẩu:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Thư liên lạc:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Chính Sách Riêng Tư Của Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Chứng thực"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 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:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "Tên máy tính:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Gửi cấu hình"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -323,11 +389,18 @@ 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:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Kết thúc"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Đã hoàn thành việc tải lên!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -335,7 +408,8 @@ 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:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -343,27 +417,28 @@ 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:144
-msgid "Your upload was successful!"
-msgstr "Đã hoàn thành việc tải lên!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "Nâng cấp tự động"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Quốc gia:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Lỗi"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Hãy cung cấp đăng nhập"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -372,38 +447,48 @@ msgstr ""
 " Hãy thử lại\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Địa chỉ thư không hợp lệ!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Đang đọc cấu hình\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Đang gửi cấu hình..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Trục trặc kết nối"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Trục trặc khi tải lên các tập tin, hãy thực hiện lại"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Đang thoát khỏi Đồ Thuật\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Không thể liên lạc với MandrakeOnline, hãy thực hiện lại sau"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Sai mật khẩu"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -421,8 +506,83 @@ msgstr ""
 " 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)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Chào Mừng Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Chào Mừng Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Sai mật khẩu"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Quốc gia:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -438,18 +598,49 @@ msgstr ""
 "\n"
 "cách dùng:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - in ra thông điệp trợ giúp này.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Tự động chạy Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - chạy Mandrakeupdate.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - Cập nhật khóa\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Không thể liên lạc với MandrakeOnline, hãy thực hiện lại sau"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 69cea7f7..b5281973 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-08-11 20:48+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -17,10 +17,12 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "Li sistinme da vosse est a djoû"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -29,153 +31,190 @@ msgstr ""
 "po dire li problinme a support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Li sistinme est ocupé. Tårdjîz ene miete..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "I gn des noveas metaedjes a djoû po vosse sistinme"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Siervice nén apontyî. Clitchîz so «Apontyî l' siervice»"
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Li rantoele est djus. Apontyîz l' rantoele s' i vs plait."
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Siervice nén èn alaedje. Clitchîz so «Waibe»"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Modêye nén sopoirtêye (modêye pår trop viye, ou modêye di diswalpaedje)"
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "Astaler les metaedjes a djoû"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "Apontyî l' siervice"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "Verifyî les metaedjes a djoû"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Waibe"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "Apontyî l' rantoele"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "Apontyî do côp!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Aplikete di metaedjes a djoû"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "Accions"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "Apontyî"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "Verifyî les metaedjes a djoû"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "Vey les djournås"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "Estat"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "Clôre"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "Essocté"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "Raloyaedje al rantoele: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "En alaedje"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "Essocté"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "Dierin verifiaedje: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "Metaedjes a djoû: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Enondant drakconnect\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Enondant «mdkupdate --applet»\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 "I shonnreut k' Mandrakeonline åye sitî rastalé, dji rtchedje l' aplikete..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "Carculaedje des metaedjes a djoû...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "Dji m' raloyaedje a"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Verifiant... Des metaedjes a djoû sont disponibes\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "Modêye di diswalpaedje nén sopoirtêye på siervice"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "Modêye pår trop viye nén sopoirtêye på siervice"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "Estat nén cnoxhou"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Les siervices so les fyis sont essoctés. Contactez li site Mandrakeonline\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "Måva scret.\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Accion, no d' lodjoe ou no d' elodjaedje nén corek.\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -184,58 +223,72 @@ msgstr ""
 "routaedje, li côpe-feu eyet l' apontiaedje do procsi)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "Li sistinme est a djoû\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "Pont d' verifiaedje"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verifiaedje del rantoele: i shonnreut k' ele ni soeye nén en alaedje\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Verifiaedje do fitchî d' apontiaedje: nén la\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "Djournås"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "Netyî"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "Åd fwait..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "El drovi tofer a l' enondaedje"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "Cwiter"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "Shuvant"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "Di dvant"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "Passer houte"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "Di dvant"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Wilicome e Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -246,56 +299,69 @@ 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:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Ahiver on conte Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 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:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "M' abouner"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "No d' elodjaedje:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "Sicret:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "Acertinez l' sicret:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "Emile di contak:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Politike sol privaceye di Mandrakelinux"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "Otintifiaedje"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr ""
 "Dinez vosse no d' elodjaedje, no d' éndjole eyet scret po Mandrakeonline:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "No d' l' éndjole:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "Evoyî l' apontiaedje"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -328,11 +394,18 @@ msgstr ""
 "so les siervices payants di www.mandrakeexpert.com.\n"
 "Eto, vos åroz èn alias emile del foûme « uzeu@mandrakeonline.net »."
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "Fini"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "Vosse metaedje a djoû a stî comifåt!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -340,7 +413,8 @@ msgstr ""
 "A pårti d' asteure vos rçuroz les anonces di såvrité\n"
 "et di metaedjes a djoû viè Mandrakeonline."
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -350,27 +424,28 @@ msgstr ""
 "On programe srè enondé regulirmint so vosse sistinme po cweri après des "
 "noveas metaedjes a djoû\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "Vosse metaedje a djoû a stî comifåt!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "metaedjes a djoû otomatikes"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "Payis:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "Aroke"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "Dinez on no d' elodjaedje d' si vs plait"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -379,40 +454,50 @@ msgstr ""
 " Sayîz cor on côp s' i vs plait\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "C' est nén ene adresse emile valide!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "Dji lé vost apontiaedje\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "Evoyant l' apontiaedje..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "Aroke avou l' raloyaedje"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Åk n' a nén stî tot-z eberwetant les fitchîs, rissayîz s' i vs plait"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Cwitant l' macrea\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 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:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "Måva scret"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -427,8 +512,83 @@ msgstr ""
 "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)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Wilicome e Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Wilicome e Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "Måva scret"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "Payis:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -444,22 +604,55 @@ msgstr ""
 "\n"
 "Po s' è siervi:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr " --help         - mostere ci messaedje d' aidance chal.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr " --auto         - enonder les metaedjes a djoû otomaticmint.\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr " --applet       - enonder les metaedjes a djoû di Mandrakelinux.\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr " --update       - mete a djoû les clés.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr ""
+"Dji n' a polou m' raloyî a Mandrakeonline, rissayîz on pô pus tård s' i vs "
+"plait."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #~ msgid "Config problems. Launch \"configure\" again"
 #~ msgstr ""
 #~ "I gn a des arokes avou l' apontiaedje. Clitchîz so «Apontyî» cor on côp"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d74ca155..d55f6d24 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-21 21:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -16,218 +16,271 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "您的系统已为最新"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "服务配置问题。请检查日志并发送邮件到 support@mandrakeonline.net"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "系统正忙。请稍候..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "您的系统没有可用的更新"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "服务未配置。请点击“配置服务”"
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "网络已掉线。请配置您的网络"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "服务未激活。请点击“在线网站”"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "版本不支持(太旧，或者为开发版本)"
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "安装更新"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "配置服务"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "检查更新"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "在线网站"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "配置网络"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "立即配置!"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux 更新小程序"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "动作"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "配置"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "检查更新"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "查看日志"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "状态"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "关闭"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "断"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "网络连接: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "通"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "断"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "上次检查: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "更新: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "调用 Drak 连接\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "调用 mdkupdate --applet\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline 似乎重新安装了，正在重新装入小程序..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "正在检查更新...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "正在连接到"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "正在检查... 有可用的更新\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr "此服务不支持开发版本"
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr "此服务器不支持太旧的版本"
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "未知状态"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "在线服务已禁用。请浏览 Mandrakeonline 网站\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "密码错误。\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "动作、主机或用户名错误。\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr "您的网络设置可能有错(请检查您的路由器、防火墙或代理服务器设置)\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "系统已为最新\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "不检查"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "检查配置文件：不存在\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "日志"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "清除"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "关于..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "在启动时自动调用"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "上一步"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "跳过向导"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "上一步"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Mandrakeonline 欢迎您"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -237,55 +290,68 @@ msgstr ""
 "的配置(软件包、硬件配置)上传到中央数据库中，这样可以保证您能够时刻收到\n"
 "安全更新和有用的升级。\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "创建一个 Mandrakeonline 账户"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "我没有 Mandrakeonline 账户, 我要"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "订阅"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "登录名:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "确认密码:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "联系邮件："
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux 隐私保护政策"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "身份验证"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "请输入您的 Mandrakeonline 登录名, 密码和机器名:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "机器名:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "发送配置"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -316,11 +382,18 @@ msgstr ""
 "到支持服务的付费折扣。\n"
 "最后，您还能得到一个 username@mandrakeonline.net 的电子邮件别名。"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "完成"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "您的上传已经成功!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -328,7 +401,8 @@ msgstr ""
 "从现在开始，您将能够收到 Mandrakeonline 发出的安全\n"
 "和更新通知了。"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -336,27 +410,28 @@ msgstr ""
 "Mandrakeonline 还能让您自动保持更新。您的系统中会定期运行一个特\n"
 "定的程序，该程序会自动下载并安装更新\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "您的上传已经成功!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "自动升级"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "国家:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "出错"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "请提供有效的登录名"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -365,38 +440,48 @@ msgstr ""
 " 请再试一次\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "不是有效的电子邮件地址!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "正在读取配置\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "正在发送配置..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "上传文件时发生了错误，请重试"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "正在退出向导\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeonline 无法连接，请稍后再试一次"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "密码错误"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -412,8 +497,83 @@ msgstr ""
 "如果您想要创建账户的话，请返回到第一步，以连接到 Mandrakeonline。\n"
 "请注意，您还必须提供一个机器名(只能由字母组成)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline 欢迎您"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline 欢迎您"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "密码错误"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "国家:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -428,18 +588,49 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help        - 打印本帮助信息。\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto        - 自动调用 Mandrakeupdate。\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet      - 调用 Mandrakeupdate。\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update      - 更新密钥\n"
+
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, fuzzy, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeonline 无法连接，请稍后再试一次"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr ""
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cc9943a0..1a864a86 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-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\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"
@@ -19,237 +19,271 @@ msgstr ""
 "X-Generator: KBabel 1.0.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
 #: ../mdkapplet:67
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
 msgstr "任何問題, 請寄出一封電子郵件至 support@mandrakeonline.net\n"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
 #: ../mdkapplet:79
-#, fuzzy
+#, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "您系統並沒有網路卡存在"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "安裝升級"
 
 #: ../mdkapplet:109
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure the service"
 msgstr "設定系統服務"
 
 #: ../mdkapplet:110
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check Updates"
 msgstr "更新"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #: ../mdkapplet:112
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Network"
 msgstr "設定網路連線"
 
 #: ../mdkapplet:113
-#, fuzzy
+#, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "正在讀取組態設定\n"
 
 #: ../mdkapplet:145
-#, fuzzy
+#, fuzzy, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux 隱私政策"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "動作"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "設定"
 
 #: ../mdkapplet:159
-#, fuzzy
+#, fuzzy, c-format
 msgid "Check updates"
 msgstr "安全更新"
 
 #: ../mdkapplet:160
-#, fuzzy
+#, fuzzy, c-format
 msgid "See logs"
 msgstr "向前 5 秒"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "狀態"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "關閉"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "向下"
-
-#: ../mdkapplet:202
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "虛擬網絡連線"
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "向上"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "向下"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr ""
 
 #: ../mdkapplet:204
-#, fuzzy
+#, fuzzy, c-format
 msgid "Updates: "
 msgstr "更新"
 
 #: ../mdkapplet:208
-#, fuzzy
+#, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "啟動 userdrake"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr ""
 
 #: ../mdkapplet:224
-#, fuzzy
+#, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "連線問題"
 
 #: ../mdkapplet:226
-#, fuzzy
+#, fuzzy, c-format
 msgid "Connecting to"
 msgstr "連線問題"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
-#, fuzzy
+#, fuzzy, c-format
 msgid "Unknown state"
 msgstr "不詳的主機名稱"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "密碼錯誤\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
 #: ../mdkapplet:263
-#, fuzzy
+#, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "系統模式"
 
 #: ../mdkapplet:348
-#, fuzzy
+#, fuzzy, c-format
 msgid "No check"
 msgstr "Gnome Go 象棋"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
 #: ../mdkapplet:364
-#, fuzzy
+#, fuzzy, c-format
 msgid "Checking config file: Not present\n"
 msgstr "遺失設定檔 %s.\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "日誌記錄"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "清除"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "關於..."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr ""
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "結束"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "上一步"
-
-#: ../mdkonline:88
-#, fuzzy
+#: ../mdkonline:90
+#, fuzzy, c-format
 msgid "Skip Wizard"
 msgstr " 跳過精靈 "
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "上一步"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "歡迎來到 Mandrakeonline"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -261,58 +295,68 @@ msgstr ""
 "這個步驟完成後，就能夠提供您相關的安全公告以及套件更新\n"
 "等資訊。\n"
 
-#: ../mdkonline:104
-#, fuzzy
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, fuzzy, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "歡迎來到 Mandrakeonline"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "我還沒有 Mandrakelinux Online 的帳號，我希望要 "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "註冊"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "帳號："
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "    密碼："
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "確認密碼:"
 
-#: ../mdkonline:113
-#, fuzzy
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, fuzzy, c-format
 msgid "Mail contact:"
 msgstr "郵件聯絡:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux 隱私政策"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "認證確認"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "請輸入您在 Mandrakeonline 上的帳號 ID 與密碼"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "機器名稱："
 
-#: ../mdkonline:137
-#, fuzzy
+#: ../mdkonline:139
+#, fuzzy, c-format
 msgid "Send Configuration"
 msgstr "正在讀取組態設定\n"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -348,11 +392,18 @@ msgstr ""
 "當整個步驟都完成後，Mandrakelinux 將回提供一個 username@mandrakeonline.net\n"
 "的使用者帳好提供給您使用。"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "完成"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "已經成功上傳資訊!"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -360,7 +411,8 @@ msgstr ""
 "現在開始，您將會不定期的收到來自於Mandrakeonline\n"
 "發送的安全與更新修正套件公告資訊。"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -368,29 +420,28 @@ msgstr ""
 "Mandrakeonline 提供讓您能夠自動進行更新動作。\n"
 "系統將會定期的執行更新程式檢查最新的更新資訊\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "已經成功上傳資訊!"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "自動升級"
 
-#: ../mdkonline:150
-#, fuzzy
+#: ../mdkonline:151
+#, fuzzy, c-format
 msgid "Country:"
 msgstr "鄉村"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "錯誤"
 
 #: ../mdkonline:184
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please provide a login"
 msgstr "請再試一次"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -399,40 +450,48 @@ msgstr ""
 " 請再試一次\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "不是一個有效郵件地址!\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "正在讀取組態設定\n"
 
 #: ../mdkonline:205
-#, fuzzy
+#, fuzzy, c-format
 msgid "Sending configuration..."
 msgstr "正在讀取組態設定\n"
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "連線問題"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "正在結束設定精靈\n"
 
-#: ../mdkonline:279
-#, fuzzy
+#: ../mdkonline:274
+#, fuzzy, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr "Mandrakeupdate 無法聯絡到網站, 我們將再試."
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "密碼錯誤"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -448,8 +507,83 @@ msgstr ""
 "請回到主畫面程式重新進行操作，以便於能夠連上\n"
 "Mandrakelinux Online 服務。"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr ""
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "歡迎來到 Mandrakeonline"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "歡迎來到 Mandrakeonline"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "密碼錯誤"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "鄉村"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -464,25 +598,53 @@ msgstr ""
 "\n"
 "使用方式:\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 顯示此求助訊息說明.\n"
 
-#: ../mdkupdate:57
-#, fuzzy
+#: ../mdkupdate:56
+#, fuzzy, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --applet       - 更新全部資訊.\n"
 
-#: ../mdkupdate:58
-#, fuzzy
+#: ../mdkupdate:57
+#, fuzzy, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - 更新全部資訊.\n"
 
-#: ../mdkupdate:59
-#, fuzzy
+#: ../mdkupdate:58
+#, fuzzy, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --applet       - 更新全部資訊.\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdate 無法聯絡到網站, 我們將再試."
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "無法由 mdkupdate 媒體更新套件.\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Configuration"
 #~ msgstr "正在讀取組態設定\n"
@@ -491,9 +653,6 @@ msgstr "  --applet       - 更新全部資訊.\n"
 #~ msgid "Checking ..."
 #~ msgstr "連線問題"
 
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "無法由 mdkupdate 媒體更新套件.\n"
-
 #, fuzzy
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "歡迎來到 Mandrakeonline"
@@ -505,9 +664,6 @@ msgstr "  --applet       - 更新全部資訊.\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "我希望使用自動化更新"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdate 無法聯絡到網站, 我們將再試."
-
 #, fuzzy
 #~ msgid "Mandrakelinux Online Team"
 #~ msgstr "歡迎來到 Mandrakeonline"