merge changes from MNF, MDK-10-update

1 files changed, 257 insertions, 264 deletions

diff --git a/po/bs.po b/po/bs.po
index 5250e1ed..61a9509d 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-10-01 22:41+0200\n"
+"POT-Creation-Date: 2004-11-03 12:10+0100\n"
 "PO-Revision-Date: 2004-10-11 16:59+0200\n"
 "Last-Translator: Amila Akagić <bono@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../mdkapplet:61
+#: ../mdkapplet:63
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Vaš sistem je up-to-date"
 
-#: ../mdkapplet:67
+#: ../mdkapplet:69
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -31,187 +31,198 @@ msgstr ""
 "Problem kod podešavanja servisa. Provjerite logove i pošaljite mail za "
 "support@mandrakeonline.net"
 
-#: ../mdkapplet:73
+#: ../mdkapplet:75
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr "Sistem je zauzet. Molim sačekajte..."
 
-#: ../mdkapplet:79
+#: ../mdkapplet:81
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nove ispravke su dostupne za vaš sistem"
 
-#: ../mdkapplet:85
+#: ../mdkapplet:87
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "Servis nije podešen. Kliknite na \"Podesi servis\""
 
-#: ../mdkapplet:91
+#: ../mdkapplet:93
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Mreža ne radi. Podesite vašu mrežu"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:99
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servis nije aktiviran. Kliknite na \"Online web stranica\""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:105
 #, c-format
 msgid "Release not supported (too old release, or development release)"
-msgstr "Izdanje nije podržano (prestaro izdanje ili je riječ o izdanju u razvoju)"
+msgstr ""
+"Izdanje nije podržano (prestaro izdanje ili je riječ o izdanju u razvoju)"
 
-#: ../mdkapplet:108 ../mdkapplet:158
+#: ../mdkapplet:110 ../mdkapplet:164
 #, c-format
 msgid "Install updates"
 msgstr "Instaliraj ispravke"
 
-#: ../mdkapplet:109
+#: ../mdkapplet:111
 #, c-format
 msgid "Configure the service"
 msgstr "Podesi servis"
 
-#: ../mdkapplet:110
+#: ../mdkapplet:112
 #, c-format
 msgid "Check Updates"
 msgstr "Provjeri da li ima ispravki"
 
-#: ../mdkapplet:111
+#: ../mdkapplet:113 ../mdkapplet:167 ../mdkapplet:225
+#, fuzzy, c-format
+msgid "Please Wait"
+msgstr "Molim sačekajte"
+
+#: ../mdkapplet:113 ../mdkapplet:166 ../mdkapplet:167 ../mdkapplet:225
+#, c-format
+msgid "Check updates"
+msgstr "Provjeri ispravke"
+
+#: ../mdkapplet:115
 #, c-format
 msgid "Online WebSite"
 msgstr "Online web stranica"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:116
 #, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:117
 #, c-format
 msgid "Configure Now!"
 msgstr "Podesi odmah!"
 
-#: ../mdkapplet:146
+#: ../mdkapplet:152 ../mdkapplet:229
 #, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux aplet sa ispravkama"
 
-#: ../mdkapplet:156
+#: ../mdkapplet:162
 #, c-format
 msgid "Actions"
 msgstr "Akcije"
 
-#: ../mdkapplet:159
+#: ../mdkapplet:165
 #, c-format
 msgid "Configure"
 msgstr "Podesi"
 
-#: ../mdkapplet:160
-#, c-format
-msgid "Check updates"
-msgstr "Provjeri ispravke"
-
-#: ../mdkapplet:161
+#: ../mdkapplet:169
 #, c-format
 msgid "See logs"
 msgstr "Pogledaj logove"
 
-#: ../mdkapplet:164
+#: ../mdkapplet:172
 #, c-format
 msgid "Status"
 msgstr "Stanje"
 
-#: ../mdkapplet:168 ../mdkapplet:363
+#: ../mdkapplet:176 ../mdkapplet:375
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Network Connection: "
 msgstr "Mrežna konekcija: "
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Up"
 msgstr "Radi"
 
-#: ../mdkapplet:203
+#: ../mdkapplet:211
 #, c-format
 msgid "Down"
 msgstr "Ne radi"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:212
 #, c-format
 msgid "Last check: "
 msgstr "Zadnja provjera: "
 
-#: ../mdkapplet:205
+#: ../mdkapplet:213
 #, c-format
 msgid "Updates: "
 msgstr "Ispravke: "
 
