sync with code

1 files changed, 338 insertions, 344 deletions

diff --git a/po/uz.po b/po/uz.po
index cbc124c8..7af953c1 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-09-01 01:15+0200\n"
+"POT-Creation-Date: 2012-09-01 19:38+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"
@@ -97,59 +97,37 @@ msgstr "_Bekor qilish"
 msgid "Choose location to save file"
 msgstr "Faylni qaerga saqlash joyini tanlang"
 
-#: ../gurpmi.pm:39 ../urpmi:66
-#, c-format
-msgid ""
-"%s version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"%s, versiya %s\n"
-"%s\n"
-"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
-"\n"
-"Foydalanish:\n"
-
-#: ../gurpmi.pm:44 ../urpme:47 ../urpme:48 ../urpmf:35 ../urpmf:36 ../urpmi:72
-#: ../urpmi:73 ../urpmi.recover:34 ../urpmq:46 ../urpmq:47
-#, c-format
-msgid "Copyright (C) %s by %s"
-msgstr "Copyright (C) %s by %s"
-
-#: ../gurpmi.pm:46
+#: ../gurpmi.pm:41
 #, c-format
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:47 ../urpme:49 ../urpmf:38 ../urpmi:74 ../urpmi.addmedia:55
-#: ../urpmi.recover:35 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../gurpmi.pm:42 ../urpme:42 ../urpmf:30 ../urpmi:67 ../urpmi.addmedia:55
+#: ../urpmi.recover:29 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:41
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - shu yordam xabarini ko'rsatish.\n"
 
-#: ../gurpmi.pm:48 ../urpmi:81
+#: ../gurpmi.pm:43 ../urpmi:74
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
 
-#: ../gurpmi.pm:49 ../urpmi:82 ../urpmq:55
+#: ../gurpmi.pm:44 ../urpmi:75 ../urpmq:48
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - tizimni yangilash uchun paketlarni avto-tanlash.\n"
 
-#: ../gurpmi.pm:50 ../urpme:53 ../urpmi:105 ../urpmq:71
+#: ../gurpmi.pm:45 ../urpme:46 ../urpmi:98 ../urpmq:64
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../gurpmi.pm:51 ../urpmi:136
+#: ../gurpmi.pm:46 ../urpmi:129
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -160,29 +138,29 @@ msgstr ""
 "                   (--no-verify-rpm ushbu amalning teskarisi, andoza "
 "bo'yicha paketning elektron imzosi tekshiriladi).\n"
 
-#: ../gurpmi.pm:53 ../urpmf:44 ../urpmi:75 ../urpmq:50
+#: ../gurpmi.pm:48 ../urpmf:36 ../urpmi:68 ../urpmq:43
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - faqat ko'rsatilgan, vergul bilan ajratilgan, "
 "to'plamlardan foydalanish.\n"
 
-#: ../gurpmi.pm:54 ../urpmi:153
+#: ../gurpmi.pm:49 ../urpmi:146
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../gurpmi.pm:55 ../urpmi:154
+#: ../gurpmi.pm:50 ../urpmi:147
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../gurpmi.pm:56 ../urpmi:112 ../urpmq:74
+#: ../gurpmi.pm:51 ../urpmi:105 ../urpmq:67
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../gurpmi.pm:57 ../urpmi:138
+#: ../gurpmi.pm:52 ../urpmi:131
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
@@ -190,13 +168,13 @@ msgid ""
 msgstr ""
 "  --test         - o'rnatishni to'g'ri bajarish imkoniyatini tekshirish.\n"
 
-#: ../gurpmi.pm:58 ../urpmi:78
+#: ../gurpmi.pm:53 ../urpmi:71
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 
-#: ../gurpmi.pm:101
+#: ../gurpmi.pm:96
 #, c-format
 msgid "No packages specified"
 msgstr "Hech qanday paket ko'rsatilmagan"
@@ -226,7 +204,7 @@ msgstr "Paketni o'rnatish..."
 msgid "Preparing packages installation..."
 msgstr "Oʻrnatishga paketlar tayyorlanmoqda..."
 
