merge new tool mdkonline_tui

1 files changed, 241 insertions, 63 deletions

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"