sync with code

1 files changed, 273 insertions, 376 deletions

diff --git a/po/uz.po b/po/uz.po
index c9edd46c..dbb27d3c 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: 2008-10-28 15:12+0100\n"
+"POT-Creation-Date: 2009-03-30 16:09+0200\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"
@@ -28,7 +28,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:186 ../gurpmi2:210
+#: ../gurpmi:47 ../gurpmi2:187 ../gurpmi2:212
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -86,7 +86,7 @@ msgstr "O'r_natish"
 msgid "_Save"
 msgstr "_Saqlash"
 
-#: ../gurpmi:101 ../gurpmi2:186
+#: ../gurpmi:101 ../gurpmi2:187
 #, c-format
 msgid "_Cancel"
 msgstr "_Bekor qilish"
@@ -118,7 +118,7 @@ msgid "Options:"
 msgstr ""
 
 #: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - shu yordam xabarini ko'rsatish.\n"
@@ -235,37 +235,37 @@ msgstr ""
 msgid "Warning"
 msgstr "Diqqat"
 
-#: ../gurpmi2:146 ../urpmi:612
+#: ../gurpmi2:146 ../urpmi:626
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:182
+#: ../gurpmi2:183
 #, c-format
 msgid " (to upgrade)"
 msgstr " (yangilash)"
 
-#: ../gurpmi2:183
+#: ../gurpmi2:184
 #, c-format
 msgid " (to install)"
 msgstr " (o'rnatish)"
 
-#: ../gurpmi2:186
+#: ../gurpmi2:187
 #, c-format
 msgid "Package choice"
 msgstr "Paket tanlovi"
 
-#: ../gurpmi2:187
+#: ../gurpmi2:188
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Quyidagi paketlardan biri kerak:"
 
-#: ../gurpmi2:211
+#: ../gurpmi2:213
 #, c-format
 msgid "_Abort"
 msgstr "To'_xtatish"
 
-#: ../gurpmi2:234
+#: ../gurpmi2:248
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -276,62 +276,62 @@ msgstr ""
 "%s\n"
 "O'rnatishni davom ettirishni istaysizmi?"
 
-#: ../gurpmi2:253 ../urpmi:579
+#: ../gurpmi2:267 ../urpmi:593
 #, 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:254 ../urpmi:580
+#: ../gurpmi2:268 ../urpmi:594
 #, 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:256
+#: ../gurpmi2:270
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d-ta paket, %d Mb)"
 
-#: ../gurpmi2:264 ../urpm/main_loop.pm:49
+#: ../gurpmi2:278 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:296 ../urpm/install.pm:80
+#: ../gurpmi2:310 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Tayyorlanmoqda..."
 
-#: ../gurpmi2:302
+#: ../gurpmi2:316
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
 
-#: ../gurpmi2:319 ../urpmi:607
+#: ../gurpmi2:333 ../urpmi:621
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Iltimos \"%s\" nomli to'plamni [%s] uskunasiga qo'ying"
 
-#: ../gurpmi2:333
+#: ../gurpmi2:347
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "\"%s\" paketi olinmoqda..."
 
-#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
-#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
-#: ../urpm/media.pm:1442
+#: ../gurpmi2:359 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:236 ../urpm/media.pm:810 ../urpm/media.pm:1271
+#: ../urpm/media.pm:1422
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...olish muvaffaqiyatsiz tugadi: %s"
 
-#: ../gurpmi2:361
+#: ../gurpmi2:375
 #, c-format
 msgid "_Done"
 msgstr "_Tayyor"
 
-#: ../gurpmi2:369 ../urpm/main_loop.pm:120
+#: ../gurpmi2:391
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -342,27 +342,27 @@ msgstr ""
 "%s\n"
 "Balki urpmi ma'lumot bazasini yangilashingiz kerak."
 
-#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
+#: ../gurpmi2:397 ../urpm/main_loop.pm:250 ../urpm/main_loop.pm:290
 #, c-format
 msgid "Installation failed:"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
 
-#: ../gurpmi2:380
+#: ../gurpmi2:402
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Hamma narsa allaqachon o'rnatilgan"
 
-#: ../gurpmi2:382
+#: ../gurpmi2:404
 #, c-format
 msgid "Installation finished"
 msgstr "O'rnatish tugadi"
 
-#: ../gurpmi2:383 ../urpme:169
+#: ../gurpmi2:405 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "%s o'chirilmoqda"
 
