sync with code

1 files changed, 108 insertions, 104 deletions

diff --git a/perl-install/install/share/po/uz@cyrillic.po b/perl-install/install/share/po/uz@cyrillic.po
index 231dd3491..54726839a 100644
--- a/perl-install/install/share/po/uz@cyrillic.po
+++ b/perl-install/install/share/po/uz@cyrillic.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uz@cyrillic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-21 02:03+0100\n"
+"POT-Creation-Date: 2012-04-17 22:54+0200\n"
 "PO-Revision-Date: 2010-01-07 11:35+0500\n"
 "Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -183,7 +183,7 @@ msgid "Removing packages prior to upgrade..."
 msgstr "Янгилашдан аввал пакетлар олиб ташланмоқда..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:613
+#: any.pm:614
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -196,72 +196,72 @@ msgstr ""
 "\n"
 "Давом этишни истайсизми?\n"
 
-#: any.pm:832
+#: any.pm:833
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s файлини ўқишда хато рўй берди"
 
-#: any.pm:1039
+#: any.pm:1041
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Қуйидаги диск(лар)нинг номи ўзгартирилди:"
 
-#: any.pm:1041
+#: any.pm:1043
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (олдинги номи %s)"
 
-#: any.pm:1098
+#: any.pm:1100
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1098
+#: any.pm:1100
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1098
+#: any.pm:1100
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1117 steps_interactive.pm:946
+#: any.pm:1119 steps_interactive.pm:950
 #, c-format
 msgid "Network"
 msgstr "Тармоқ"
 
-#: any.pm:1121
+#: any.pm:1123
 #, c-format
 msgid "Please choose a media"
 msgstr "Илтимос тўпламни танланг"
 
-#: any.pm:1137
+#: any.pm:1139
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Файл аллақачон мавжуд. Уни алмаштиришни истайсизми?"
 
-#: any.pm:1141
+#: any.pm:1143
 #, c-format
 msgid "Permission denied"
 msgstr "Рухсат йўқ"
 
-#: any.pm:1189
+#: any.pm:1191
 #, c-format
 msgid "Bad NFS name"
 msgstr "NFS номи нотўғри"
 
-#: any.pm:1210
+#: any.pm:1212
 #, c-format
 msgid "Bad media %s"
 msgstr "Нотўғри тўплам %s"
 
-#: any.pm:1253
+#: any.pm:1256
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Скриншотларни дискни бўлишдан аввал олиб бўлмайди"
 
-#: any.pm:1261
+#: any.pm:1264
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
@@ -277,7 +277,7 @@ msgstr "Ўрнатиш"
 msgid "Configuration"
 msgstr "Мослаш"
 
-#: install2.pm:168
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "Сиз %s'ни ҳам формат қилишингиз керак"
@@ -306,47 +306,47 @@ msgstr "Тармоқ ўчирилмоқда"
 msgid "Please wait, retrieving file"
 msgstr "Илтимос кутиб туринг, файл олинмоқда"
 
-#: media.pm:724
+#: media.pm:725
 #, c-format
 msgid "unable to add medium"
 msgstr "манбани қўшиб бўлмади"
 
-#: media.pm:764
+#: media.pm:765
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Баъзи пакетлардан дискка нусха олинмоқда"
 
-#: media.pm:817
+#: media.pm:818
 #, c-format
 msgid "Copying in progress"
 msgstr "Нусха олиш давом этмоқда"
 
-#: pkgs.pm:33
+#: pkgs.pm:59
 #, c-format
 msgid "must have"
 msgstr "бўлиши шарт"
 
-#: pkgs.pm:34
+#: pkgs.pm:60
 #, c-format
 msgid "important"
 msgstr "муҳим"
 
-#: pkgs.pm:35
+#: pkgs.pm:61
 #, c-format
 msgid "very nice"
 msgstr "жуда яхши"
 
-#: pkgs.pm:36
+#: pkgs.pm:62
 #, c-format
 msgid "nice"
 msgstr "яхши"
 
-#: pkgs.pm:37
+#: pkgs.pm:63
 #, c-format
 msgid "maybe"
 msgstr "балки"
 
-#: pkgs.pm:246
+#: pkgs.pm:272
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -355,22 +355,22 @@ msgstr ""
 "%s талаб қиладиган баъзи пакетларни ўрнатиб бўлмайди:\n"
 "%s"
 
-#: pkgs.pm:334
+#: pkgs.pm:360
 #, c-format
 msgid "An error occurred:"
 msgstr "Хато рўй берди:"
 
-#: pkgs.pm:807
+#: pkgs.pm:833
 #, c-format
 msgid "Do not ask again"
 msgstr ""
 