-#: ../mdkapplet:209
+#: ../mdkapplet:217
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokrećem drakconnect\n"
 
-#: ../mdkapplet:213
+#: ../mdkapplet:221
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "Pokrećem mdkupdate --aplet\n"
 
-#: ../mdkapplet:217
+#: ../mdkapplet:224
 #, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Madrakeonline je izgleda ponovo instaliran, pokrećem aplet..."
 
-#: ../mdkapplet:225
+#: ../mdkapplet:235
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Izračunavam nove ispravke...\n"
 
-#: ../mdkapplet:227
+#: ../mdkapplet:237
 #, c-format
 msgid "Connecting to"
 msgstr "Vežem se na"
 
-#: ../mdkapplet:250
+#: ../mdkapplet:244
+#, fuzzy, c-format
+msgid "Response from Mandrakeonline server\n"
+msgstr "Dobro došli na MandrakeOnline"
+
+#: ../mdkapplet:262
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr "Provjeravam... Ispravke su dostupne\n"
 
-#: ../mdkapplet:254
+#: ../mdkapplet:267
 #, c-format
 msgid "Development release not supported by service"
 msgstr "Servis ne podržava razvojno izdanje"
 
-#: ../mdkapplet:255
+#: ../mdkapplet:268
 #, c-format
 msgid "Too old release not supported by service"
 msgstr "Servis ne podržava prestaro izdanje"
 
-#: ../mdkapplet:256
+#: ../mdkapplet:269
 #, c-format
 msgid "Unknown state"
 msgstr "Nepoznato stanje"
 
-#: ../mdkapplet:257
+#: ../mdkapplet:270
 #, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr "Online servisi su isključeni. Kontaktirajte Mandrakeonline stranicu\n"
 
-#: ../mdkapplet:258
+#: ../mdkapplet:271
 #, c-format
 msgid "Wrong Password.\n"
 msgstr "Pogrešna šifra\n"
 
-#: ../mdkapplet:259
+#: ../mdkapplet:272
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "Pogrešna akcija, računar ili korisničko ime.\n"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:273
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
@@ -220,72 +231,82 @@ msgstr ""
 "Nešto nije u redu sa vašim postavkama za mrežu (provjerite postavke za "
 "route, firewall ili proxy)\n"
 
-#: ../mdkapplet:264
+#: ../mdkapplet:277
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je up-to-date\n"
 
-#: ../mdkapplet:303
+#: ../mdkapplet:317
 #, c-format
 msgid "No check"
 msgstr "Bez provjere"
 
-#: ../mdkapplet:316
+#: ../mdkapplet:330
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Provjeravam mrežu: čini se da je isključena\n"
 
-#: ../mdkapplet:319
+#: ../mdkapplet:333
 #, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Provjeravam config datoteku: Ne postoji\n"
 
-#: ../mdkapplet:353
+#: ../mdkapplet:365
 #, c-format
 msgid "Logs"
 msgstr "Logovi"
 
-#: ../mdkapplet:369
+#: ../mdkapplet:381
 #, c-format
 msgid "Clear"
 msgstr "Očisti"
 
-#: ../mdkapplet:396
+#: ../mdkapplet:408
 #, c-format
 msgid "About..."
 msgstr "O programu..."
 
-#: ../mdkapplet:397
+#: ../mdkapplet:409
 #, c-format
 msgid "Always launch on startup"
 msgstr "Uvijek pokreni na početku"
 
-#: ../mdkapplet:399
+#: ../mdkapplet:411
 #, c-format
 msgid "Quit"
 msgstr "Završi"
 
-#: ../mdkonline:89
+#: ../mdkonline:52 ../mdkonline:106
 #, c-format
-msgid "Next"
-msgstr "Dalje"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: ../mdkonline:89
+#: ../mdkonline:55
 #, c-format
-msgid "Cancel"
-msgstr "Odustani"
+msgid "I already have an account"
+msgstr "Već imam račun"
+
+#: ../mdkonline:56
+#, c-format
+msgid "I want to subscribe"
+msgstr "Želim se pretplatiti"
+
+#: ../mdkonline:89 ../mdkonline:93 ../mdkonline:131
+#, c-format
+msgid "Please wait"
+msgstr "Molim sačekajte"
 
 #: ../mdkonline:89
 #, c-format