-#: ../gurpmi2:113 ../urpmi:512
+#: ../gurpmi2:113 ../urpmi:505
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -292,13 +270,13 @@ msgstr ""
 "%s\n"
 "O'rnatishni davom ettirishni istaysizmi?"
 
-#: ../gurpmi2:277 ../urpmi:612
+#: ../gurpmi2:277 ../urpmi:605
 #, 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:278 ../urpmi:613
+#: ../gurpmi2:278 ../urpmi:606
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -325,7 +303,7 @@ msgstr "Tayyorlanmoqda..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
 
-#: ../gurpmi2:344 ../urpmi:640
+#: ../gurpmi2:344 ../urpmi:633
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Iltimos \"%s\" nomli to'plamni [%s] uskunasiga qo'ying"
@@ -377,12 +355,12 @@ msgstr "Hamma narsa allaqachon o'rnatilgan"
 msgid "Installation finished"
 msgstr "O'rnatish tugadi"
 
-#: ../gurpmi2:419 ../urpme:172
+#: ../gurpmi2:419 ../urpme:165
 #, c-format
 msgid "removing %s"
 msgstr "%s o'chirilmoqda"
 
-#: ../gurpmi2:430 ../urpmi:698
+#: ../gurpmi2:430 ../urpmi:691
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi qaytadan ishga tushmoqda"
@@ -423,7 +401,7 @@ msgstr "                    %s - andoza.\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - RPM-faylining to'liq nomini ko'rsatish (NVRA)\n"
 
-#: ../rurpmi:11 ../urpmi:272
+#: ../rurpmi:11 ../urpmi:265
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
@@ -458,7 +436,7 @@ msgstr "\"%s\" paketi olinmoqda..."
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpm.pm:151 ../urpmf:251 ../urpmq:170
+#: ../urpm.pm:151 ../urpmf:243 ../urpmq:163
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
@@ -558,7 +536,7 @@ msgstr "chroot direktoriyasi mavjud emas"
 msgid "Can't use %s without %s"
 msgstr "%s amalidan %s amalisiz foydalanib bo'lmaydi"
 
-#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:162
+#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:155
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
@@ -568,7 +546,28 @@ msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
 msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/bug_report.pm:67 ../urpmi:262
+#: ../urpm/args.pm:523
+#, c-format
+msgid ""
+"%s version %s\n"
+"%s\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"%s, versiya %s\n"
+"%s\n"
+"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+"\n"
+"Foydalanish:\n"
+
+#: ../urpm/args.pm:529
+#, c-format
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s by %s"
+
+#: ../urpm/bug_report.pm:67 ../urpmi:255
 #, c-format
 msgid "Copying failed"
 msgstr "Nusxa ko'chirish muvaffaqiyatsiz tugadi"
@@ -1261,7 +1260,7 @@ msgstr ""
 msgid "getting mirror list from %s"
 msgstr "RPM-fayllari %s'dan o'qilmoqda"
 
-#: ../urpm/msg.pm:76 ../urpmi:498 ../urpmi:516 ../urpmi:632
+#: ../urpm/msg.pm:76 ../urpmi:491 ../urpmi:509 ../urpmi:625
 #, c-format
 msgid "Nn"
 msgstr "JjJjNn"
@@ -1272,7 +1271,7 @@ msgstr "JjJjNn"
 msgid "Yy"
 msgstr "HhHhYy"
 
-#: ../urpm/msg.pm:107 ../urpme:166 ../urpmi.addmedia:136
+#: ../urpm/msg.pm:107 ../urpme:159 ../urpmi.addmedia:136
 #, c-format
 msgid " (y/N) "
 msgstr " (h/Y) "
@@ -1467,7 +1466,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "%s nomli paket mavjud emas"
 
-#: ../urpm/select.pm:219 ../urpme:120
+#: ../urpm/select.pm:219 ../urpme:113
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Quyidagi paketlarda %s bor: %s"
@@ -1610,119 +1609,103 @@ msgstr "Faylini ochib bo'lmadi"
 msgid "Can't move file %s to %s"
 msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
 
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme, versiya %s\n"
-"%s\n"
-"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
-"\n"
-"Foydalanish:\n"
-
-#: ../urpme:50
+#: ../urpme:43
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpme:51
+#: ../urpme:44
 #, c-format
 msgid "  --auto-orphans - remove orphans\n"
 msgstr ""
 