-#: pkgs.pm:823
+#: pkgs.pm:849
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d ўрнатиш транзакцияси муваффақиятсиз тугади"
 
-#: pkgs.pm:824
+#: pkgs.pm:850
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Пакетларни ўрнатиб бўлмади:"
@@ -708,7 +708,7 @@ msgstr ""
 "Хатолик юз берди аммо унинг сабаби аниқланмади.\n"
 "Тавваккал қилган ҳолда давом этишингиз мумкин."
 
-#: steps.pm:451
+#: steps.pm:457
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -788,31 +788,26 @@ msgstr "Бошқа иш столи"
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Бу '%s' иш столининг кўриниши."
 
-#: steps_gtk.pm:305
+#: steps_gtk.pm:304
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Иш столини яқинроқдан кўриш учун расмни сичқонча билан босинг"
 
-#: steps_gtk.pm:323 steps_interactive.pm:617 steps_list.pm:30
+#: steps_gtk.pm:322 steps_interactive.pm:619 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Пакетларни гуруҳ бўйича танлаш"
 
-#: steps_gtk.pm:344 steps_interactive.pm:634
+#: steps_gtk.pm:343 steps_interactive.pm:636
 #, c-format
 msgid "Individual package selection"
 msgstr "Пакетларни биттама-битта танлаш"
 
-#: steps_gtk.pm:368 steps_interactive.pm:554
+#: steps_gtk.pm:367 steps_interactive.pm:555
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Жами: %d / %d Мб"
 
-#: steps_gtk.pm:410
-#, c-format
-msgid "Bad package"
-msgstr "Ёмон пакет"
-
 #: steps_gtk.pm:412
 #, c-format
 msgid "Version: "
@@ -833,6 +828,11 @@ msgstr "%d Кб\n"
 msgid "Importance: "
 msgstr "Муҳимлиги: "
 
+#: steps_gtk.pm:415
+#, c-format
+msgid "No description"
+msgstr ""
+
 #: steps_gtk.pm:448
 #, c-format
 msgid "You cannot select/unselect this package"
@@ -896,83 +896,83 @@ msgstr "Бу пакетни танлашни бекор қилолмайсиз.
 msgid "Show automatically selected packages"
 msgstr "Автоматик равишда танланган пакетларни кўрсатиш"
 
-#: steps_gtk.pm:503
+#: steps_gtk.pm:504
 #, c-format
 msgid "Install"
 msgstr "Ўрнатиш"
 
-#: steps_gtk.pm:506
+#: steps_gtk.pm:507
 #, c-format
 msgid "Load/Save selection"
 msgstr "Танланганни юклаш/сақлаш"
 
-#: steps_gtk.pm:507
+#: steps_gtk.pm:508
 #, c-format
 msgid "Updating package selection"
 msgstr "Пакетлар танлови янгиланмоқда"
 
-#: steps_gtk.pm:512
+#: steps_gtk.pm:513
 #, c-format
 msgid "Minimal install"
 msgstr "Минимал ўрнатиш"
 
-#: steps_gtk.pm:525
+#: steps_gtk.pm:526
 #, c-format
 msgid "Software Management"
 msgstr "Дастурлар бошқаруви"
 
-#: steps_gtk.pm:525 steps_interactive.pm:439
+#: steps_gtk.pm:526 steps_interactive.pm:439
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Сиз ўрнатмоқчи бўлган пакетларни танланг"
 
-#: steps_gtk.pm:542 steps_interactive.pm:648 steps_list.pm:32
+#: steps_gtk.pm:543 steps_interactive.pm:650 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Ўрнатилмоқда"
 
-#: steps_gtk.pm:572
+#: steps_gtk.pm:573
 #, c-format
 msgid "No details"
 msgstr "Тафсилотларсиз"
 
-#: steps_gtk.pm:591
+#: steps_gtk.pm:592
 #, c-format
 msgid "Time remaining:"
 msgstr "Қолган вақт:"
 
-#: steps_gtk.pm:592
+#: steps_gtk.pm:593
 #, c-format
 msgid "(estimating...)"
 msgstr "(чамаланмоқда)"
 
-#: steps_gtk.pm:622
+#: steps_gtk.pm:623
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d-та пакет"
 
-#: steps_gtk.pm:677 steps_interactive.pm:812 steps_list.pm:43
+#: steps_gtk.pm:678 steps_interactive.pm:814 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Ҳисобот"
 
-#: steps_gtk.pm:696
+#: steps_gtk.pm:697
 #, c-format
 msgid "Configure"
 msgstr "Мослаш"
 
-#: steps_gtk.pm:713 steps_interactive.pm:808 steps_interactive.pm:958
+#: steps_gtk.pm:714 steps_interactive.pm:810 steps_interactive.pm:962
 #, c-format
 msgid "not configured"
 msgstr "мосланмаган"
 