-#: ../gurpmi2:391 ../urpmi:674
+#: ../gurpmi2:413 ../urpmi:688
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi qaytadan ishga tushmoqda"
@@ -453,7 +453,7 @@ msgstr "RPM-faylining nomi (%s) noto'g'ri"
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-fayli (%s) olinmoqda..."
 
-#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:234
 #, c-format
 msgid "...retrieving done"
 msgstr "...olish tugadi"
@@ -483,7 +483,7 @@ msgstr ""
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:438
+#: ../urpm.pm:439
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -498,74 +498,74 @@ msgstr ""
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM-faylini (%s) o'qib bo'lmadi\n"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:371
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:372
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Imzo yetishmaydi (%s)"
 
-#: ../urpm/args.pm:390
+#: ../urpm/args.pm:378
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:394
+#: ../urpm/args.pm:382
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:403
+#: ../urpm/args.pm:391
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:460
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot direktoriyasi mavjud emas"
 
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:483
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s amalidan %s amalisiz foydalanib bo'lmaydi"
 
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
+#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
 
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:497
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/bug_report.pm:54 ../urpmi:259
+#: ../urpm/bug_report.pm:55 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "Nusxa ko'chirish muvaffaqiyatsiz tugadi"
 
-#: ../urpm/cdrom.pm:66
+#: ../urpm/cdrom.pm:67
 #, c-format
 msgid ""
 "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
 "automatically)"
 msgstr ""
 
-#: ../urpm/cdrom.pm:68
+#: ../urpm/cdrom.pm:69
 #, c-format
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr ""
 
-#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:162 ../urpm/cdrom.pm:167
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr ""
 
-#: ../urpm/cdrom.pm:205
+#: ../urpm/cdrom.pm:206
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "RPM-faylini (%s) \"%s\" to'plamidan o'qib bo'lmadi"
@@ -585,7 +585,7 @@ msgstr "%s moslama faylini o'qib bo'lmadi"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "\"%s\" to'plami ikki marta aniqlangan, amal bekor qilinadi"
 
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:477
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "moslama faylini (%s) yozib bo'lmadi"
@@ -715,93 +715,93 @@ msgstr ""
 msgid "unable to handle protocol: %s"
 msgstr "noma'lum protokol: %s"
 
-#: ../urpm/get_pkgs.pm:15
+#: ../urpm/get_pkgs.pm:16
 #, c-format
 msgid "cleaning %s and %s"
 msgstr "%s va %s tozalanmoqda"
 
-#: ../urpm/get_pkgs.pm:127
+#: ../urpm/get_pkgs.pm:128
 #, c-format
 msgid "package %s is not found."
 msgstr "%s paketi topilmadi."
 
-#: ../urpm/get_pkgs.pm:213
+#: ../urpm/get_pkgs.pm:227
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "RPM-fayllari \"%s\" to'plamidan olinmoqda..."
 
-#: ../urpm/install.pm:86
+#: ../urpm/install.pm:87
 #, c-format
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:167
+#: ../urpm/install.pm:168
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm/install.pm:170
+#: ../urpm/install.pm:171
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm/install.pm:193
+#: ../urpm/install.pm:196
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "delta-rpm paketidan RPM-faylini ajratib bo'lmadi: %s"
 
-#: ../urpm/install.pm:206
+#: ../urpm/install.pm:209
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s paketini o'rnatib bo'lmadi"
 
-#: ../urpm/install.pm:209
+#: ../urpm/install.pm:212
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "to'plam olib tashlanmoqda: \"%s\""
 
-#: ../urpm/install.pm:210 ../urpm/install.pm:267
+#: ../urpm/install.pm:213 ../urpm/install.pm:277
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...olish muvaffaqiyatsiz tugadi: %s"
 
-#: ../urpm/install.pm:248
+#: ../urpm/install.pm:258
 #, c-format
 msgid "Removing package %s"
 msgstr "%s paketi olib tashlanmoqda"
 
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:259
 #, c-format
 msgid "removing package %s"
 msgstr "%s paketi olib tashlanmoqda"
 
-#: ../urpm/install.pm:265
+#: ../urpm/install.pm:275
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr ""
 
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:283
 #, c-format
 msgid "More information on package %s"
 msgstr "%s paketi haqida ko'proq ma'lumot"
 
-#: ../urpm/ldap.pm:71
+#: ../urpm/ldap.pm:70
 #, c-format
 msgid "Cannot create ldap cache directory"
 msgstr ""
 
-#: ../urpm/ldap.pm:73
+#: ../urpm/ldap.pm:72
 #, c-format
 msgid "Cannot write cache file for ldap\n"
 msgstr ""
 