-#: ../urpme:52
+#: ../urpme:45
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - olib tashlashni to'g'ri bajarish imkoniyatini "
 "tekshirish.\n"
 
-#: ../urpme:54 ../urpmi:111 ../urpmq:73
+#: ../urpme:47 ../urpmi:104 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:55 ../urpmi:145
+#: ../urpme:48 ../urpmi:138
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr ""
 
-#: ../urpme:56
+#: ../urpme:49
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
-#: ../urpme:57 ../urpmf:43 ../urpmi:113 ../urpmi.addmedia:73
-#: ../urpmi.recover:38 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:75
+#: ../urpme:50 ../urpmf:35 ../urpmi:106 ../urpmi.addmedia:73
+#: ../urpmi.recover:32 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:68
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
 
-#: ../urpme:58 ../urpmi:103
+#: ../urpme:51 ../urpmi:96
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr ""
 
-#: ../urpme:59
+#: ../urpme:52
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr ""
 
-#: ../urpme:60
+#: ../urpme:53
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:62 ../urpmi:156 ../urpmq:94
+#: ../urpme:55 ../urpmi:149 ../urpmq:87
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - ortiqcha xabarlar bilan.\n"
 
-#: ../urpme:63
+#: ../urpme:56
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:78
+#: ../urpme:71
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Paketlarni faqat root olib tashlashi mumkin"
 
-#: ../urpme:111
+#: ../urpme:104
 #, c-format
 msgid "unknown packages"
 msgstr "Noma'lum paketlar"
 
-#: ../urpme:111
+#: ../urpme:104
 #, c-format
 msgid "unknown package"
 msgstr "noma'lum paket"
 
-#: ../urpme:126
+#: ../urpme:119
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "paketni (%s) olib tashlash tizimni ishdan chiqaradi"
 
-#: ../urpme:131
+#: ../urpme:124
 #, c-format
 msgid "Nothing to remove"
 msgstr "O'chirish uchun hech narsa yo'q"
 
-#: ../urpme:148
+#: ../urpme:141
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "O'chirish uchun hech narsa yo'q"
 
-#: ../urpme:154
+#: ../urpme:147
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1730,363 +1713,347 @@ msgid_plural ""
 msgstr[0] ""
 "Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi"
 
-#: ../urpme:159
+#: ../urpme:152
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "noma'lum paket"
 
-#: ../urpme:166
+#: ../urpme:159
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%d-ta paketni olib tashlashni istaysizmi?"
 
-#: ../urpme:171
+#: ../urpme:164
 #, c-format
 msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpme:188
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "O'chirish muvaffaqiyatsiz tugadi"
 
-#: ../urpme:190
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "O'chirish muvaffaqiyatsiz tugadi"
 
-#: ../urpmf:29
-#, fuzzy, c-format
-msgid ""
-"urpmf version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage: urpmf [options] pattern-expression\n"
-msgstr ""
-"urpmf, versiya %s\n"
-"%s\n"
-"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
-"\n"
-"Foydalanish: urpmf [parametrlar] qidirish uchun ifoda\n"
-
-#: ../urpmf:39
+#: ../urpmf:31
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:135 ../urpmq:85
+#: ../urpmf:32 ../urpmi:128 ../urpmq:78
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpmf:41 ../urpmi:76 ../urpmq:52
+#: ../urpmf:33 ../urpmi:69 ../urpmq:45
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - ko'rsatilgan, vergul bilan ajratilgan, to'plamlardan "
 "foydalanilmasin.\n"
 
-#: ../urpmf:42
+#: ../urpmf:34
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:45 ../urpmi:79 ../urpmq:53
+#: ../urpmf:37 ../urpmi:72 ../urpmq:46
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:38
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 
-#: ../urpmf:47 ../urpmi:80 ../urpmq:54
+#: ../urpmf:39 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - ko'rsatilgan synthesis faylidan foydalanish.\n"
 
-#: ../urpmf:48
+#: ../urpmf:40
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - bir xil qatorlar ko'rsatilmasin.\n"
 
-#: ../urpmf:49 ../urpmi:77 ../urpmq:49
+#: ../urpmf:41 ../urpmi:70 ../urpmq:42
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - faqat yangilash to'plamidan foydalanish.\n"
 
