sync with code

1 files changed, 87 insertions, 82 deletions

diff --git a/po/uz.po b/po/uz.po
index b3504f4f..095a9cc5 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-13 11:06+0100\n"
+"POT-Creation-Date: 2012-02-27 21:09+0100\n"
 "PO-Revision-Date: 2007-09-13 16:43+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -29,7 +29,7 @@ msgstr "RPM o'rnatish"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Xato: %s fayli topilmadi, amal bekor qilinadi"
 
-#: ../gurpmi:47 ../gurpmi2:187 ../gurpmi2:212
+#: ../gurpmi:47 ../gurpmi2:196 ../gurpmi2:221
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -87,7 +87,7 @@ msgstr "O'r_natish"
 msgid "_Save"
 msgstr "_Saqlash"
 
-#: ../gurpmi:101 ../gurpmi2:187
+#: ../gurpmi:101 ../gurpmi2:196
 #, c-format
 msgid "_Cancel"
 msgstr "_Bekor qilish"
@@ -220,7 +220,16 @@ msgstr "Paketni o'rnatish..."
 msgid "Preparing packages installation..."
 msgstr "Oʻrnatishga paketlar tayyorlanmoqda..."
 
-#: ../gurpmi2:111
+#: ../gurpmi2:112 ../urpmi:509
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
+"Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
+"%s"
+
+#: ../gurpmi2:120
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -231,42 +240,42 @@ msgstr ""
 "%s\n"
 "Bunga qaramasdan o'rnatishni davom ettirishni istaysizmi?"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:155
 #, c-format
 msgid "Warning"
 msgstr "Diqqat"
 
-#: ../gurpmi2:146 ../urpmi:626
+#: ../gurpmi2:155 ../urpmi:632
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:183
+#: ../gurpmi2:192
 #, c-format
 msgid " (to upgrade)"
 msgstr " (yangilash)"
 
-#: ../gurpmi2:184
+#: ../gurpmi2:193
 #, c-format
 msgid " (to install)"
 msgstr " (o'rnatish)"
 
-#: ../gurpmi2:187
+#: ../gurpmi2:196
 #, c-format
 msgid "Package choice"
 msgstr "Paket tanlovi"
 
-#: ../gurpmi2:188
+#: ../gurpmi2:197
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Quyidagi paketlardan biri kerak:"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:222
 #, c-format
 msgid "_Abort"
 msgstr "To'_xtatish"
 
-#: ../gurpmi2:248
+#: ../gurpmi2:257
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -277,62 +286,62 @@ msgstr ""
 "%s\n"
 "O'rnatishni davom ettirishni istaysizmi?"
 
-#: ../gurpmi2:267 ../urpmi:593
+#: ../gurpmi2:276 ../urpmi:599
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paket ham o'rnatiladi:"
 
-#: ../gurpmi2:268 ../urpmi:594
+#: ../gurpmi2:277 ../urpmi:600
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi:"
 
-#: ../gurpmi2:270
+#: ../gurpmi2:279
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d-ta paket, %d Mb)"
 
-#: ../gurpmi2:278 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:310 ../urpm/install.pm:81
+#: ../gurpmi2:319 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Tayyorlanmoqda..."
 
-#: ../gurpmi2:316
+#: ../gurpmi2:325
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
 
-#: ../gurpmi2:334 ../urpmi:621
+#: ../gurpmi2:343 ../urpmi:627
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Iltimos \"%s\" nomli to'plamni [%s] uskunasiga qo'ying"
 
-#: ../gurpmi2:348
+#: ../gurpmi2:357
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "\"%s\" paketi olinmoqda..."
 
-#: ../gurpmi2:360 ../urpm.pm:334 ../urpm/download.pm:831
+#: ../gurpmi2:369 ../urpm.pm:338 ../urpm/download.pm:831
 #: ../urpm/get_pkgs.pm:262 ../urpm/media.pm:981 ../urpm/media.pm:1493
 #: ../urpm/media.pm:1644
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...olish muvaffaqiyatsiz tugadi: %s"
 