-msgid "Previous"
-msgstr "Nazad"
+msgid "Reading configuration\n"
+msgstr "Čitam konfiguraciju\n"
 
-#: ../mdkonline:103
+#: ../mdkonline:93
 #, c-format
-msgid "Welcome to Mandrakeonline"
-msgstr "Dobro došli na Mandrakeonline"
+msgid "Sending configuration..."
+msgstr "Šaljem postavke..."
 
-#: ../mdkonline:104 ../mdkonline_tui:98
+#: ../mdkonline:109
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -296,62 +317,37 @@ msgstr ""
 "(pakete, podešavanja hardvera) u centraliziranu bazu podataka kako\n"
 "bi vas mogli informisali o sigurnosnim iskravkama i korisnim nadogradnjama.\n"
 
-#: ../mdkonline:105 ../mdkonline_tui:142
+#: ../mdkonline:114
 #, c-format
-msgid "Create a Mandrakeonline Account"
-msgstr "Napravi račun na Mandrakeonline"
+msgid "Account creation or authentication"
+msgstr "Kreiranje računa ili identifikacija"
 
-#: ../mdkonline:107
+#: ../mdkonline:119
 #, c-format
-msgid "I don't have a Mandrakeonline account and I want to subscribe"
-msgstr "Nemam Mandrakeonline račun i želim se pretplatiti"
+msgid "Enter your Mandrakeonline login, password and machine name:"
+msgstr "Upišite svoje Mandrakeonline korisničko ime, šifru i naziv mašine:"
 
-#: ../mdkonline:111 ../mdkonline:131 ../mdkonline_tui:114 ../mdkonline_tui:145
+#: ../mdkonline:125 ../mdkonline:156
 #, c-format
 msgid "Login:"
 msgstr "Korisničko ime:"
 
-#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:115 ../mdkonline_tui:146
+#: ../mdkonline:126 ../mdkonline:157
 #, c-format
 msgid "Password:"
 msgstr "Šifra:"
 
-#: ../mdkonline:113 ../mdkonline_tui:147
-#, c-format
-msgid "Confirm Password:"
-msgstr "Ponovo šifra:"
-
-#: ../mdkonline:114 ../mdkonline_tui:148
-#, c-format
-msgid "Mail contact:"
-msgstr "Kontakt mail:"
-
-#: ../mdkonline:121
-#, c-format
-msgid "Mandrakelinux Privacy Policy"
-msgstr "Mandrakelinux Privacy Policy"
-
 #: ../mdkonline:127
 #, c-format
-msgid "Authentification"
-msgstr "Identifikacija"
-
-#: ../mdkonline:128 ../mdkonline_tui:108
-#, 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:133 ../mdkonline_tui:116
-#, c-format
 msgid "Machine name:"
 msgstr "Naziv mašine:"
 
-#: ../mdkonline:138
+#: ../mdkonline:131
 #, c-format
-msgid "Send Configuration"
-msgstr "Pošalji postavke"
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Povezujem se sa Mandrakeonline web stranicom..."
 
-#: ../mdkonline:139 ../mdkonline_tui:128
+#: ../mdkonline:139
 #, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
@@ -384,55 +380,55 @@ msgstr ""
 "Furthermore, you benefit from discounted paid support services on\n"
 "www.mandrakeexpert.com."
 
-#: ../mdkonline:144 ../mdkonline:211 ../mdkonline:234
+#: ../mdkonline:141 ../mdkonline:180 ../mdkupdate:126 ../mdkupdate:198
 #, c-format
-msgid "Finish"
-msgstr "Kraj"
+msgid "Connection problem"
+msgstr "Problem sa konekcijom"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid "Your upload was successful!"
-msgstr "Slanje je uspješno!"
+msgid "or"
+msgstr "ili"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
-msgid ""
-"From now you will receive on security and updates \n"
-"announcements thanks to Mandrakeonline."
-msgstr ""
-"Od sada ćete primati obavještenja o sigurnosti i\n"
-"ispravkama zahvaljujući Mandrakeonline."
+msgid "wrong password:"
+msgstr "pogrešna šifra:"
 
-#: ../mdkonline:145 ../mdkonline_tui:167
+#: ../mdkonline:141
 #, c-format
 msgid ""