-#: ../urpmf:50
+#: ../urpmf:42
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
 
-#: ../urpmf:51
+#: ../urpmf:43
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:44
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:45
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:46
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:47
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:56
+#: ../urpmf:48
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:57
+#: ../urpmf:49
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:50
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpmf:51
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:52
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:53
 #, c-format
 msgid "List of tags:\n"
 msgstr "Teglar ro'yxati:\n"
 
-#: ../urpmf:62
+#: ../urpmf:54
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:55
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   masalan: '%%name:%%files'\n"
 
-#: ../urpmf:64
+#: ../urpmf:56
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:57
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr ""
 
-#: ../urpmf:66
+#: ../urpmf:58
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:67
+#: ../urpmf:59
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpmf:60
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpmf:69
+#: ../urpmf:61
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - paket ta'rifi\n"
 
-#: ../urpmf:70
+#: ../urpmf:62
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:71
+#: ../urpmf:63
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpmf:72
+#: ../urpmf:64
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr ""
 
-#: ../urpmf:73
+#: ../urpmf:65
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - paketdagi fayllar ro'yxatini ko'rsatish\n"
 
-#: ../urpmf:74
+#: ../urpmf:66
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - guruh\n"
 
-#: ../urpmf:75
+#: ../urpmf:67
 #, c-format
 msgid "  --license      - license\n"
 msgstr ""
 
-#: ../urpmf:76
+#: ../urpmf:68
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - paketning nomi\n"
 
-#: ../urpmf:77
+#: ../urpmf:69
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpmf:78
+#: ../urpmf:70
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr ""
 
-#: ../urpmf:79
+#: ../urpmf:71
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpmf:80
+#: ../urpmf:72
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 
-#: ../urpmf:81
+#: ../urpmf:73
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr ""
 
-#: ../urpmf:82
+#: ../urpmf:74
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr ""
 
-#: ../urpmf:83
+#: ../urpmf:75
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr ""
 
-#: ../urpmf:84
+#: ../urpmf:76
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr ""
 
-#: ../urpmf:85
+#: ../urpmf:77
 #, c-format
 msgid "  --url          - url\n"
 msgstr ""
 
-#: ../urpmf:86
+#: ../urpmf:78
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr ""
 
-#: ../urpmf:87
+#: ../urpmf:79
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - paket qaysi to'plamda topilganini ko'rsatish\n"
 
-#: ../urpmf:88 ../urpmq:104
+#: ../urpmf:80 ../urpmq:97
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:156
+#: ../urpmf:148
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:201
+#: ../urpmf:193
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:294
+#: ../urpmf:286
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
 
-#: ../urpmf:301
+#: ../urpmf:293
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "to'plam uchun hdlist synthesis fayli yaratildi: \"%s\""
 
-#: ../urpmf:310
+#: ../urpmf:302
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "to'plam uchun ro'yxat fayli yozilmoqda: \"%s\""
 
-#: ../urpmi:83
+#: ../urpmi:76
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:84
+#: ../urpmi:77
 #, c-format
 msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi:85
+#: ../urpmi:78
 #, c-format
 msgid "    --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi:86
+#: ../urpmi:79
 #, c-format
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:59
+#: ../urpmi:80 ../urpmq:52
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
 msgstr ""
 
-#: ../urpmi:88
+#: ../urpmi:81
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:82
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 
-#: ../urpmi:90 ../urpmq:61
+#: ../urpmi:83 ../urpmq:54
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -2094,272 +2061,272 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:89
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:98
+#: ../urpmi:91
 #, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr ""
 
-#: ../urpmi:99
+#: ../urpmi:92
 #, c-format
 msgid "  --buildrequires - install the buildrequires of the packages\n"
 msgstr ""
 
-#: ../urpmi:100
+#: ../urpmi:93
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:94
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - avvalo paketlarni keshdan olib tashlash.\n"
 
-#: ../urpmi:102
+#: ../urpmi:95
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - paketlar keshdan olib tashlanmasin.\n"
 
-#: ../urpmi:104
+#: ../urpmi:97
 #, c-format
 msgid ""
 "  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr ""
 
