New translations.

2 files changed, 78 insertions, 289 deletions

diff --git a/po/uz.po b/po/uz.po
index 1bfc54c1..3ece0eaf 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -1,4 +1,4 @@
-# translation of urpmi-uz.po to Uzbek
+# translation of uz.po to Uzbek
 # Copyright (C) 2001,2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 #
 # Sherzod Mamatkulov <mamatkulov@yahoo.com>, 2001.
@@ -6,10 +6,10 @@
 # Nurali Abdurahmonov <mavnur@gmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi-uz\n"
+"Project-Id-Version: uz\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-07 14:44+0200\n"
-"PO-Revision-Date: 2007-02-26 22:17+0100\n"
+"PO-Revision-Date: 2007-09-08 17:28+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -175,14 +175,12 @@ msgstr ""
 
 #: ../gurpmi2:217 ../urpmi:602
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package is going to be installed:"
+msgid "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакет ҳам ўрнатилади:"
 
 #: ../gurpmi2:218 ../urpmi:603
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed:"
+msgid "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар ҳам ўрнатилади:"
 
 #: ../gurpmi2:220
@@ -553,8 +551,7 @@ msgstr ""
 #: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
-"\"%s\" учун рўйхат файлига мурожаат қилиб бўлмади, тўплам эътиборга олинмайди"
+msgstr "\"%s\" учун рўйхат файлига мурожаат қилиб бўлмади, тўплам эътиборга олинмайди"
 
 #: ../urpm/get_pkgs.pm:101
 #, c-format
@@ -602,8 +599,7 @@ msgstr ""
 
 #: ../urpm/install.pm:157
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
 #: ../urpm/install.pm:160
@@ -812,8 +808,7 @@ msgstr ""
 #: ../urpm/media.pm:210 ../urpm/media.pm:1429 ../urpm/media.pm:1517
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr ""
-"\"%s\" учун hdlist файлига мурожаат қилиб бўлмади, тўплам эътиборга олинмайди"
+msgstr "\"%s\" учун hdlist файлига мурожаат қилиб бўлмади, тўплам эътиборга олинмайди"
 
 #: ../urpm/media.pm:216
 #, c-format
@@ -1039,8 +1034,7 @@ msgstr ""
 #: ../urpm/media.pm:1166
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr ""
-"тўпламининг hdlist ёки synthesis файлини ўқишда муаммо рўй берди: \"%s\""
+msgstr "тўпламининг hdlist ёки synthesis файлини ўқишда муаммо рўй берди: \"%s\""
 
 #: ../urpm/media.pm:1177 ../urpm/media.pm:1242
 #, c-format
@@ -1065,14 +1059,12 @@ msgstr "...нусха кўчириш бажарилди"
 #: ../urpm/media.pm:1248
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
-"'%s' файлидан нусха кўчириш муваффақиятсиз тугади (унинг ҳажми жуда кичик)"
+msgstr "'%s' файлидан нусха кўчириш муваффақиятсиз тугади (унинг ҳажми жуда кичик)"
 
 #: ../urpm/media.pm:1281
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr ""
-"тўпламнинг олинган hdlist (ёки synthesis) файлининг md5sum'и ҳисобланмоқда"
+msgstr "тўпламнинг олинган hdlist (ёки synthesis) файлининг md5sum'и ҳисобланмоқда"
 
 #: ../urpm/media.pm:1283
 #, c-format
@@ -1197,27 +1189,27 @@ msgstr "Узр, нотўғри танлов. Бошқасини танланг\n
 #: ../urpm/msg.pm:132
 #, c-format
 msgid "B"
-msgstr ""
+msgstr "Б"
 
 #: ../urpm/msg.pm:132
 #, c-format
 msgid "KB"
-msgstr ""
+msgstr "Кб"
 
 #: ../urpm/msg.pm:132
 #, c-format
 msgid "MB"
-msgstr ""
+msgstr "Мб"
 
 #: ../urpm/msg.pm:132
 #, c-format
 msgid "GB"
-msgstr ""
+msgstr "Гб"
 
 #: ../urpm/msg.pm:132 ../urpm/msg.pm:141
 #, c-format
 msgid "TB"