-#: steps_gtk.pm:747
+#: steps_gtk.pm:748
 #, c-format
 msgid "Media Selection"
 msgstr "Манбани танлаш"
 
-#: steps_gtk.pm:756 steps_interactive.pm:340
+#: steps_gtk.pm:757 steps_interactive.pm:340
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -981,7 +981,7 @@ msgstr ""
 "Қуйидаги ўрнатиш манбалари аниқланди.\n"
 "Фақат танланган манбалар ўрнатиш учун ишлатилади."
 
-#: steps_gtk.pm:772 steps_interactive.pm:346
+#: steps_gtk.pm:773 steps_interactive.pm:346
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -993,7 +993,7 @@ msgstr ""
 "олиш мумкин.\n"
 "Ўрнатиш тўлиқ тугагандан сўнг улар тизимга маълум бўлади."
 
-#: steps_gtk.pm:774 steps_interactive.pm:348
+#: steps_gtk.pm:775 steps_interactive.pm:348
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Бутун дискдан нусха олиш"
@@ -1162,17 +1162,17 @@ msgstr "Иш столини танлаш"
 msgid "You can choose your workstation desktop profile."
 msgstr "Қуйидагилардан ўрнатиладиган иш столини танланг"
 
-#: steps_interactive.pm:568
+#: steps_interactive.pm:569
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Танланган ҳажм мавжуд бўлган бўш жойдан катта"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:585
 #, c-format
 msgid "Type of install"
 msgstr "Ўрнатишнинг тури"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:586
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1181,87 +1181,87 @@ msgstr ""
 "Сиз ҳеч қандай пакетлар гуруҳини танламадингиз.\n"
 "Илтимос сиз истаган минимал ўрнатишни танланг:"
 
-#: steps_interactive.pm:590
+#: steps_interactive.pm:591
 #, c-format
 msgid "With X"
 msgstr "X билан"
 
-#: steps_interactive.pm:591
+#: steps_interactive.pm:592
 #, c-format
 msgid "Install suggested packages"
 msgstr "Таклиф қилинган пакетларни ўрнатиш"
 
-#: steps_interactive.pm:592
+#: steps_interactive.pm:593
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Асосий қўлланмалар билан (тавсия қилинади!)"
 