-#: ../urpm/ldap.pm:162
+#: ../urpm/ldap.pm:161
 #, c-format
 msgid "No server defined, missing uri or host"
 msgstr ""
 
-#: ../urpm/ldap.pm:163
+#: ../urpm/ldap.pm:162
 #, c-format
 msgid "No base defined"
 msgstr ""
@@ -811,17 +811,17 @@ msgstr ""
 msgid "Cannot connect to ldap uri:"
 msgstr ""
 
-#: ../urpm/lock.pm:62
+#: ../urpm/lock.pm:63
 #, fuzzy, c-format
 msgid "%s database is locked. Waiting..."
 msgstr "%s ma'lumot bazasi qulflangan. Kutilmoqda..."
 
-#: ../urpm/lock.pm:63
+#: ../urpm/lock.pm:64
 #, c-format
 msgid "aborting"
 msgstr "to'xtatilmoqda"
 
-#: ../urpm/lock.pm:65
+#: ../urpm/lock.pm:66
 #, c-format
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
@@ -831,129 +831,144 @@ msgstr ""
 msgid "Retry?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
-#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
-#, c-format
-msgid "Installation failed"
-msgstr "O'rnatish muvaffaqiyatsiz tugadi"
+#: ../urpm/main_loop.pm:119
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s"
+msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
 
-#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
-#, c-format
-msgid "Try to go on anyway?"
+#: ../urpm/main_loop.pm:121
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
 msgstr ""
+"O'rnatish muvaffaqiyatsiz tugadi, ba'zi bir fayllar yetishmaydi:\n"
+"%s\n"
+"Balki urpmi ma'lumot bazasini yangilashingiz kerak."
 
-#: ../urpm/main_loop.pm:130
+#: ../urpm/main_loop.pm:124
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
 
-#: ../urpm/main_loop.pm:148
+#: ../urpm/main_loop.pm:132 ../urpm/main_loop.pm:171 ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:259
+#, c-format
+msgid "Installation failed"
+msgstr "O'rnatish muvaffaqiyatsiz tugadi"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "Try to go on anyway?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:156
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Quyidagi paketning imzosi xato"
 
-#: ../urpm/main_loop.pm:149
+#: ../urpm/main_loop.pm:157
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Quyidagi paketlarning imzolari noto'g'ri"
 
-#: ../urpm/main_loop.pm:150
+#: ../urpm/main_loop.pm:158
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "O'rnatishni davom etishni istaysizmi?"
 
-#: ../urpm/main_loop.pm:167
+#: ../urpm/main_loop.pm:175
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "to'plam olib tashlanmoqda: \"%s\""
 
-#: ../urpm/main_loop.pm:187
+#: ../urpm/main_loop.pm:195
 #, c-format
 msgid "distributing %s"
 msgstr ""
 
-#: ../urpm/main_loop.pm:202
+#: ../urpm/main_loop.pm:210
 #, c-format
 msgid "installing %s from %s"
 msgstr "o'rnatilmoqda: %s, qaerdan: %s"
 
-#: ../urpm/main_loop.pm:204
+#: ../urpm/main_loop.pm:212
 #, c-format
 msgid "installing %s"
 msgstr "%s o'rnatilmoqda"
 
-#: ../urpm/main_loop.pm:242
+#: ../urpm/main_loop.pm:253
 #, fuzzy, c-format
 msgid "Try installation without checking dependencies?"
 msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
 
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:260
 #, fuzzy, c-format
 msgid "Try harder to install (--force)?"
 msgstr "%s'ni o'rnatish uchun"
 
-#: ../urpm/main_loop.pm:288
+#: ../urpm/main_loop.pm:300
 #, c-format
 msgid "Packages are up to date"
 msgstr "Paketlarni yangilash muhtoji yo'q"
 
-#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:311 ../urpm/parallel.pm:299
 #, c-format
 msgid "Installation is possible"
 msgstr "O'rnatish mumkin"
 
-#: ../urpm/md5sum.pm:26
+#: ../urpm/md5sum.pm:27
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "DIQQAT: MD5SUM faylida %s uchun md5sum haqida ma'lumot mavjud emas"
 
-#: ../urpm/media.pm:204
+#: ../urpm/media.pm:194
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:196
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 "\"%s\" uchun ro'yxat fayliga murojaat qilib bo'lmadi, to'plam e'tiborga "
 "olinmaydi"
 
-#: ../urpm/media.pm:213
+#: ../urpm/media.pm:199
 #, fuzzy, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr ""
 "\"%s\" uchun hdlist fayliga murojaat qilib bo'lmadi, to'plam e'tiborga "
 "olinmaydi"
 