-msgstr ""
+msgstr "Тб"
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1276,8 +1268,7 @@ msgstr ""
 
 #: ../urpm/select.pm:23
 #, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
 #: ../urpm/select.pm:160
@@ -1389,8 +1380,7 @@ msgstr "  --test         - олиб ташлашни тўғри бажариш �
 
 #: ../urpme:48 ../urpmi:107 ../urpmq:64
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+msgid "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
 #: ../urpme:49 ../urpmi:112 ../urpmq:66
@@ -1479,8 +1469,7 @@ msgstr "Қуйидаги пакетларни олиб ташлаш учун т�
 #: ../urpme:127
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
+msgid_plural "To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "Боғлиқликларни таъминлаш учун қуйидаги %d-та пакет олиб ташланади"
 
 #: ../urpme:131
@@ -1534,8 +1523,7 @@ msgstr ""
 
 #: ../urpmf:39
 #, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
 #: ../urpmf:41 ../urpmi:81 ../urpmq:47
@@ -1547,8 +1535,7 @@ msgstr ""
 
 #: ../urpmf:42 ../urpmi:85 ../urpmq:50
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
 #: ../urpmf:43
@@ -1806,8 +1793,7 @@ msgstr ""
 
 #: ../urpmi:84
 #, c-format
-msgid ""
-"  --searchmedia  - use only the given media to search requested packages.\n"
+msgid "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 
 #: ../urpmi:87
@@ -1819,8 +1805,7 @@ msgstr ""
 
 #: ../urpmi:88 ../urpmq:52
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - тизимни янгилаш учун пакетларни авто-танлаш.\n"
 
 #: ../urpmi:89
@@ -1902,8 +1887,7 @@ msgstr "  --update       - фақат янгилаш тўпламидан фой
 
 #: ../urpmi:106
 #, c-format
-msgid ""
-"  --replacepkgs  - force installing packages which are already installed.\n"
+msgid "  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr ""
 
 #: ../urpmi:108
@@ -1935,14 +1919,12 @@ msgstr ""
 #: ../urpmi:119 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - масофадаги файлларни олиш учун wget дастурини ишлатиш.\n"
+msgstr "  --wget         - масофадаги файлларни олиш учун wget дастурини ишлатиш.\n"
 
 #: ../urpmi:120 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
-"  --curl         - масофадаги файлларни олиш учун curl дастурини ишлатиш.\n"
+msgstr "  --curl         - масофадаги файлларни олиш учун curl дастурини ишлатиш.\n"
 
 #: ../urpmi:121 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
 #, c-format
@@ -2286,7 +2268,7 @@ msgstr "(синов усули, ҳеч нарса олиб ташланмайд�
 #: ../urpmi:592
 #, c-format
 msgid "(suggested)"
-msgstr ""
+msgstr "(таклиф қилинган)"
 
 #: ../urpmi:599
 #, c-format
@@ -2305,12 +2287,12 @@ msgstr "(синов усули, ҳеч нарса ўрнатилмайди)"
 #: ../urpmi:614
 #, c-format
 msgid "%s of additional disk space will be used."
-msgstr ""
+msgstr "Дискда қўшимча %s жой ишлатилади."
 
 #: ../urpmi:615
 #, c-format
 msgid "%s of disk space will be freed."
-msgstr ""
+msgstr "Дискда %s жой бўшатилади."
 
 #: ../urpmi:616
 #, c-format
@@ -2526,8 +2508,7 @@ msgstr ""
 
 #: ../urpmi.recover:37
 #, c-format
-msgid ""
-"  --list         - list transactions since provided date/duration argument\n"
+msgid "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
 #: ../urpmi.recover:38
@@ -2704,8 +2685,7 @@ msgstr ""
 
 #: ../urpmi.update:47
 #, c-format
-msgid ""
-"  --probe-rpms   - do not use synthesis/hdlist, use rpm files directly\n"
+msgid "  --probe-rpms   - do not use synthesis/hdlist, use rpm files directly\n"
 msgstr ""
 
 #: ../urpmi.update:48