-#: ../urpmi:106
+#: ../urpmi:99
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:108
+#: ../urpmi:101
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:103
 #, c-format
 msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
 msgstr ""
 
-#: ../urpmi:114
+#: ../urpmi:107
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:116 ../urpmi.addmedia:60 ../urpmi.update:37
+#: ../urpmi:109 ../urpmi.addmedia:60 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr ""
 
-#: ../urpmi:117
+#: ../urpmi:110
 #, c-format
 msgid ""
 "  --download-all - download all needed packages before trying to install "
 "them\n"
 msgstr ""
 
-#: ../urpmi:118
+#: ../urpmi:111
 #, c-format
 msgid ""
 "  --downloader   - program to use to retrieve distant files. \n"
 "                   known programs: %s\n"
 msgstr ""
 
-#: ../urpmi:121
+#: ../urpmi:114
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr ""
 
-#: ../urpmi:122
+#: ../urpmi:115
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:116
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr ""
 
-#: ../urpmi:124
+#: ../urpmi:117
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr ""
 
-#: ../urpmi:125
+#: ../urpmi:118
 #, c-format
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr ""
 
-#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:38
+#: ../urpmi:119 ../urpmi.addmedia:61 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - paketlarni olish tezligini cheklash.\n"
 
-#: ../urpmi:127
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:129 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:122 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:74
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:83
+#: ../urpmi:124 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:126
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:139
+#: ../urpmi:132
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 "  --excludepath  - ko'rsatilgan, vergul bilan ajratilgan, yo'llardan "
 "foydalanilmasin.\n"
 
-#: ../urpmi:140
+#: ../urpmi:133
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - qo'llanma fayllarsiz.\n"
 
-#: ../urpmi:141
+#: ../urpmi:134
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 "  --ignoresize   - o'rnatishdan avval diskda yetarli bo'sh joy borligi "
 "tekshirilmasin.\n"
 
-#: ../urpmi:142
+#: ../urpmi:135
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
 
-#: ../urpmi:143
+#: ../urpmi:136
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr ""
 
-#: ../urpmi:144
+#: ../urpmi:137
 #, fuzzy, c-format
 msgid "  --replacefiles - ignore file conflicts\n"
 msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
 
-#: ../urpmi:146
+#: ../urpmi:139
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr ""
 
-#: ../urpmi:147
+#: ../urpmi:140
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr ""
 
-#: ../urpmi:148
+#: ../urpmi:141
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 
-#: ../urpmi:150
+#: ../urpmi:143
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr ""
 
-#: ../urpmi:151
+#: ../urpmi:144
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:152 ../urpmq:102
+#: ../urpmi:145 ../urpmq:95
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:155
+#: ../urpmi:148
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:157
+#: ../urpmi:150
 #, fuzzy, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
 
-#: ../urpmi:158
+#: ../urpmi:151
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:186
+#: ../urpmi:179
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:193
+#: ../urpmi:186
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:223
+#: ../urpmi:216
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:224
+#: ../urpmi:217
 #, c-format
 msgid "You can't install spec files"
 msgstr ""
 
-#: ../urpmi:231
+#: ../urpmi:224
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr ""
 