-"Mandrakeonline offers you the ability to automate the updates.\n"
-"A program will run regulary in your system waiting for new updates\n"
+"Your login or password was wrong.\n"
+" Either you'll have to type it again, or you'll need to create an account on "
+"Mandrakeonline.\n"
+" In the latter case, go back to the first step to connect to "
+"Mandrakeonline.\n"
+" Be aware that you must also provide a Machine name \n"
+" (only alphabetical characters are admitted)"
 msgstr ""
-"Mandrakeonline daje vam priliku da automatizirate ispravke.\n"
-"Program će se pokrenuti na vašem sistemu i čekati nove ispravke\n"
-
-#: ../mdkonline:146
-#, c-format
-msgid "automated Upgrades"
-msgstr "automatizovna nadogradnja"
+"Vaše korisničko ime ili šifra nije ispravna.\n"
+"Ili je ukucajte ponovo ili ponovo kreirajte account na Mandrakeonline.\n"
+"Drugi put se vratite nazad na prvi korak kako bi se konektovali na\n"
+"Mandrakeonline.\n"
+" Upamtite da morate unijeti i naziv mašine \n"
+" (unesite samo alfabetske znakove)"
 
-#: ../mdkonline:150
+#: ../mdkonline:153
 #, c-format
-msgid "Country:"
-msgstr "Država:"
+msgid "Create a Mandrakeonline Account"
+msgstr "Napravi račun na Mandrakeonline"
 
-#: ../mdkonline:178 ../mdkonline:183 ../mdkonline:185 ../mdkonline:187
+#: ../mdkonline:158
 #, c-format
-msgid "Error"
-msgstr "Greška"
+msgid "Confirm Password:"
+msgstr "Ponovo šifra:"
 
-#: ../mdkonline:183 ../mdkonline_tui:152
+#: ../mdkonline:159
 #, c-format
-msgid "Please provide a login"
-msgstr "Unesite korisničko ime"
+msgid "Mail contact:"
+msgstr "Kontakt mail:"
 
-#: ../mdkonline:185 ../mdkonline_tui:152
+#: ../mdkonline:163
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -441,162 +437,116 @@ msgstr ""
 "Šifre se ne poklapaju\n"
 " Molim pokušajte ponovo\n"
 
-#: ../mdkonline:187 ../mdkonline_tui:152
+#: ../mdkonline:163
+#, c-format
+msgid "Please provide a login"
+msgstr "Unesite korisničko ime"
+
+#: ../mdkonline:163
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Neispravna e-mail adresa!\n"
 
-#: ../mdkonline:199 ../mdkonline_tui:78
+#: ../mdkonline:169
 #, c-format
-msgid "Reading configuration\n"
-msgstr "Čitam konfiguraciju\n"
+msgid ""
+"Mandrakeonline Account successfully created.\n"
+"Please click \"Next\" to authenticate and upload your configuration\n"
+msgstr ""
+"Račun za Mandrakeonline je uspješno napravljen.\n"
+"Kliknite na \"Dalje\" za identifikaciju i slanje vaših postavki\n"
 
-#: ../mdkonline:204 ../mdkonline_tui:82
+#: ../mdkonline:178
 #, c-format
-msgid "Sending configuration..."
-msgstr "Šaljem postavke..."
+msgid "Your upload was successful!"
+msgstr "Slanje je uspješno!"
 
-#: ../mdkonline:213 ../mdkonline:273 ../mdkonline_tui:130 ../mdkonline_tui:169
-#: ../mdkupdate:124 ../mdkupdate:195
+#: ../mdkonline:178
 #, c-format
-msgid "Connection problem"
-msgstr "Problem sa konekcijom"
+msgid ""
+"From now you will receive on security and updates \n"
+"announcements thanks to Mandrakeonline."
+msgstr ""
+"Od sada ćete primati obavještenja o sigurnosti i\n"
+"ispravkama zahvaljujući Mandrakeonline."
+
+#: ../mdkonline:178
+#, c-format
+msgid ""
+"Mandrakeonline offers you the ability to automate the updates.\n"
+"A program will run regulary in your system waiting for new updates\n"
+msgstr ""
+"Mandrakeonline daje vam priliku da automatizirate ispravke.\n"
+"Program će se pokrenuti na vašem sistemu i čekati nove ispravke\n"
 
-#: ../mdkonline:213 ../mdkonline_tui:169
+#: ../mdkonline:180
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "Pojavio se problem prilikom slanja datoteka, pokušajte ponovo"
 
-#: ../mdkonline:251
+#: ../mdkonline:186
 #, c-format