@@ -2809,8 +2789,7 @@ msgstr ""
 
 #: ../urpmq:61
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
 #: ../urpmq:62
@@ -2820,8 +2799,7 @@ msgstr ""
 
 #: ../urpmq:63
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
 #: ../urpmq:65
@@ -2949,8 +2927,7 @@ msgstr ""
 
 #: ../urpmq:364
 #, c-format
-msgid ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgid "no hdlist for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 
 #: ../urpmq:425
@@ -2958,79 +2935,3 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Changelog файли топилмади\n"
 
-#~ msgid " (%d MB)"
-#~ msgstr " (%d Мб)"
-
-#~ msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-#~ msgstr "%s пакети қўшилмоқда (id=%d, eid=%d, янгилаш=%d, файл=%s)"
-
-#~ msgid ""
-#~ "The following packages have bad signatures:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you want to continue installation ?"
-#~ msgstr ""
-#~ "Қуйидаги пакетларнинг имзолари нотўғри:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Ўрнатишни давом эттиришни истайсизми?"
-
-#~ msgid "You need to be root to use --use-distrib"
-#~ msgstr "--use-distrib амалидан фойдаланиш учун root бўлиш шарт"
-
-#~ msgid "unable to remove package %s"
-#~ msgstr "пакетни (%s) олиб ташлаб бўлмади"
-
-#~ msgid "No filelist found\n"
-#~ msgstr "Файллар рўйхати топилмади\n"
-
-#~ msgid "Proceed with the installation of the %d package? (%d MB)"
-#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-#~ msgstr[0] "%d-та пакетни ўрнатиш билан давом этишни истайсизми? (%d Мб)"
-
-#~ msgid "(%d packages, %d MB)"
-#~ msgstr "(%d-та пакет, %d Мб)"
-
-#~ msgid "medium \"%s\" is not selected"
-#~ msgstr "тўплам танланмаган: \"%s\""
-
-#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Боғлиқликларни таъминлаш учун қуйидаги %d-та пакет ҳам ўрнатилади:\n"
-#~ "%s\n"
-
-#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар ҳам ўрнатилади"
-
-#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-#~ msgstr ""
-#~ "  --probe-synthesis - synthesis файлини топишга ва ундан фойдаланишга "
-#~ "уриниб кўриш.\n"
-
-#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-#~ msgstr ""
-#~ "  --probe-hdlist - hdlist файлини топишга ва ундан фойдаланишга уриниб "
-#~ "кўриш.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "unknown options '%s'\n"
-#~ msgstr ""
-#~ "\n"
-#~ "номаълум параметрлар \"%s\"\n"
-
-#~ msgid "copying source hdlist (or synthesis) of \"%s\"..."
-#~ msgstr "'%s' учун hdlist (ёки synthesis) файлидан нусха кўчирилмоқда..."
-
-#~ msgid "retrieval of source hdlist (or synthesis) failed"
-#~ msgstr "...hdlist (ёки synthesis) файлини ёзиб олиш муваффақиятсиз тугади"
-
-#~ msgid "found %d headers in cache"
-#~ msgstr "кэшда %d сарлавҳа топилди"
-
-#~ msgid "removing %d obsolete headers in cache"
-#~ msgstr "кэшдаги %d эски сарлавҳа ўчирилмоқда"
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index dafed07c..aa51f97e 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -1,4 +1,4 @@
-# translation of urpmi-uz.po to Uzbek
+# translation of uz.po to Uzbek
 # Copyright (C) 2001,2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 #
 # Sherzod Mamatkulov <mamatkulov@yahoo.com>, 2001.
@@ -6,10 +6,10 @@
 # Nurali Abdurahmonov <mavnur@gmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi-uz\n"
+"Project-Id-Version: uz\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-07 14:44+0200\n"
-"PO-Revision-Date: 2007-02-26 22:17+0100\n"
+"PO-Revision-Date: 2007-09-08 17:28+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -175,14 +175,12 @@ msgstr ""
 
 #: ../gurpmi2:217 ../urpmi:602
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package is going to be installed:"
+msgid "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paket ham o'rnatiladi:"
 
 #: ../gurpmi2:218 ../urpmi:603
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed:"
+msgid "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi:"
 
 #: ../gurpmi2:220