-#: ../urpm/media.pm:240
+#: ../urpm/media.pm:225
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr ""
 
-#: ../urpm/media.pm:456
+#: ../urpm/media.pm:441
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
 msgstr ""
 
-#: ../urpm/media.pm:499 ../urpm/media.pm:505
+#: ../urpm/media.pm:479
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "moslama fayli (%s) yozildi"
 
-#: ../urpm/media.pm:548
+#: ../urpm/media.pm:521
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm/media.pm:556
+#: ../urpm/media.pm:529
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm/media.pm:572
+#: ../urpm/media.pm:545
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -962,220 +977,215 @@ msgstr ""
 "--synthesis'dan --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib yoki --parallel bilan birga foydalanib bo'lmaydi"
 
-#: ../urpm/media.pm:666
-#, c-format
-msgid "Search start: %s end: %s"
-msgstr "Qidirish boshi: %s oxiri: %s"
-
-#: ../urpm/media.pm:683
+#: ../urpm/media.pm:663
 #, c-format
 msgid "skipping package %s"
 msgstr "%s paketi tashlab o'tilmoqda"
 
-#: ../urpm/media.pm:699
+#: ../urpm/media.pm:679
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm/media.pm:724
+#: ../urpm/media.pm:704
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "to'plam allaqachon mavjud: \"%s\""
 
-#: ../urpm/media.pm:763
+#: ../urpm/media.pm:743
 #, c-format
 msgid "(ignored by default)"
 msgstr "(andoza bo'yicha e'tiborga olinmadi)"
 
-#: ../urpm/media.pm:769
+#: ../urpm/media.pm:749
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:775
+#: ../urpm/media.pm:755
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "to'plam qo'shilmoqda: %s"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:784
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "chroot direktoriyasi mavjud emas"
 
-#: ../urpm/media.pm:812
+#: ../urpm/media.pm:792
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:828
+#: ../urpm/media.pm:808
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr ""
 
-#: ../urpm/media.pm:831
+#: ../urpm/media.pm:811
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:829
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:900
+#: ../urpm/media.pm:880
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "media.cfg fayli yozib olinmoqda..."
 
-#: ../urpm/media.pm:941
+#: ../urpm/media.pm:921
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:944
+#: ../urpm/media.pm:924
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm/media.pm:964
+#: ../urpm/media.pm:944
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "to'plam olib tashlanmoqda: \"%s\""
 
-#: ../urpm/media.pm:1047
+#: ../urpm/media.pm:1027
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "to'plam uchun urpmi qaytadan moslanmoqda: \"%s\""
 
-#: ../urpm/media.pm:1081
+#: ../urpm/media.pm:1061
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...qaytadan moslash muvaffaqiyatsiz tugadi"
 
-#: ../urpm/media.pm:1087
+#: ../urpm/media.pm:1067
 #, c-format
 msgid "reconfiguration done"
 msgstr "...qaytadan moslash tugadi"
 
-#: ../urpm/media.pm:1103
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1104
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "to'plamni yangilash hojati yo'q: \"%s\""
 
-#: ../urpm/media.pm:1135
+#: ../urpm/media.pm:1115
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "synthesis fayli (%s) tekshirilmoqda"
 
-#: ../urpm/media.pm:1155
+#: ../urpm/media.pm:1135
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "to'plamining synthesis faylini o'qishda muammo ro'y berdi: \"%s\""
 
-#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1148 ../urpm/media.pm:1243
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
+#: ../urpm/media.pm:1150 ../urpm/media.pm:1220 ../urpm/media.pm:1473
 #, c-format
 msgid "...copying failed"
 msgstr "...nusxa ko'chirish muvaffaqiyatsiz tugadi"
 
-#: ../urpm/media.pm:1236
+#: ../urpm/media.pm:1216
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1247
 #, c-format
 msgid "...copying done"
 msgstr "...nusxa ko'chirish bajarildi"
 
-#: ../urpm/media.pm:1269
+#: ../urpm/media.pm:1249
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 "'%s' faylidan nusxa ko'chirish muvaffaqiyatsiz tugadi (uning hajmi juda "
 "kichik)"
 
-#: ../urpm/media.pm:1317
+#: ../urpm/media.pm:1297
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 "olingan hdlist (yoki synthesis) fayli uchun md5sum soni hisoblanmoqda..."
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
+#: ../urpm/media.pm:1299 ../urpm/media.pm:1736
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "%s'dan nusxa ko'chirish muvaffaqiyatsiz tugadi (md5sum noto'g'ri)"
 
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1314
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "hdlist fayli (%s) tekshirilmoqda"
 
