sync with code

1 files changed, 129 insertions, 223 deletions

diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 1920dfb3..be6a13b1 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-21 18:21+0100\n"
+"POT-Creation-Date: 2008-08-07 20:21+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"
@@ -18,60 +18,70 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:88
+#: ../mdkapplet:83
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Янгиланишларни текшириш"
 
-#: ../mdkapplet:97
+#: ../mdkapplet:92
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:103
+#: ../mdkapplet:98
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrivaonline.com"
 msgstr ""
 
-#: ../mdkapplet:110
+#: ../mdkapplet:105
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Мавжуд бўлган пакетлар қидирилмоқда, илтимос кутиб туринг..."
 
-#: ../mdkapplet:116
+#: ../mdkapplet:111
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:122
+#: ../mdkapplet:117
+#, c-format
+msgid "A new stable distribution has been released"
+msgstr ""
+
+#: ../mdkapplet:117
+#, c-format
+msgid "Do you want to upgrade?"
+msgstr ""
+
+#: ../mdkapplet:123
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:128
+#: ../mdkapplet:129
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:134 ../mdkapplet:165
+#: ../mdkapplet:135 ../mdkapplet:166
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi маълумот базаси қулфланган"
 
-#: ../mdkapplet:140
+#: ../mdkapplet:141
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mdkapplet:147
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:152
+#: ../mdkapplet:153
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -82,255 +92,133 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:157
+#: ../mdkapplet:158
 #, c-format
 msgid "Enabled"
 msgstr "Ёқилган"
 
-#: ../mdkapplet:170
+#: ../mdkapplet:171
 #, fuzzy, c-format
 msgid "Error updating media"
 msgstr "Тўплам янгиланмоқда...\n"
 
-#: ../mdkapplet:185
+#: ../mdkapplet:186
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:190
+#: ../mdkapplet:191
 #, c-format
 msgid "Packages are up to date"
 msgstr "Пакетларни янгилаш муҳтожи йўқ"
 
-#: ../mdkapplet:195
+#: ../mdkapplet:196
 #, fuzzy, c-format
 msgid "Failed to open urpmi database"
 msgstr "rpmdb'ни очиб бўлмади"
 
-#: ../mdkapplet:200
+#: ../mdkapplet:201 ../mdkapplet:556
 #, c-format
 msgid "Install updates"
 msgstr "Янгиланишларни ўрнатиш"
 
-#: ../mdkapplet:201
+#: ../mdkapplet:202
 #, c-format
 msgid "Check Updates"
 msgstr "Янгиланишларни текшириш"
 
-#: ../mdkapplet:202
+#: ../mdkapplet:203
 #, c-format
 msgid "Configure Network"
 msgstr "Тармоқни мослаш"
 
-#: ../mdkapplet:283
+#: ../mdkapplet:327
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:286
+#: ../mdkapplet:330
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:294
+#: ../mdkapplet:379
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:303
-#, c-format
-msgid "Mandriva Linux Updates Applet"
-msgstr ""
-
-#: ../mdkapplet:308
+#: ../mdkapplet:400
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:309
+#: ../mdkapplet:401
 #, c-format
 msgid "Connecting to"
 msgstr "Алоқа ўрнатилмоқда"
 
-#: ../mdkapplet:386
+#: ../mdkapplet:484
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:415
+#: ../mdkapplet:512
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:457 ../mdkupdate:118 ../mdkupdate:164
+#: ../mdkapplet:554
 #, c-format
 msgid "Warning"
 msgstr "Диққат"
 
-#: ../mdkapplet:468
+#: ../mdkapplet:557
+#, c-format
+msgid "Upgrade the system"
+msgstr ""
+
+#: ../mdkapplet:568
 #, c-format
 msgid "About..."
 msgstr "Ҳақида"
 
-#: ../mdkapplet:472
+#: ../mdkapplet:572
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:473
+#: ../mdkapplet:573
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../mdkapplet:476
+#: ../mdkapplet:576
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:478
+#: ../mdkapplet:578
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:483
+#: ../mdkapplet:583
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:492
+#: ../mdkapplet:592
 #, c-format
 msgid "Always launch on startup"
 msgstr "Тизимга кирганда ишга тушириш"
 
-#: ../mdkapplet:494
+#: ../mdkapplet:594
 #, c-format
 msgid "Quit"
 msgstr "Чиқиш"
 