-msgid "Quitting Wizard\n"
-msgstr "Izlazim iz čarobnjaka\n"
+msgid "Country"
+msgstr "Država"
 
-#: ../mdkonline:273
+#: ../mdkonline:198
 #, 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"
+msgid "Congratulations"
+msgstr "Čestitam"
 
-#: ../mdkonline:285
+#: ../mdkonline:198
 #, c-format
-msgid "Wrong password"
-msgstr "Pogrešna šifra"
+msgid "Your Mandrakeonline account has been successfully configured\n"
+msgstr "Vaš račun za Mandrakeonline je uspješno podešen\n"
+
+#: ../mdkonline:214
+#, fuzzy, c-format
+msgid "Configuration uploaded successfully"
+msgstr "Slanje je uspješno!"
+
+#: ../mdkonline:215
+#, fuzzy, c-format
+msgid "Problem uploading configuration"
+msgstr "Čitam konfiguraciju\n"
 
-#: ../mdkonline:285 ../mdkonline_tui:130
+#: ../mdkonline:216
 #, c-format
 msgid ""
-"Your login or password was wrong.\n"
-" Either you'll have to type it again, or you'll need to create an account on "
-"Mandrakeonline.\n"
-" In the latter case, go back to the first step to connect to "
-"Mandrakeonline.\n"
-" Be aware that you must also provide a Machine name \n"
-" (only alphabetical characters are admitted)"
+"Cannot connect to mandrakeonline website: wrong login/password or router/"
+"firewall bad settings"
 msgstr ""
-"Vaše korisničko ime ili šifra nije ispravna.\n"
-"Ili je ukucajte ponovo ili ponovo kreirajte account na Mandrakeonline.\n"
-"Drugi put se vratite nazad na prvi korak kako bi se konektovali na\n"
-"Mandrakeonline.\n"
-" Upamtite da morate unijeti i naziv mašine \n"
-" (unesite samo alfabetske znakove)"
 
-#: ../mdkonline.pm:58
+#: ../mdkonline.pm:66
 #, c-format
 msgid "Login and password should be less than 12 characters\n"
 msgstr "Korisničko ime i šifra bi trebali biti dugi manje od 12 karaktera\n"
 
-#: ../mdkonline.pm:59
+#: ../mdkonline.pm:67
 #, c-format
 msgid "Special characters are not allowed\n"
 msgstr "Posebni karakteri nisu dozvoljeni\n"
 
-#: ../mdkonline.pm:60
+#: ../mdkonline.pm:68
 #, c-format
 msgid "Please fill in all fields\n"
 msgstr "Molim unesite sva polja\n"
 
-#: ../mdkonline.pm:61
+#: ../mdkonline.pm:69
 #, c-format
 msgid "Email not valid\n"
 msgstr "Neispravan email\n"
 
-#: ../mdkonline.pm:62
+#: ../mdkonline.pm:70
 #, c-format
 msgid "Account already exist\n"
 msgstr "Račun već postoji\n"
 
-#: ../mdkonline.pm:68
+#: ../mdkonline.pm:76
 #, c-format
 msgid "Problem connecting to server \n"
 msgstr "Problem pri spajanju na server\n"
 
-#: ../mdkonline_tui:45 ../mdkonline_tui:95
-#, c-format
-msgid "Mandrakeonline"
-msgstr "Mandrakeonline"
-
-#: ../mdkonline_tui:48
-#, c-format
-msgid "I already have an account"
-msgstr "Već imam račun"
-
-#: ../mdkonline_tui:49
-#, c-format
-msgid "I want to subscribe"
-msgstr "Želim se pretplatiti"
-
-#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:120
-#, c-format
-msgid "Please wait"
-msgstr "Molim sačekajte"
-
-#: ../mdkonline_tui:103
-#, c-format
-msgid "Account creation or authentication"
-msgstr "Kreiranje računa ili identifikacija"
-
-#: ../mdkonline_tui:120
-#, c-format
-msgid "Connecting to Mandrakeonline website..."
-msgstr "Povezujem se sa Mandrakeonline web stranicom..."
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "or"
-msgstr "ili"
-
-#: ../mdkonline_tui:130
-#, c-format
-msgid "wrong password:"
-msgstr "pogrešna šifra:"
-
-#: ../mdkonline_tui:158
-#, c-format
-msgid ""
-"Mandrakeonline Account successfully created.\n"
-"Please click \"Next\" to authenticate and upload your configuration\n"
-msgstr ""
-"Račun za Mandrakeonline je uspješno napravljen.\n"
-"Kliknite na \"Dalje\" za identifikaciju i slanje vaših postavki\n"
-
-#: ../mdkonline_tui:175
-#, c-format
-msgid "Country"
-msgstr "Država"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Congratulations"
-msgstr "Čestitam"
-
-#: ../mdkonline_tui:187
-#, c-format
-msgid "Your Mandrakeonline account has been successfully configured\n"
-msgstr "Vaš račun za Mandrakeonline je uspješno podešen\n"
-
-#: ../mdkupdate:50
+#: ../mdkupdate:52
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -612,49 +562,97 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../mdkupdate:55
+#: ../mdkupdate:57
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - štampa ovu poruku.\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:58
 #, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto         - Mandrakeupdate se automatski pokreće.\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:59
 #, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - pokreće Mandrakeupdate.\n"
 