@@ -553,9 +551,7 @@ msgstr ""
 #: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
 #, 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"
+msgstr "\"%s\" uchun ro'yxat fayliga murojaat qilib bo'lmadi, to'plam e'tiborga olinmaydi"
 
 #: ../urpm/get_pkgs.pm:101
 #, c-format
@@ -603,8 +599,7 @@ msgstr ""
 
 #: ../urpm/install.pm:157
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
 #: ../urpm/install.pm:160
@@ -813,9 +808,7 @@ msgstr ""
 #: ../urpm/media.pm:210 ../urpm/media.pm:1429 ../urpm/media.pm:1517
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr ""
-"\"%s\" uchun hdlist fayliga murojaat qilib bo'lmadi, to'plam e'tiborga "
-"olinmaydi"
+msgstr "\"%s\" uchun hdlist fayliga murojaat qilib bo'lmadi, to'plam e'tiborga olinmaydi"
 
 #: ../urpm/media.pm:216
 #, c-format
@@ -1041,8 +1034,7 @@ msgstr ""
 #: ../urpm/media.pm:1166
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr ""
-"to'plamining hdlist yoki synthesis faylini o'qishda muammo ro'y berdi: \"%s\""
+msgstr "to'plamining hdlist yoki synthesis faylini o'qishda muammo ro'y berdi: \"%s\""
 
 #: ../urpm/media.pm:1177 ../urpm/media.pm:1242
 #, c-format
@@ -1067,15 +1059,12 @@ msgstr "...nusxa ko'chirish bajarildi"
 #: ../urpm/media.pm:1248
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
-"'%s' faylidan nusxa ko'chirish muvaffaqiyatsiz tugadi (uning hajmi juda "
-"kichik)"
+msgstr "'%s' faylidan nusxa ko'chirish muvaffaqiyatsiz tugadi (uning hajmi juda kichik)"
 
 #: ../urpm/media.pm:1281
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr ""
-"to'plamning olingan hdlist (yoki synthesis) faylining md5sum'i hisoblanmoqda"
+msgstr "to'plamning olingan hdlist (yoki synthesis) faylining md5sum'i hisoblanmoqda"
 
 #: ../urpm/media.pm:1283
 #, c-format
@@ -1085,8 +1074,7 @@ msgstr "%s'dan nusxa ko'chirish muvaffaqiyatsiz tugadi (md5sum noto'g'ri)"
 #: ../urpm/media.pm:1295
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr ""
-"olingan hdlist (yoki synthesis) fayli uchun md5sum soni hisoblanmoqda..."
+msgstr "olingan hdlist (yoki synthesis) fayli uchun md5sum soni hisoblanmoqda..."
 
 #: ../urpm/media.pm:1297
 #, c-format
@@ -1201,27 +1189,27 @@ msgstr "Uzr, noto'g'ri tanlov. Boshqasini tanlang\n"
 #: ../urpm/msg.pm:132
 #, c-format
 msgid "B"
-msgstr ""
+msgstr "B"
 
 #: ../urpm/msg.pm:132
 #, c-format
 msgid "KB"
-msgstr ""
+msgstr "Kb"
 
 #: ../urpm/msg.pm:132
 #, c-format
 msgid "MB"
-msgstr ""
+msgstr "Mb"
 
 #: ../urpm/msg.pm:132
 #, c-format
 msgid "GB"
-msgstr ""
+msgstr "Gb"
 
 #: ../urpm/msg.pm:132 ../urpm/msg.pm:141
 #, c-format
 msgid "TB"
-msgstr ""
+msgstr "Tb"
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1280,8 +1268,7 @@ msgstr ""
 
 #: ../urpm/select.pm:23
 #, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
 #: ../urpm/select.pm:160
@@ -1389,14 +1376,11 @@ msgstr ""
 #: ../urpme:47
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - olib tashlashni to'g'ri bajarish imkoniyatini "
-"tekshirish.\n"
+msgstr "  --test         - olib tashlashni to'g'ri bajarish imkoniyatini tekshirish.\n"
 
 #: ../urpme:48 ../urpmi:107 ../urpmq:64
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+msgid "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
 #: ../urpme:49 ../urpmi:112 ../urpmq:66