-#: ../mdkonline.pm:207
-#, fuzzy, c-format
-msgid "Security error"
-msgstr "Хавфсизлик хабарномаси:"
-
-#: ../mdkonline.pm:207
-#, c-format
-msgid "Generic error (machine already registered)"
-msgstr ""
-
-#: ../mdkonline.pm:208
-#, fuzzy, c-format
-msgid "Database error"
-msgstr "Маълумот базанинг хатоси"
-
-#: ../mdkonline.pm:208
-#, c-format
-msgid ""
-"Server Database failed\n"
-"Please Try again Later"
-msgstr ""
-
-#: ../mdkonline.pm:209
-#, fuzzy, c-format
-msgid "Registration error"
-msgstr "Рўйхатдан ўтишнинг тури"
-
-#: ../mdkonline.pm:209
-#, fuzzy, c-format
-msgid "Some parameters are missing"
-msgstr "Масофадаги принтернинг номи аниқланмаган!"
-
-#: ../mdkonline.pm:210 ../mdkonline.pm:216
-#, fuzzy, c-format
-msgid "Password error"
-msgstr "Фойдаланувчи %s учун махфий сўз"
-
-#: ../mdkonline.pm:210
-#, c-format
-msgid "Wrong password"
-msgstr "Махфий сўз нотўғри"
-
-#: ../mdkonline.pm:211 ../mdkonline.pm:212 ../mdkonline.pm:213
-#, fuzzy, c-format
-msgid "Login error"
-msgstr "номаълум хато"
-
-#: ../mdkonline.pm:211
-#, fuzzy, c-format
-msgid ""
-"The email you provided is already in use\n"
-"Please enter another one\n"
-msgstr ""
-"\"%s\" тахаллуси аллақачон банд ёки ҳақиқий эмас\n"
-"Бошқасини киритинг\n"
-
-#: ../mdkonline.pm:212
-#, c-format
-msgid "The email you provided is invalid or forbidden"
-msgstr ""
-
-#: ../mdkonline.pm:213
-#, fuzzy, c-format
-msgid ""
-"Email address box is empty\n"
-"Please provide one"
-msgstr "Фойдаланувчи майдони бўш. Илтимос фойдаланувчини киритинг."
-
-#: ../mdkonline.pm:214
-#, fuzzy, c-format
-msgid "Restriction Error"
-msgstr "Таърифи: "
-
-#: ../mdkonline.pm:214
-#, fuzzy, c-format
-msgid "Database access forbidden"
-msgstr "Маълумот база сервери"
-
-#: ../mdkonline.pm:215 ../mdkonline.pm:217
-#, fuzzy, c-format
-msgid "Service error"
-msgstr "Ёзишда хато\n"
-
-#: ../mdkonline.pm:215
-#, c-format
-msgid ""
-"Mandriva web services are currently unavailable\n"
-"Please Try again Later"
-msgstr ""
-
-#: ../mdkonline.pm:216
-#, fuzzy, c-format
-msgid "Password mismatch"
-msgstr "Махфий сўз мос келмади"
-
-#: ../mdkonline.pm:217
-#, c-format
-msgid ""
-"Mandriva web services are under maintenance\n"
-"Please Try again Later"
-msgstr ""
-
-#: ../mdkonline.pm:218
-#, fuzzy, c-format
-msgid "User Forbidden"
-msgstr "Фойдаланувчи менюси"
-
-#: ../mdkonline.pm:218
-#, c-format
-msgid "User account forbidden by Mandriva web services"
-msgstr ""
-
-#: ../mdkonline.pm:219
-#, fuzzy, c-format
-msgid "Connection error"
-msgstr "Уланишнинг номи"
-
-#: ../mdkonline.pm:219
-#, c-format
-msgid "Mandriva web services not reachable"
-msgstr ""
-
-#: ../mdkupdate:68
+#: ../mdkupdate:62
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -346,97 +234,115 @@ msgstr ""
 "\n"
 "Фойдаланиш:\n"
 
-#: ../mdkupdate:73
+#: ../mdkupdate:67
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- шу ёрдам хабарини кўрсатиш.\n"
 
-#: ../mdkupdate:74
+#: ../mdkupdate:68
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
 msgstr "  --applet\t\t- Mandriva Update хизматини ишга тушириш.\n"
 
-#: ../mdkupdate:75
+#: ../mdkupdate:69
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:76
+#: ../mdkupdate:70
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
 msgstr "  --applet       - Mandriva Update хизматини ишга тушириш.\n"
 
-#: ../mdkupdate:77
+#: ../mdkupdate:71
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:78
+#: ../mdkupdate:102
 #, c-format