-#: ../urpm/media.pm:1344
+#: ../urpm/media.pm:1324
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "%s va %s tozalanmoqda"
 
-#: ../urpm/media.pm:1374
+#: ../urpm/media.pm:1354
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "to'plamning hdlist fayli %s xato: %s"
 
-#: ../urpm/media.pm:1400
+#: ../urpm/media.pm:1380
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "'%s' uchun pubkey fayli tekshirilmoqda..."
 
-#: ../urpm/media.pm:1440
+#: ../urpm/media.pm:1420
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "RPM-faylining nomi (%s) noto'g'ri"
 
-#: ../urpm/media.pm:1443
+#: ../urpm/media.pm:1423
 #, fuzzy, c-format
 msgid "no metadata found for medium \"%s\""
 msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
 
-#: ../urpm/media.pm:1475
+#: ../urpm/media.pm:1455
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "'%s' uchun hdlist (yoki synthesis) fayli yozib olinmoqda..."
 
-#: ../urpm/media.pm:1541
+#: ../urpm/media.pm:1521
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "'%s' uchun pubkey fayli tekshirilmoqda..."
 
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1533
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1557
+#: ../urpm/media.pm:1537
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "'%s' uchun pubkey faylini import qilib bo'lmadi"
 
-#: ../urpm/media.pm:1598
+#: ../urpm/media.pm:1578
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
 
-#: ../urpm/media.pm:1631
+#: ../urpm/media.pm:1611
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "to'plam yangilandi: \"%s\""
 
-#: ../urpm/media.pm:1752
+#: ../urpm/media.pm:1730
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1200,19 +1210,19 @@ msgstr ""
 msgid "getting mirror list from %s"
 msgstr "RPM-fayllari %s'dan o'qilmoqda"
 
-#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
+#: ../urpm/msg.pm:76 ../urpmi:494 ../urpmi:509 ../urpmi:613
 #, c-format
 msgid "Nn"
 msgstr "JjJjNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
-#: ../urpmi.addmedia:141
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:545 ../urpmi:649 ../urpmi:655
+#: ../urpmi.addmedia:132
 #, c-format
 msgid "Yy"
 msgstr "HhHhYy"
 
-#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:135
 #, c-format
 msgid " (y/N) "
 msgstr " (h/Y) "
@@ -1282,42 +1292,47 @@ msgstr "Gb"
 msgid "TB"
 msgstr "Tb"
 
-#: ../urpm/orphans.pm:311
+#: ../urpm/orphans.pm:51
+#, c-format
+msgid "Marking %s as manually installed, it won't be auto-orphaned"
+msgstr ""
+
+#: ../urpm/orphans.pm:362
 #, c-format
 msgid ""
-"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
-"it."
+"The following package is now orphan, if you wish to remove it, you can use "
+"\"urpme --auto-orphans\"."
 msgid_plural ""
-"The following packages are now orphans, use \"urpme --auto-orphans\" to "
-"remove them."
+"The following packages are now orphans, if you wish to remove them, you can "
+"use \"urpme --auto-orphans\"."
 msgstr[0] ""
 
-#: ../urpm/parallel.pm:14
+#: ../urpm/parallel.pm:15
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm/parallel.pm:23
+#: ../urpm/parallel.pm:24
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm/parallel.pm:34
+#: ../urpm/parallel.pm:35
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm/parallel.pm:38
+#: ../urpm/parallel.pm:39
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpm/parallel.pm:93
+#: ../urpm/parallel.pm:94
 #, c-format
 msgid "on node %s"
 msgstr ""
 
-#: ../urpm/parallel.pm:293
+#: ../urpm/parallel.pm:294
 #, fuzzy, c-format
 msgid "Installation failed on node %s"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi"
@@ -1349,88 +1364,88 @@ msgid ""
 "code: %d)"
 msgstr ""
 
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:33
 #, fuzzy, c-format
 msgid "unable to access medium \"%s\"."
 msgstr "to'plamga murojaat qilib bo'lmadi: \"%s\""
 
-#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
+#: ../urpm/removable.pm:73 ../urpm/removable.pm:91
 #, c-format
 msgid "mounting %s"
 msgstr "%s ulanmoqda"
 
-#: ../urpm/removable.pm:103
+#: ../urpm/removable.pm:104
 #, c-format
 msgid "unmounting %s"
 msgstr "%s uzilmoqda"
 
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:31
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
 msgstr ""
 