@@ -1485,10 +1469,8 @@ msgstr "Quyidagi paketlarni olib tashlash uchun tekshirish bajarilmoqda"
 #: ../urpme:127
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi"
+msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi"
 
 #: ../urpme:131
 #, c-format
@@ -1541,21 +1523,19 @@ msgstr ""
 
 #: ../urpmf:39
 #, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
 #: ../urpmf:41 ../urpmi:81 ../urpmq:47
 #, 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"
+"  --media        - faqat ko'rsatilgan, vergul bilan ajratilgan, to'plamlardan "
+"foydalanish.\n"
 
 #: ../urpmf:42 ../urpmi:85 ../urpmq:50
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
 #: ../urpmf:43
@@ -1813,8 +1793,7 @@ msgstr ""
 
 #: ../urpmi:84
 #, c-format
-msgid ""
-"  --searchmedia  - use only the given media to search requested packages.\n"
+msgid "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 
 #: ../urpmi:87
@@ -1826,8 +1805,7 @@ msgstr ""
 
 #: ../urpmi:88 ../urpmq:52
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - tizimni yangilash uchun paketlarni avto-tanlash.\n"
 
 #: ../urpmi:89
@@ -1909,8 +1887,7 @@ msgstr "  --update       - faqat yangilash to'plamidan foydalanish.\n"
 
 #: ../urpmi:106
 #, c-format
-msgid ""
-"  --replacepkgs  - force installing packages which are already installed.\n"
+msgid "  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr ""
 
 #: ../urpmi:108
@@ -1942,16 +1919,12 @@ msgstr ""
 #: ../urpmi:119 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - masofadagi fayllarni olish uchun wget dasturini "
-"ishlatish.\n"
+msgstr "  --wget         - masofadagi fayllarni olish uchun wget dasturini ishlatish.\n"
 
 #: ../urpmi:120 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
-"  --curl         - masofadagi fayllarni olish uchun curl dasturini "
-"ishlatish.\n"
+msgstr "  --curl         - masofadagi fayllarni olish uchun curl dasturini ishlatish.\n"
 
 #: ../urpmi:121 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
 #, c-format
@@ -2019,18 +1992,16 @@ msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
-"  --verify-rpm   - o'rnatishdan avval paketning elektron imzosini "
-"tekshirish\n"
-"                   (--no-verify-rpm ushbu amalning teskarisi, andoza "
-"bo'yicha paketning elektron imzosi tekshiriladi).\n"
+"  --verify-rpm   - o'rnatishdan avval paketning elektron imzosini tekshirish\n"
+"                   (--no-verify-rpm ushbu amalning teskarisi, andoza bo'yicha "
+"paketning elektron imzosi tekshiriladi).\n"
 
 #: ../urpmi:138
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
-msgstr ""
-"  --test         - o'rnatishni to'g'ri bajarish imkoniyatini tekshirish.\n"
+msgstr "  --test         - o'rnatishni to'g'ri bajarish imkoniyatini tekshirish.\n"
 
 #: ../urpmi:139
 #, c-format
@@ -2297,7 +2268,7 @@ msgstr "(sinov usuli, hech narsa olib tashlanmaydi)"
 #: ../urpmi:592
 #, c-format
 msgid "(suggested)"
-msgstr ""
+msgstr "(taklif qilingan)"
 
 #: ../urpmi:599
 #, c-format
@@ -2316,12 +2287,12 @@ msgstr "(sinov usuli, hech narsa o'rnatilmaydi)"
 #: ../urpmi:614
 #, c-format
 msgid "%s of additional disk space will be used."
-msgstr ""
+msgstr "Diskda qo'shimcha %s joy ishlatiladi."
 
 #: ../urpmi:615
 #, c-format
 msgid "%s of disk space will be freed."
-msgstr ""
+msgstr "Diskda %s joy bo'shatiladi."
 
 #: ../urpmi:616
 #, c-format
@@ -2537,8 +2508,7 @@ msgstr ""
 
 #: ../urpmi.recover:37
 #, c-format