-msgid ""
-"  --bundle file.bundle\t- parse and install package from .bundle metainfo "
-"file.\n"
+msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
-#. -PO: here Live Install is currently *NOT* translated on the desktop, so it's better to keep as it:
-#: ../mdkupdate:120
-#, c-format
-msgid ""
-"You first need to install the system on your harddrive with the 'Live "
-"Install' wizard."
-msgstr ""
+#, fuzzy
+#~ msgid "Security error"
+#~ msgstr "Хавфсизлик хабарномаси:"
 
-#: ../mdkupdate:123 ../mdkupdate:174 ../mdkupdate:219
-#, c-format
-msgid "Please wait"
-msgstr "Илтимос кутиб туринг"
+#, fuzzy
+#~ msgid "Database error"
+#~ msgstr "Маълумот базанинг хатоси"
 
-#: ../mdkupdate:123 ../mdkupdate:174
-#, c-format
-msgid "Preparing..."
-msgstr "Тайёрланмоқда..."
+#, fuzzy
+#~ msgid "Registration error"
+#~ msgstr "Рўйхатдан ўтишнинг тури"
 
-#: ../mdkupdate:141 ../mdkupdate:159 ../mdkupdate:188 ../mdkupdate:207
-#, c-format
-msgid "Error"
-msgstr "Хато"
+#, fuzzy
+#~ msgid "Some parameters are missing"
+#~ msgstr "Масофадаги принтернинг номи аниқланмаган!"
 
-#: ../mdkupdate:141
-#, c-format
-msgid ""
-"Failed to authenticate to the bundle server:\n"
-"\n"
-"%s"
-msgstr ""
+#, fuzzy
+#~ msgid "Password error"
+#~ msgstr "Фойдаланувчи %s учун махфий сўз"
 
-#: ../mdkupdate:159 ../mdkupdate:188
-#, c-format
-msgid "An error occurred"
-msgstr "Хато рўй берди"
+#~ msgid "Wrong password"
+#~ msgstr "Махфий сўз нотўғри"
 
-#: ../mdkupdate:164
-#, c-format
-msgid ""
-"The version of the Mandriva Online client is too old.\n"
-"\n"
-"You need to update to a newer version. You can get a new one from http://"
-"start.mandriva.com"
-msgstr ""
+#, fuzzy
+#~ msgid "Login error"
+#~ msgstr "номаълум хато"
 
-#: ../mdkupdate:207
-#, c-format
-msgid "This bundle is not well formated. Aborting."
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "The email you provided is already in use\n"
+#~ "Please enter another one\n"
+#~ msgstr ""
+#~ "\"%s\" тахаллуси аллақачон банд ёки ҳақиқий эмас\n"
+#~ "Бошқасини киритинг\n"
 
-#: ../mdkupdate:219
-#, c-format
-msgid "Installing packages ...\n"
-msgstr "Пакетлар ўрнатилмоқда...\n"
+#, fuzzy
+#~ msgid ""
+#~ "Email address box is empty\n"
+#~ "Please provide one"
+#~ msgstr "Фойдаланувчи майдони бўш. Илтимос фойдаланувчини киритинг."
 
-#: ../mdkupdate:231 ../mdkupdate:271
-#, c-format
-msgid "Unable to update packages from update_source medium.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Restriction Error"
+#~ msgstr "Таърифи: "
+
+#, fuzzy
+#~ msgid "Database access forbidden"
+#~ msgstr "Маълумот база сервери"
+
+#, fuzzy
+#~ msgid "Service error"
+#~ msgstr "Ёзишда хато\n"
+
+#, fuzzy
+#~ msgid "Password mismatch"
+#~ msgstr "Махфий сўз мос келмади"
+
+#, fuzzy
+#~ msgid "User Forbidden"
+#~ msgstr "Фойдаланувчи менюси"
+
+#, fuzzy
+#~ msgid "Connection error"
+#~ msgstr "Уланишнинг номи"
+
+#~ msgid "Please wait"
+#~ msgstr "Илтимос кутиб туринг"
+
+#~ msgid "Preparing..."
+#~ msgstr "Тайёрланмоқда..."
+
+#~ msgid "Error"
+#~ msgstr "Хато"
+
+#~ msgid "An error occurred"
+#~ msgstr "Хато рўй берди"
+
+#~ msgid "Installing packages ...\n"
+#~ msgstr "Пакетлар ўрнатилмоқда...\n"
 
 #, fuzzy
 #~ msgid "Configure the service"