-#: ../mdkupdate:58
-#, c-format
-msgid "  --update       - Update keys\n"
-msgstr "  --update       - Update keys\n"
-
-#: ../mdkupdate:66
+#: ../mdkupdate:67
 #, c-format
 msgid "No %s file found. Run mdkonline wizard first"
 msgstr "Datoteka %s nije pronađena. Prvo pokrenite mdkonline čarobnjaka"
 
-#: ../mdkupdate:124
+#: ../mdkupdate:126
 #, c-format
 msgid "Mandrakeupdate could not contact the site, we will try again."
-msgstr "MandrakeOnline nije mogao stupiti u kontakt sa stranicom, pokušat ćemo kasnije."
+msgstr ""
+"MandrakeOnline nije mogao stupiti u kontakt sa stranicom, pokušat ćemo "
+"kasnije."
 
-#: ../mdkupdate:173
+#: ../mdkupdate:176
 #, 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:195
+#: ../mdkupdate:198
 #, c-format
 msgid ""
 "Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
 "mandrakeonline [dot] net"
 msgstr ""
-"Mandrakeupdate nije mogao poslati \"diff\" datoteke. Pošaljite email za support [at] "
-"mandrakeonline [dot] net"
+"Mandrakeupdate nije mogao poslati \"diff\" datoteke. Pošaljite email za "
+"support [at] mandrakeonline [dot] net"
+
+#~ msgid "Next"
+#~ msgstr "Dalje"
+
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
+#~ msgid "Previous"
+#~ msgstr "Nazad"
+
+#~ msgid "Welcome to Mandrakeonline"
+#~ msgstr "Dobro došli na Mandrakeonline"
+
+#~ msgid "I don't have a Mandrakeonline account and I want to subscribe"
+#~ msgstr "Nemam Mandrakeonline račun i želim se pretplatiti"
+
+#~ msgid "Mandrakelinux Privacy Policy"
+#~ msgstr "Mandrakelinux Privacy Policy"
+
+#~ msgid "Authentification"
+#~ msgstr "Identifikacija"
+
+#~ msgid "Send Configuration"
+#~ msgstr "Pošalji postavke"
+
+#~ msgid "Finish"
+#~ msgstr "Kraj"
+
+#~ msgid "automated Upgrades"
+#~ msgstr "automatizovna nadogradnja"
+
+#~ msgid "Country:"
+#~ msgstr "Država:"
+
+#~ msgid "Error"
+#~ msgstr "Greška"
+
+#~ msgid "Quitting Wizard\n"
+#~ msgstr "Izlazim iz čarobnjaka\n"
+
+#~ 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"
+
+#~ msgid "Wrong password"
+#~ msgstr "Pogrešna šifra"
+
+#~ msgid "  --update       - Update keys\n"
+#~ msgstr "  --update       - Update keys\n"
 
 #~ msgid "Skip Wizard"
 #~ msgstr "Preskoči Čarobnjaka"
@@ -670,10 +668,6 @@ msgstr ""
 #~ msgstr "E-mail"
 
 #, fuzzy
-#~ msgid "Response from MandrakeOnline server\n"
-#~ msgstr "Dobro došli na MandrakeOnline"
-
-#, fuzzy
 #~ msgid "Launching MandrakeUpdate\n"
 #~ msgstr "  --applet       - update-ira sve informacije.\n"
 
@@ -756,4 +750,3 @@ msgstr ""
 
 #~ msgid "Really abort? - MandrakeOnline"
 #~ msgstr "Zaista prekini? - MandrakeOnline"
-