merge new tool mdkonline_tui

1 files changed, 240 insertions, 70 deletions

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"