-#: steps_interactive.pm:593
+#: steps_interactive.pm:594
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Ҳақиқий минимал ўрнатиш (хусусан urpmi'сиз)"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Preparing installation"
 msgstr "Ўрнатишга тайёрланмоқда"
 
-#: steps_interactive.pm:657
+#: steps_interactive.pm:659
 #, c-format
 msgid "Installing package %s"
 msgstr "%s пакети ўрнатилмоқда"
 
-#: steps_interactive.pm:681
+#: steps_interactive.pm:683
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Қуйидаги пакетларни саралашда хато рўй берди:"
 
-#: steps_interactive.pm:681
+#: steps_interactive.pm:683
 #, c-format
 msgid "Go on anyway?"
 msgstr "Бунга қарамасдан давом этишни истайсизми?"
 
-#: steps_interactive.pm:685
+#: steps_interactive.pm:687
 #, c-format
 msgid "Retry"
 msgstr "Қайтадан уриниш"
 
-#: steps_interactive.pm:686
+#: steps_interactive.pm:688
 #, c-format
 msgid "Skip this package"
 msgstr "Бу пакетга эътибор берилмасин"
 
-#: steps_interactive.pm:687
+#: steps_interactive.pm:689
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "\"%s\" тўпламидан ҳамма пакетларга эътибор берилмасин"
 
-#: steps_interactive.pm:688
+#: steps_interactive.pm:690
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Ўрнатиш манбаларни ва пакетларни танлашга қайтиш"
 
-#: steps_interactive.pm:691
+#: steps_interactive.pm:693
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Қуйидаги пакетни ўрнатишда хато рўй берди: %s"
 
-#: steps_interactive.pm:710
+#: steps_interactive.pm:712
 #, c-format
 msgid "Post-install configuration"
 msgstr "Ўрнатишдан кейин мослаш"
 
-#: steps_interactive.pm:717
+#: steps_interactive.pm:719
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "%s ичида Update Modules тўплами мавжудлигини текшириб кўринг"
 
-#: steps_interactive.pm:745 steps_list.pm:47
+#: steps_interactive.pm:747 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Янгиланишлар"
 
-#: steps_interactive.pm:746
+#: steps_interactive.pm:748
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1283,28 +1283,29 @@ msgstr ""
 "\n"
 "Янгиланишларни ўрнатишни истайсизми?"
 
-#: steps_interactive.pm:854
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:858
 #, c-format
 msgid "%s on %s"
 msgstr "%s %s'да"
 
-#: steps_interactive.pm:886 steps_interactive.pm:893 steps_interactive.pm:906
-#: steps_interactive.pm:923 steps_interactive.pm:938
+#: steps_interactive.pm:890 steps_interactive.pm:897 steps_interactive.pm:910
+#: steps_interactive.pm:927 steps_interactive.pm:942
 #, c-format
 msgid "Hardware"
 msgstr "Асбоб-ускуналар"
 
-#: steps_interactive.pm:907 steps_interactive.pm:924
+#: steps_interactive.pm:911 steps_interactive.pm:928
 #, c-format
 msgid "Sound card"
 msgstr "Товуш карта"
 
-#: steps_interactive.pm:927
+#: steps_interactive.pm:931
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Сизда ISA товуш картаси борми?"
 
-#: steps_interactive.pm:929
+#: steps_interactive.pm:933
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1313,74 +1314,74 @@ msgstr ""
 "Ўрнатишдан кейин, товуш картангизни мослаш учун, \"sndconfig\" ёки \"alsaconf"
 "\" дастурини ишга туширинг"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:935
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Товуш картаси топилмади. Ўрнатишдан кейин \"harddrake\" дастурини синаб "
 "кўринг."
 
-#: steps_interactive.pm:939
+#: steps_interactive.pm:943
 #, c-format
 msgid "Graphical interface"
 msgstr "График интерфейс"
 
-#: steps_interactive.pm:945 steps_interactive.pm:956
+#: steps_interactive.pm:949 steps_interactive.pm:960
 #, c-format
 msgid "Network & Internet"
 msgstr "Тармоқ ва Интернет"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:961
 #, c-format
 msgid "Proxies"
 msgstr "Проксилар"
 
-#: steps_interactive.pm:958
+#: steps_interactive.pm:962
 #, c-format
 msgid "configured"
 msgstr "мосланган"
 
-#: steps_interactive.pm:968
+#: steps_interactive.pm:972
 #, c-format
 msgid "Security Level"
 msgstr "Хавфсизлик даражаси"
 
-#: steps_interactive.pm:987
+#: steps_interactive.pm:992
 #, c-format
 msgid "Firewall"
 msgstr "Файервол"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:996
 #, c-format
 msgid "activated"
 msgstr "ишлаяпти"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:996
 #, c-format
 msgid "disabled"
 msgstr "ўчирилган"
 
-#: steps_interactive.pm:1005
+#: steps_interactive.pm:1010
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Сиз X'ни мосламадингиз. Ростдан буни истайсизми?"
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1039
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "ОТ юклагичи тайёрланмоқда..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1039
 #, fuzzy, c-format
 msgid "Preparing initial startup program..."
 msgstr "Ўрнатишга тайёрланмоқда"
 
-#: steps_interactive.pm:1035
+#: steps_interactive.pm:1040
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Кутиб туринг, бу бироз вақт олиши мумкин..."
 
-#: steps_interactive.pm:1046
+#: steps_interactive.pm:1051
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1393,7 +1394,7 @@ msgstr ""
 "учун BootX ёки бошқа усулдан фойдаланишингиз лозим бўлади. Root файл тизими "
 "учун учун кернел аргументи: root=%s"
 
-#: steps_interactive.pm:1059
+#: steps_interactive.pm:1064
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1402,17 +1403,17 @@ msgstr ""
 "Ушбу хавфсизлик даража қўлланилганда дискнинг Windows қисмидаги файлларга "
 "фақат администратор мурожаат қилиши мумкин."
 
-#: steps_interactive.pm:1091
+#: steps_interactive.pm:1096
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Бўш дискетни %s ускунасига қўйинг"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1098
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Авто-ўрнатиш дискети яратилмоқда..."
 
-#: steps_interactive.pm:1104
+#: steps_interactive.pm:1109
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1423,12 +1424,12 @@ msgstr ""
 "\n"
 "Ростдан чиқишни истайсизми?"
 
-#: steps_interactive.pm:1114
+#: steps_interactive.pm:1119
 #, c-format
 msgid "Congratulations"
 msgstr "Табриклаймиз!"
 
-#: steps_interactive.pm:1117
+#: steps_interactive.pm:1122
 #, c-format
 msgid "Reboot"
 msgstr "Ўчириб-ёқиш"
@@ -1565,6 +1566,9 @@ msgid ""
 "Exit"
 msgstr "Чиқиш"
 
+#~ msgid "Bad package"
+#~ msgstr "Ёмон пакет"
+
 #, fuzzy
 #~ msgid "Preparing boot images..."
 #~ msgstr "ОТ юклагичи тайёрланмоқда..."