-#: ../urpm/select.pm:32
+#: ../urpm/select.pm:33
 #, c-format
 msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:170
+#: ../urpm/select.pm:176
 #, c-format
 msgid "No package named %s"
 msgstr "%s nomli paket mavjud emas"
 
-#: ../urpm/select.pm:172 ../urpme:117
+#: ../urpm/select.pm:178 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Quyidagi paketlarda %s bor: %s"
 
-#: ../urpm/select.pm:174
+#: ../urpm/select.pm:180
 #, c-format
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:294
+#: ../urpm/select.pm:298
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "%s paketlarini o'rnatib bo'lmaydi"
 
-#: ../urpm/select.pm:537
+#: ../urpm/select.pm:545
 #, c-format
 msgid "Package %s is already installed"
 msgstr "%s paketi allaqachon o'rnatilgan"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:546
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "%s paketlari allaqachon o'rnatilgan"
 
-#: ../urpm/select.pm:556 ../urpm/select.pm:640
+#: ../urpm/select.pm:564 ../urpm/select.pm:648
 #, c-format
 msgid "due to missing %s"
 msgstr "%s yetishmaganiga ko'ra"
 
-#: ../urpm/select.pm:557
+#: ../urpm/select.pm:565
 #, c-format
 msgid "due to already installed %s"
 msgstr "%s paketi allaqachon o'rnatilganligi uchun"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:638
+#: ../urpm/select.pm:566 ../urpm/select.pm:646
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm/select.pm:564
+#: ../urpm/select.pm:572
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:573
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s'ni qoldirish uchun"
 
-#: ../urpm/select.pm:606
+#: ../urpm/select.pm:614
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1439,7 +1454,7 @@ msgstr ""
 "Boshqa paketlarni yangilash uchun quyidagi paketni olib tashlash kerak:\n"
 "%s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:615
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1448,27 +1463,27 @@ msgstr ""
 "Boshqa paketlarni yangilash uchun quyidagi paketlarni olib tashlash kerak:\n"
 "%s"
 
-#: ../urpm/select.pm:634
+#: ../urpm/select.pm:642
 #, c-format
 msgid "in order to install %s"
 msgstr "%s'ni o'rnatish uchun"
 
-#: ../urpm/select.pm:644
+#: ../urpm/select.pm:652
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm/signature.pm:32
+#: ../urpm/signature.pm:33
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Imzo haqiqiy emas (%s)"
 
-#: ../urpm/signature.pm:63
+#: ../urpm/signature.pm:64
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm/signature.pm:65
+#: ../urpm/signature.pm:66
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Imzo yetishmaydi (%s)"
@@ -1547,7 +1562,7 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
 #: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