-msgid ""
-"  --list         - list transactions since provided date/duration argument\n"
+msgid "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
 #: ../urpmi.recover:38
@@ -2715,8 +2685,7 @@ msgstr ""
 
 #: ../urpmi.update:47
 #, c-format
-msgid ""
-"  --probe-rpms   - do not use synthesis/hdlist, use rpm files directly\n"
+msgid "  --probe-rpms   - do not use synthesis/hdlist, use rpm files directly\n"
 msgstr ""
 
 #: ../urpmi.update:48
@@ -2806,8 +2775,7 @@ msgstr "  --list-media   - mavjud bo'lgan to'plamlar ro'yxatini ko'rsatish.\n"
 #: ../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"
+msgstr "  --list-url     - mavjud bo'lgan to'plam va uning URL'ni ko'rsatish.\n"
 
 #: ../urpmq:59
 #, c-format
@@ -2821,8 +2789,7 @@ msgstr ""
 
 #: ../urpmq:61
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
 #: ../urpmq:62
@@ -2832,8 +2799,7 @@ msgstr ""
 
 #: ../urpmq:63
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
 #: ../urpmq:65
@@ -2961,8 +2927,7 @@ msgstr ""
 
 #: ../urpmq:364
 #, c-format
-msgid ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgid "no hdlist for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 
 #: ../urpmq:425
@@ -2970,80 +2935,3 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Changelog fayli topilmadi\n"
 
-#~ msgid " (%d MB)"
-#~ msgstr " (%d Mb)"
-
-#~ msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-#~ msgstr "%s paketi qo'shilmoqda (id=%d, eid=%d, yangilash=%d, fayl=%s)"
-
-#~ msgid ""
-#~ "The following packages have bad signatures:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you want to continue installation ?"
-#~ msgstr ""
-#~ "Quyidagi paketlarning imzolari noto'g'ri:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "O'rnatishni davom ettirishni istaysizmi?"
-
-#~ msgid "You need to be root to use --use-distrib"
-#~ msgstr "--use-distrib amalidan foydalanish uchun root bo'lish shart"
-
-#~ msgid "unable to remove package %s"
-#~ msgstr "paketni (%s) olib tashlab bo'lmadi"
-
-#~ msgid "No filelist found\n"
-#~ msgstr "Fayllar ro'yxati topilmadi\n"
-
-#~ msgid "Proceed with the installation of the %d package? (%d MB)"
-#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-#~ msgstr[0] "%d-ta paketni o'rnatish bilan davom etishni istaysizmi? (%d Mb)"
-
-#~ msgid "(%d packages, %d MB)"
-#~ msgstr "(%d-ta paket, %d Mb)"
-
-#~ msgid "medium \"%s\" is not selected"
-#~ msgstr "to'plam tanlanmagan: \"%s\""
-
-#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket ham o'rnatiladi:\n"
-#~ "%s\n"
-
-#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi"
-
-#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-#~ msgstr ""
-#~ "  --probe-synthesis - synthesis faylini topishga va undan foydalanishga "
-#~ "urinib ko'rish.\n"
-
-#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-#~ msgstr ""
-#~ "  --probe-hdlist - hdlist faylini topishga va undan foydalanishga urinib "
-#~ "ko'rish.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "unknown options '%s'\n"
-#~ msgstr ""
-#~ "\n"
-#~ "noma'lum parametrlar \"%s\"\n"
-
-#~ msgid "copying source hdlist (or synthesis) of \"%s\"..."
-#~ msgstr "'%s' uchun hdlist (yoki synthesis) faylidan nusxa ko'chirilmoqda..."
-
-#~ msgid "retrieval of source hdlist (or synthesis) failed"
-#~ msgstr ""
-#~ "...hdlist (yoki synthesis) faylini yozib olish muvaffaqiyatsiz tugadi"
-
-#~ msgid "found %d headers in cache"
-#~ msgstr "keshda %d sarlavha topildi"
-
-#~ msgid "removing %d obsolete headers in cache"
-#~ msgstr "keshdagi %d eski sarlavha o'chirilmoqda"