-#: ../urpmi:236
+#: ../urpmi:229
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 
-#: ../urpmi:256
+#: ../urpmi:249
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:257
+#: ../urpmi:250
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:278
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2367,42 +2334,42 @@ msgid ""
 msgstr ""
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:432
+#: ../urpmi:425
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (yangilash)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:434
+#: ../urpmi:427
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (yangilash)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:438
+#: ../urpmi:431
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (o'rnatish)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:440
+#: ../urpmi:433
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (o'rnatish)"
 
-#: ../urpmi:446
+#: ../urpmi:439
 #, 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:449
+#: ../urpmi:442
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Nimani tanlaysiz? (1-%d) "
 
-#: ../urpmi:491
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2413,7 +2380,7 @@ msgstr ""
 "paketlardan ko'ra eskiroq paketlarga bog'liq:\n"
 "%s"
 
-#: ../urpmi:493
+#: ../urpmi:486
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2424,7 +2391,7 @@ msgstr ""
 "paketlardan ko'ra eskiroq paketlarga bog'liq:\n"
 "%s"
 
-#: ../urpmi:499 ../urpmi:517
+#: ../urpmi:492 ../urpmi:510
 #, c-format
 msgid ""
 "\n"
@@ -2433,12 +2400,12 @@ msgstr ""
 "\n"
 "Bunga qaramasdan davom etishni istaysizmi?"
 
-#: ../urpmi:500 ../urpmi:518 ../urpmi:633 ../urpmi.addmedia:136
+#: ../urpmi:493 ../urpmi:511 ../urpmi:626 ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
 msgstr " (H/y) "
 
-#: ../urpmi:511
+#: ../urpmi:504
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2447,12 +2414,12 @@ msgstr ""
 "Talab qilingan paketni o'rnatib bo'lmaydi:\n"
 "%s"
 
-#: ../urpmi:532
+#: ../urpmi:525
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketni (%s) olib tashlash tizimni ishdan chiqaradi"
 
-#: ../urpmi:540
+#: ../urpmi:533
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2463,7 +2430,7 @@ msgstr ""
 "uchun quyidagi paketni olib tashlash kerak:\n"
 "%s\n"
 
-#: ../urpmi:542
+#: ../urpmi:535
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2474,12 +2441,12 @@ msgstr ""
 "uchun quyidagi paketlarni olib tashlash kerak:\n"
 "%s\n"
 
-#: ../urpmi:550
+#: ../urpmi:543
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(sinov usuli, hech narsa olib tashlanmaydi)"
 
-#: ../urpmi:569
+#: ../urpmi:562
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2489,45 +2456,45 @@ msgstr ""
 "Quyidagi bog'liqliklarni o'rnatish uchun siz root bo'lishingiz kerak:\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:572
 #, 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:603
+#: ../urpmi:596
 #, c-format
 msgid "WARNING: %s option is in use. Some strange problems may happen"
 msgstr ""
 
-#: ../urpmi:615
+#: ../urpmi:608
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(sinov usuli, hech narsa o'rnatilmaydi)"
 
-#: ../urpmi:621
+#: ../urpmi:614
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Diskda qo'shimcha %s joy ishlatiladi."
 
-#: ../urpmi:622
+#: ../urpmi:615
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Diskda %s joy bo'shatiladi."
 
-#: ../urpmi:623
+#: ../urpmi:616
 #, fuzzy, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Diskda %s joy bo'shatiladi."
 
-#: ../urpmi:624
+#: ../urpmi:617
 #, 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:646
+#: ../urpmi:639
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Tayyor bo'lganda ENTER tugmasini bosing..."
@@ -2567,21 +2534,21 @@ msgstr ""
 "\n"
 "[amallar] quyidagilar\n"
 
-#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:78
+#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:71
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - masofadagi fayllarni olish uchun wget dasturini "
 "ishlatish.\n"
 
-#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:79
+#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:72
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - masofadagi fayllarni olish uchun curl dasturini "
 "ishlatish.\n"
 
-#: ../urpmi.addmedia:58 ../urpmi.update:35 ../urpmq:80
+#: ../urpmi.addmedia:58 ../urpmi.update:35 ../urpmq:73
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr ""
@@ -2731,138 +2698,122 @@ msgstr "synthesis/hdlist fayliga nisbiy yo'l ko'rsatilmagan\n"
 msgid "Can't use %s with remote medium"
 msgstr "Masofadagi to'plam uchun %s amalidan foydalanib bo'lmaydi"
 
-#: ../urpmi.recover:28
-#, fuzzy, c-format
-msgid ""
-"urpmi.recover version %s\n"
-"%s\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"
-"%s\n"
-"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
-"\n"
-"Foydalanish:\n"
-
-#: ../urpmi.recover:36
+#: ../urpmi.recover:30
 #, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr ""
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:31
 #, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - paketlar keshdan olib tashlanmasin.\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:33
 #, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
-#: ../urpmi.recover:40
+#: ../urpmi.recover:34
 #, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr ""
 "  --list-url     - mavjud bo'lgan to'plam va uning URL'ni ko'rsatish.\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:35
 #, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr ""
 
-#: ../urpmi.recover:42
+#: ../urpmi.recover:36
 #, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
 
-#: ../urpmi.recover:44
+#: ../urpmi.recover:38
 #, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --name         - paketning nomi\n"
 
-#: ../urpmi.recover:59
+#: ../urpmi.recover:53
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:61
 #, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "%s paketi topilmadi."
 
-#: ../urpmi.recover:70
+#: ../urpmi.recover:64
 #, fuzzy, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "to'plamni yaratib bo'lmadi: \"%s\"\n"
 
-#: ../urpmi.recover:72
+#: ../urpmi.recover:66
 #, fuzzy, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "to'plamni yaratib bo'lmadi: \"%s\"\n"
 
-#: ../urpmi.recover:74
+#: ../urpmi.recover:68
 #, c-format
 msgid "%d file removed\n"
 msgid_plural "%d files removed\n"
 msgstr[0] "%d-ta fayl olib tashlandi\n"
 
-#: ../urpmi.recover:84
+#: ../urpmi.recover:78
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:86
+#: ../urpmi.recover:80
 #, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:88
+#: ../urpmi.recover:82
 #, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:90
+#: ../urpmi.recover:84
 #, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr ""
 
-#: ../urpmi.recover:92
+#: ../urpmi.recover:86
 #, c-format
 msgid "You can't specify --disable along with another option"
 msgstr ""
 
-#: ../urpmi.recover:117
+#: ../urpmi.recover:111
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr ""
 
-#: ../urpmi.recover:132
+#: ../urpmi.recover:126
 #, c-format
 msgid "You must be superuser to do this"
 msgstr "Bundan foydalanish uchun root bo'lish shart"
 
-#: ../urpmi.recover:145 ../urpmi.recover:211
+#: ../urpmi.recover:139 ../urpmi.recover:205
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "RPM-fayli (%s) olinmoqda..."
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:181
 #, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "Changelog fayli topilmadi\n"
 
-#: ../urpmi.recover:190
+#: ../urpmi.recover:184
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr ""
 
-#: ../urpmi.recover:197
+#: ../urpmi.recover:191
 #, c-format
 msgid "Disabling repackaging\n"
 msgstr ""
@@ -2992,261 +2943,245 @@ msgstr "to'plamga e'tibor berilmaydi: \"%s\""
 msgid "enabling media %s"
 msgstr ""
 
-#: ../urpmq:40
-#, fuzzy, c-format
-msgid ""
-"urpmq version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmq, versiya %s\n"
-"%s\n"
-"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
-"\n"
-"Foydalanish:\n"
-
-#: ../urpmq:51
+#: ../urpmq:44
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr ""
 
-#: ../urpmq:56
+#: ../urpmq:49
 #, c-format
 msgid "  --auto-orphans - list orphans\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:50
 #, c-format
 msgid ""
 "  --not-available\n"
 "                 - list installed packages not available on any media.\n"
 msgstr ""
 
-#: ../urpmq:60
+#: ../urpmq:53
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmq:63
+#: ../urpmq:56
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - mavjud bo'lgan paketlar ro'yxatini ko'rsatish.\n"
 
-#: ../urpmq:64
+#: ../urpmq:57
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - mavjud bo'lgan to'plamlar ro'yxatini ko'rsatish.\n"
 
-#: ../urpmq:65
+#: ../urpmq:58
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url     - mavjud bo'lgan to'plam va uning URL'ni ko'rsatish.\n"
 
-#: ../urpmq:66
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:67
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:68
+#: ../urpmq:61
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:69
+#: ../urpmq:62
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmq:70
+#: ../urpmq:63
 #, fuzzy, c-format
 msgid "  --sources      - print source URLs of selected packages\n"
 msgstr "  --help         - shu yordam xabarini ko'rsatish.\n"
 
-#: ../urpmq:72
+#: ../urpmq:65
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
 
-#: ../urpmq:76
+#: ../urpmq:69
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:79
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:87
+#: ../urpmq:80
 #, fuzzy, c-format
 msgid "  --conflicts    - print conflicts.\n"
 msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
 
-#: ../urpmq:88
+#: ../urpmq:81
 #, fuzzy, c-format
 msgid "  --obsoletes    - print obsoletes.\n"
 msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
 
-#: ../urpmq:89
+#: ../urpmq:82
 #, fuzzy, c-format
 msgid "  --provides     - print provides.\n"
 msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
 
-#: ../urpmq:90
+#: ../urpmq:83
 #, fuzzy, c-format
 msgid "  --requires     - print requires.\n"
 msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
 
-#: ../urpmq:91
+#: ../urpmq:84
 #, fuzzy, c-format
 msgid "  --suggests     - print suggests.\n"
 msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
 
-#: ../urpmq:92
+#: ../urpmq:85
 #, fuzzy, c-format
 msgid "  --sourcerpm    - print sourcerpm.\n"
 msgstr "  --help         - shu yordam xabarini ko'rsatish.\n"
 
-#: ../urpmq:93
+#: ../urpmq:86
 #, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr ""
 
-#: ../urpmq:95
+#: ../urpmq:88
 #, c-format
 msgid ""
 "  --requires-recursive, -d\n"
 "                   - query package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:97
+#: ../urpmq:90
 #, c-format
 msgid "  --whatrequires - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:98
+#: ../urpmq:91
 #, c-format
 msgid ""
 "  --whatrequires-recursive\n"
 "                   - extended reverse search (includes virtual packages).\n"
 msgstr ""
 
-#: ../urpmq:100
+#: ../urpmq:93
 #, c-format
 msgid ""
 "  --whatprovides, -p\n"
 "                   - search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmq:103
+#: ../urpmq:96
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:105
+#: ../urpmq:98
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:106
+#: ../urpmq:99
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:107
+#: ../urpmq:100
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - paketdagi fayllarni ko'rsatish.\n"
 
-#: ../urpmq:108
+#: ../urpmq:101
 #, c-format
 msgid "  -m             - equivalent to -du\n"
 msgstr ""
 
-#: ../urpmq:109
+#: ../urpmq:102
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:110
+#: ../urpmq:103
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmq:111
+#: ../urpmq:104
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:112
+#: ../urpmq:105
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmq:113
+#: ../urpmq:106
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 
-#: ../urpmq:114
+#: ../urpmq:107
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:161
+#: ../urpmq:154
 #, c-format
 msgid "usage: \"urpmq --auto-orphans\" with no argument"
 msgstr ""
 
-#: ../urpmq:214
+#: ../urpmq:207
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes'dan faqat --parallel bilan birga foydalanib bo'ladi"
 
-#: ../urpmq:238
+#: ../urpmq:231
 #, c-format
 msgid "use -l to list files"
 msgstr ""
 
-#: ../urpmq:423
+#: ../urpmq:416
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
 
-#: ../urpmq:424
+#: ../urpmq:417
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr ""
 
-#: ../urpmq:427
+#: ../urpmq:420
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 
-#: ../urpmq:428
+#: ../urpmq:421
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 
-#: ../urpmq:495
+#: ../urpmq:488
 #, c-format
 msgid "No changelog found\n"
 msgstr "Changelog fayli topilmadi\n"
@@ -3260,6 +3195,65 @@ msgid "Graphical front end to install RPM files"
 msgstr "RPM fayllarini oʻrnatish uchun grafik interfeys"
 
 #~ msgid ""
+#~ "urpme version %s\n"
+#~ "%s\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpme, versiya %s\n"
+#~ "%s\n"
+#~ "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+#~ "\n"
+#~ "Foydalanish:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "urpmf version %s\n"
+#~ "%s\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage: urpmf [options] pattern-expression\n"
+#~ msgstr ""
+#~ "urpmf, versiya %s\n"
+#~ "%s\n"
+#~ "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+#~ "\n"
+#~ "Foydalanish: urpmf [parametrlar] qidirish uchun ifoda\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "urpmi.recover version %s\n"
+#~ "%s\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"
+#~ "%s\n"
+#~ "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+#~ "\n"
+#~ "Foydalanish:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "urpmq version %s\n"
+#~ "%s\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmq, versiya %s\n"
+#~ "%s\n"
+#~ "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+#~ "\n"
+#~ "Foydalanish:\n"
+
+#~ msgid ""
 #~ "Installation failed, some files are missing:\n"
 #~ "%s\n"
 #~ "You may want to update your urpmi database"