@@ -2248,42 +2263,42 @@ msgid ""
 msgstr ""
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:423
+#: ../urpmi:428
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (yangilash)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:425
+#: ../urpmi:430
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (yangilash)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:429
+#: ../urpmi:434
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (o'rnatish)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:431
+#: ../urpmi:436
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (o'rnatish)"
 
-#: ../urpmi:437
+#: ../urpmi:442
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "'%s' bog'liqlikni ta'minlash uchun quyidagi paketlardan bittasi kerak:"
 
-#: ../urpmi:440
+#: ../urpmi:445
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Nimani tanlaysiz? (1-%d) "
 
-#: ../urpmi:482
+#: ../urpmi:487
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2294,7 +2309,7 @@ msgstr ""
 "paketlardan ko'ra eskiroq paketlarga bog'liq:\n"
 "%s"
 
-#: ../urpmi:484
+#: ../urpmi:489
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2305,7 +2320,7 @@ msgstr ""
 "paketlardan ko'ra eskiroq paketlarga bog'liq:\n"
 "%s"
 
-#: ../urpmi:490 ../urpmi:505
+#: ../urpmi:495 ../urpmi:510
 #, c-format
 msgid ""
 "\n"
@@ -2314,12 +2329,12 @@ msgstr ""
 "\n"
 "Bunga qaramasdan davom etishni istaysizmi?"
 
-#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
+#: ../urpmi:496 ../urpmi:511 ../urpmi:614 ../urpmi.addmedia:135
 #, c-format
 msgid " (Y/n) "
 msgstr " (H/y) "
 
-#: ../urpmi:499
+#: ../urpmi:504
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2328,7 +2343,7 @@ msgstr ""
 "Talab qilingan paketni o'rnatib bo'lmaydi:\n"
 "%s"
 
-#: ../urpmi:500
+#: ../urpmi:505
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2337,12 +2352,12 @@ msgstr ""
 "Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
 "%s"
 
-#: ../urpmi:517
+#: ../urpmi:522
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketni (%s) olib tashlash tizimni ishdan chiqaradi"
 
-#: ../urpmi:525
+#: ../urpmi:530
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2353,7 +2368,7 @@ msgstr ""
 "uchun quyidagi paketni olib tashlash kerak:\n"
 "%s\n"
 
-#: ../urpmi:527
+#: ../urpmi:532
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2364,12 +2379,12 @@ msgstr ""
 "uchun quyidagi paketlarni olib tashlash kerak:\n"
 "%s\n"
 
-#: ../urpmi:535
+#: ../urpmi:540
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(sinov usuli, hech narsa olib tashlanmaydi)"
 
-#: ../urpmi:555
+#: ../urpmi:560
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2379,45 +2394,45 @@ msgstr ""
 "Quyidagi bog'liqliklarni o'rnatish uchun siz root bo'lishingiz kerak:\n"
 "%s\n"
 
-#: ../urpmi:566
+#: ../urpmi:571
 #, 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:582
+#: ../urpmi:596
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(sinov usuli, hech narsa o'rnatilmaydi)"
 
-#: ../urpmi:588
+#: ../urpmi:602
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Diskda qo'shimcha %s joy ishlatiladi."
 
-#: ../urpmi:589
+#: ../urpmi:603
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Diskda %s joy bo'shatiladi."
 
-#: ../urpmi:590
+#: ../urpmi:604
 #, fuzzy, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Diskda %s joy bo'shatiladi."
 
-#: ../urpmi:591
+#: ../urpmi:605
 #, 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:612
+#: ../urpmi:626
 #, c-format
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: ../urpmi:620
+#: ../urpmi:634
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Tayyor bo'lganda ENTER tugmasini bosing..."
@@ -2533,77 +2548,70 @@ msgstr ""
 
 #: ../urpmi.addmedia:77
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-
-#: ../urpmi.addmedia:79
-#, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:44
+#: ../urpmi.addmedia:78 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - MD5SUM faylini tekshirishni o'chirish.\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82
+#: ../urpmi.addmedia:80
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - xabarsiz.\n"
 
-#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - ortiqcha xabarlar bilan.\n"
 
-#: ../urpmi.addmedia:104
+#: ../urpmi.addmedia:95
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:115
+#: ../urpmi.addmedia:106
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:111
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:124
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Paketlar to'plamini faqat root qo'shishi mumkin"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:118
 #, c-format
 msgid "creating config file [%s]"
 msgstr "moslama fayli (%s) yaratilmoqda"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:119
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Moslama faylini (%s) yaratib bo'lmadi"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:144
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2612,156 +2620,21 @@ msgstr ""
 "\n"
 "\"%s\" to'plamini qo'shishni istaysizmi?"
 
-#: ../urpmi.addmedia:170
+#: ../urpmi.addmedia:153 ../urpmi.addmedia:176
+#, fuzzy, c-format
+msgid "unable to add medium"
+msgstr "to'plamga murojaat qilib bo'lmadi: \"%s\""
+
+#: ../urpmi.addmedia:161
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "synthesis/hdlist fayliga nisbiy yo'l ko'rsatilmagan\n"
 
-#: ../urpmi.addmedia:173
+#: ../urpmi.addmedia:164
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Masofadagi to'plam uchun %s amalidan foydalanib bo'lmaydi"
 
-#: ../urpmi.addmedia:185
-#, fuzzy, c-format
-msgid "unable to add medium"
-msgstr "to'plamga murojaat qilib bo'lmadi: \"%s\""
-
-#: ../urpmi.recover:28
-#, c-format
-msgid ""
-"urpmi.recover version %s\n"
-"Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi.recover, versiya %s\n"
-"Copyright (C) 2006 Mandriva.\n"
-"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
-"\n"
-"Foydalanish:\n"
-
-#: ../urpmi.recover:34
-#, c-format
-msgid "  --checkpoint   - set repackaging start now\n"
-msgstr ""
-
-#: ../urpmi.recover:35
-#, c-format
-msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
-msgstr ""
-
-#: ../urpmi.recover:37
-#, c-format
-msgid ""
-"  --list         - list transactions since provided date/duration argument\n"
-msgstr ""
-
-#: ../urpmi.recover:38
-#, c-format
-msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr ""
-
-#: ../urpmi.recover:39
-#, c-format
-msgid "  --list-safe    - list transactions since checkpoint\n"
-msgstr ""
-
-#: ../urpmi.recover:40
-#, c-format
-msgid ""
-"  --rollback     - rollback until specified date,\n"
-"                   or rollback the specified number of transactions\n"
-msgstr ""
-
-#: ../urpmi.recover:42
-#, c-format
-msgid "  --disable      - turn off repackaging\n"
-msgstr ""
-
-#: ../urpmi.recover:57
-#, c-format
-msgid "Invalid date or duration [%s]\n"
-msgstr ""
-
-#: ../urpmi.recover:65
-#, c-format
-msgid "Repackage directory not defined\n"
-msgstr ""
-
-#: ../urpmi.recover:68
-#, c-format
-msgid "Can't write to repackage directory [%s]\n"
-msgstr ""
-
-#: ../urpmi.recover:70
-#, c-format
-msgid "Cleaning up repackage directory [%s]...\n"
-msgstr ""
-
-#: ../urpmi.recover:72
-#, c-format
-msgid "%d file removed\n"
-msgid_plural "%d files removed\n"
-msgstr[0] "%d-ta fayl olib tashlandi\n"
-
-#: ../urpmi.recover:82
-#, c-format
-msgid "Spurious command-line arguments [%s]\n"
-msgstr ""
-
-#: ../urpmi.recover:84
-#, c-format
-msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr ""
-
-#: ../urpmi.recover:86
-#, c-format
-msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr ""
-
-#: ../urpmi.recover:88
-#, c-format
-msgid "You can't specify --rollback and --list at the same time\n"
-msgstr ""
-
-#: ../urpmi.recover:90
-#, c-format
-msgid "You can't specify --disable along with another option"
-msgstr ""
-
-#: ../urpmi.recover:115
-#, c-format
-msgid "No transaction found since %s\n"
-msgstr ""
-
-#: ../urpmi.recover:130
-#, c-format
-msgid "You must be superuser to do this"
-msgstr "Bundan foydalanish uchun root bo'lish shart"
-
-#: ../urpmi.recover:143 ../urpmi.recover:209
-#, c-format
-msgid "Writing rpm macros file [%s]...\n"
-msgstr ""
-
-#: ../urpmi.recover:185
-#, c-format
-msgid "No rollback date found\n"
-msgstr ""
-
-#: ../urpmi.recover:188
-#, c-format
-msgid "Rollback until %s...\n"
-msgstr ""
-
-#: ../urpmi.recover:195
-#, c-format
-msgid "Disabling repackaging\n"
-msgstr ""
-
 #: ../urpmi.removemedia:38
 #, c-format
 msgid ""
@@ -2856,14 +2729,14 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "Faqat boshqaruvchi (root ) to'plami yangilashi mumkin"
 
-#: ../urpmi.update:82
+#: ../urpmi.update:86
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "yangilash uchun hech narsa yo'q (to'plamni qo'shish uchun\n"
 "urpmi.addmedia buyrug'idan foydalaning)\n"
 
-#: ../urpmi.update:91
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2872,17 +2745,17 @@ msgstr ""
 "yangilash parametri yetishmayapti\n"
 "(quyidagilardan bittasi: %s)\n"
 
-#: ../urpmi.update:106
+#: ../urpmi.update:98
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:107
+#: ../urpmi.update:99
 #, c-format
 msgid "ignoring media %s"
 msgstr "to'plamga e'tibor berilmaydi: \"%s\""
 
-#: ../urpmi.update:107
+#: ../urpmi.update:99
 #, c-format
 msgid "enabling media %s"
 msgstr ""
@@ -3135,11 +3008,35 @@ msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 
-#: ../urpmq:473
+#: ../urpmq:476
 #, c-format
 msgid "No changelog found\n"
 msgstr "Changelog fayli topilmadi\n"
 
+#~ msgid "Search start: %s end: %s"
+#~ msgstr "Qidirish boshi: %s oxiri: %s"
+
+#~ msgid ""
+#~ "urpmi.recover version %s\n"
+#~ "Copyright (C) 2006 Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmi.recover, versiya %s\n"
+#~ "Copyright (C) 2006 Mandriva.\n"
+#~ "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+#~ "\n"
+#~ "Foydalanish:\n"
+
+#~ msgid "%d file removed\n"
+#~ msgid_plural "%d files removed\n"
+#~ msgstr[0] "%d-ta fayl olib tashlandi\n"
+
+#~ msgid "You must be superuser to do this"
+#~ msgstr "Bundan foydalanish uchun root bo'lish shart"
+
 #~ msgid "Updating media...\n"
 #~ msgstr "To'plam yangilanmoqda...\n"