-#: ../gurpmi2:376
+#: ../gurpmi2:385
 #, c-format
 msgid "_Done"
 msgstr "_Tayyor"
 
-#: ../gurpmi2:393
+#: ../gurpmi2:402
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -343,27 +352,27 @@ msgstr ""
 "%s\n"
 "Balki urpmi ma'lumot bazasini yangilashingiz kerak."
 
-#: ../gurpmi2:399 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
 #, c-format
 msgid "Installation failed:"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
 
-#: ../gurpmi2:404
+#: ../gurpmi2:413
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Hamma narsa allaqachon o'rnatilgan"
 
-#: ../gurpmi2:406
+#: ../gurpmi2:415
 #, c-format
 msgid "Installation finished"
 msgstr "O'rnatish tugadi"
 
-#: ../gurpmi2:407 ../urpme:169
+#: ../gurpmi2:416 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s o'chirilmoqda"
 
-#: ../gurpmi2:415 ../urpmi:686
+#: ../gurpmi2:427 ../urpmi:695
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi qaytadan ishga tushmoqda"
@@ -414,77 +423,82 @@ msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:106
+#: ../urpm.pm:23
+#, c-format
+msgid "While some packages may have been installed, there were failures.\n"
+msgstr ""
+
+#: ../urpm.pm:110
 #, fuzzy, c-format
 msgid "fail to create directory %s"
 msgstr "to'plamni yaratib bo'lmadi: \"%s\"\n"
 
-#: ../urpm.pm:107
+#: ../urpm.pm:111
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr ""
 
-#: ../urpm.pm:131
+#: ../urpm.pm:135
 #, fuzzy, c-format
 msgid "Can not download packages into %s"
 msgstr "\"%s\" paketi olinmoqda..."
 
-#: ../urpm.pm:146
+#: ../urpm.pm:150
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpm.pm:147 ../urpmf:248 ../urpmq:167
+#: ../urpm.pm:151 ../urpmf:248 ../urpmq:167
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:309
+#: ../urpm.pm:313
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb'ni ochib bo'lmadi"
 
-#: ../urpm.pm:323
+#: ../urpm.pm:327
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "RPM-faylining nomi (%s) noto'g'ri"
 
-#: ../urpm.pm:329
+#: ../urpm.pm:333
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-fayli (%s) olinmoqda..."
 
-#: ../urpm.pm:331 ../urpm/get_pkgs.pm:260
+#: ../urpm.pm:335 ../urpm/get_pkgs.pm:260
 #, c-format
 msgid "...retrieving done"
 msgstr "...olish tugadi"
 
-#: ../urpm.pm:339
+#: ../urpm.pm:343
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "RPM-fayliga (%s) murojaat qilib bo'lmadi"
 
-#: ../urpm.pm:344
+#: ../urpm.pm:348
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr ""
 
-#: ../urpm.pm:352
+#: ../urpm.pm:356
 #, c-format
 msgid "unable to register rpm file"
 msgstr "RPM-faylini ro'yxatdan o'tkazib bo'lmadi"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:358
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:358
+#: ../urpm.pm:362
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:446
+#: ../urpm.pm:450
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -494,52 +508,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:306
+#: ../urpm/args.pm:307
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM-faylini (%s) o'qib bo'lmadi\n"
 
-#: ../urpm/args.pm:381
+#: ../urpm/args.pm:384
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:385
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Imzo yetishmaydi (%s)"
 
-#: ../urpm/args.pm:388
+#: ../urpm/args.pm:391
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:392
+#: ../urpm/args.pm:395
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:401
+#: ../urpm/args.pm:404
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:475
+#: ../urpm/args.pm:478
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot direktoriyasi mavjud emas"
 
-#: ../urpm/args.pm:498
+#: ../urpm/args.pm:501
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s amalidan %s amalisiz foydalanib bo'lmaydi"
 
-#: ../urpm/args.pm:501 ../urpm/args.pm:504 ../urpmq:159
+#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:159
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
 
-#: ../urpm/args.pm:512
+#: ../urpm/args.pm:515
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -1239,7 +1253,7 @@ msgstr ""
 msgid "getting mirror list from %s"
 msgstr "RPM-fayllari %s'dan o'qilmoqda"
 
-#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:510 ../urpmi:613
+#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:619
 #, c-format
 msgid "Nn"
 msgstr "JjJjNn"
@@ -1553,17 +1567,17 @@ msgstr ""
 msgid "You should restart %s for %s"
 msgstr ""
 
-#: ../urpm/sys.pm:331
+#: ../urpm/sys.pm:352
 #, c-format
 msgid "Can't write file"
 msgstr "Faylini saqlab bo'lmadi"
 
-#: ../urpm/sys.pm:331
+#: ../urpm/sys.pm:352
 #, c-format
 msgid "Can't open file"
 msgstr "Faylini ochib bo'lmadi"
 
-#: ../urpm/sys.pm:344
+#: ../urpm/sys.pm:365
 #, fuzzy, c-format
 msgid "Can't move file %s to %s"
 msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
@@ -2382,7 +2396,7 @@ msgstr ""
 "paketlardan ko'ra eskiroq paketlarga bog'liq:\n"
 "%s"
 
-#: ../urpmi:496 ../urpmi:511
+#: ../urpmi:496 ../urpmi:514
 #, c-format
 msgid ""
 "\n"
@@ -2391,12 +2405,12 @@ msgstr ""
 "\n"
 "Bunga qaramasdan davom etishni istaysizmi?"
 
-#: ../urpmi:497 ../urpmi:512 ../urpmi:614 ../urpmi.addmedia:136
+#: ../urpmi:497 ../urpmi:515 ../urpmi:620 ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
 msgstr " (H/y) "
 
-#: ../urpmi:505
+#: ../urpmi:508
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2405,21 +2419,12 @@ msgstr ""
 "Talab qilingan paketni o'rnatib bo'lmaydi:\n"
 "%s"
 
-#: ../urpmi:506
-#, c-format
-msgid ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr ""
-"Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
-"%s"
-
-#: ../urpmi:523
+#: ../urpmi:529
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketni (%s) olib tashlash tizimni ishdan chiqaradi"
 
-#: ../urpmi:531
+#: ../urpmi:537
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2430,7 +2435,7 @@ msgstr ""
 "uchun quyidagi paketni olib tashlash kerak:\n"
 "%s\n"
 
-#: ../urpmi:533
+#: ../urpmi:539
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2441,12 +2446,12 @@ msgstr ""
 "uchun quyidagi paketlarni olib tashlash kerak:\n"
 "%s\n"
 
-#: ../urpmi:541
+#: ../urpmi:547
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(sinov usuli, hech narsa olib tashlanmaydi)"
 
-#: ../urpmi:560
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2456,45 +2461,45 @@ msgstr ""
 "Quyidagi bog'liqliklarni o'rnatish uchun siz root bo'lishingiz kerak:\n"
 "%s\n"
 
-#: ../urpmi:570
+#: ../urpmi:576
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] ""
 "Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi"
 
-#: ../urpmi:596
+#: ../urpmi:602
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(sinov usuli, hech narsa o'rnatilmaydi)"
 
-#: ../urpmi:602
+#: ../urpmi:608
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Diskda qo'shimcha %s joy ishlatiladi."
 
-#: ../urpmi:603
+#: ../urpmi:609
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Diskda %s joy bo'shatiladi."
 
-#: ../urpmi:604
+#: ../urpmi:610
 #, fuzzy, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Diskda %s joy bo'shatiladi."
 
-#: ../urpmi:605
+#: ../urpmi:611
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "%d-ta paketni o'rnatish bilan davom etishni istaysizmi?"
 
-#: ../urpmi:626
+#: ../urpmi:632
 #, c-format
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: ../urpmi:634
+#: ../urpmi:640
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Tayyor bo'lganda ENTER tugmasini bosing..."