updated Uzbek files; checked various po files against latest *.pot

author: Pablo Saratxaga <pablo@mandriva.com> 2004-10-10 04:29:15 +0000
committer: Pablo Saratxaga <pablo@mandriva.com> 2004-10-10 04:29:15 +0000
commit: 97bd4d3f53be6dd1f657ef305910e027fe9de93f (patch)
tree: 37c64a1a7bc84bf0baabecd1431e7b34ca54df59 /perl-install/share/po/uz.po
parent: 069349909b91120d26f2762a4c8c3b0b1e42d120 (diff)
download: drakx-backup-do-not-use-97bd4d3f53be6dd1f657ef305910e027fe9de93f.tar
drakx-backup-do-not-use-97bd4d3f53be6dd1f657ef305910e027fe9de93f.tar.gz
drakx-backup-do-not-use-97bd4d3f53be6dd1f657ef305910e027fe9de93f.tar.bz2
drakx-backup-do-not-use-97bd4d3f53be6dd1f657ef305910e027fe9de93f.tar.xz
drakx-backup-do-not-use-97bd4d3f53be6dd1f657ef305910e027fe9de93f.zip
1 files changed, 6027 insertions, 5019 deletions
diff --git a/perl-install/share/po/uz.po b/perl-install/share/po/uz.po
index 211e60b05..a834e8f3d 100644
--- a/perl-install/share/po/uz.po
+++ b/perl-install/share/po/uz.po
@@ -6,67 +6,53 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-uz\n"
-"POT-Creation-Date: 2004-06-14 15:48+0200\n"
-"PO-Revision-Date: 2004-06-27 23:43+0200\n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\n"
+"PO-Revision-Date: 2004-10-10 00:41+0500\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3\n"
+"X-Generator: KBabel 1.9\n"
 
-#: ../move/move.pm:402
-#, c-format
-msgid ""
-"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
-"We need one to continue (beside, it's more standard so that you\n"
-"will be able to move and access your files from machines\n"
-"running Windows). Please plug in an USB key containing a\n"
-"Windows partition instead.\n"
-"\n"
-"\n"
-"You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
-"Operating System."
-msgstr ""
+#: ../move/move.pm:292
+#, fuzzy, c-format
+msgid "Which USB key do you want to format?"
+msgstr "Банднинг қайси турини қўшмоқчисиз?"
 
-#: ../move/move.pm:412
+#: ../move/move.pm:296
 #, c-format
 msgid ""
-"We didn't detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
-"to transparently save the data in your home directory and\n"
-"system wide configuration, for next boot on this computer\n"
-"or another one. Note: if you plug in a key now, wait several\n"
-"seconds before detecting again.\n"
-"\n"
-"\n"
-"You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
-"Operating System."
+"You are about to format a USB device \"%s\". This will delete all data on "
+"it.\n"
+"Make sure that the selected device is the USB key you want to format. \n"
+"We advise you to unplug all other USB storage devices while doing this "
+"operation."
 msgstr ""
 
-#: ../move/move.pm:423
+#: ../move/move.pm:448 ../move/move.pm:460
 #, c-format
-msgid "Need a key to save your data"
+msgid "Key isn't writable"
 msgstr ""
 
-#: ../move/move.pm:425
+#: ../move/move.pm:450
 #, c-format
-msgid "Detect USB key again"
+msgid ""
+"The USB key seems to have write protection enabled. Please\n"
+"unplug it, remove write protection, and then plug it again."
 msgstr ""
 
-#: ../move/move.pm:426 ../move/move.pm:456
+#: ../move/move.pm:452
 #, c-format
-msgid "Continue without USB key"
-msgstr ""
+msgid "Retry"
+msgstr "Бошқадан уриниш"
 
-#: ../move/move.pm:437 ../move/move.pm:451
+#: ../move/move.pm:453 ../move/move.pm:497
 #, c-format
-msgid "Key isn't writable"
+msgid "Continue without USB key"
 msgstr ""
 
-#: ../move/move.pm:439
+#: ../move/move.pm:462
 #, c-format
 msgid ""
 "The USB key seems to have write protection enabled, but we can't safely\n"
@@ -77,118 +63,147 @@ msgid ""
 "plug the key again, and launch Mandrake Move again."
 msgstr ""
 
-#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
 #, c-format
 msgid "Reboot"
 msgstr "Ўчириб-ёқиш"
 
-#: ../move/move.pm:453
+#: ../move/move.pm:473
 #, c-format
 msgid ""
-"The USB key seems to have write protection enabled. Please\n"
-"unplug it, remove write protection, and then plug it again."
+"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
+"We need one to continue (beside, it's more standard so that you\n"
+"will be able to move and access your files from machines\n"
+"running Windows). Please plug in an USB key containing a\n"
+"Windows partition instead.\n"
+"\n"
+"\n"
+"You may also proceed without an USB key - you'll still be\n"
+"able to use Mandrake Move as a normal live Mandrake\n"
+"Operating System."
 msgstr ""
 
-#: ../move/move.pm:455
+#: ../move/move.pm:483
 #, c-format
-msgid "Retry"
-msgstr "Бошқадан уриниш"
+msgid ""
+"We didn't detect any USB key on your system. If you\n"
+"plug in an USB key now, Mandrake Move will have the ability\n"
+"to transparently save the data in your home directory and\n"
+"system wide configuration, for next boot on this computer\n"
+"or another one. Note: if you plug in a key now, wait several\n"
+"seconds before detecting again.\n"
+"\n"
+"\n"
+"You may also proceed without an USB key - you'll still be\n"
+"able to use Mandrake Move as a normal live Mandrake\n"
+"Operating System."
+msgstr ""
 
-#: ../move/move.pm:466
+#: ../move/move.pm:494
 #, c-format
-msgid "Setting up USB key"
+msgid "Need a key to save your data"
 msgstr ""
 
-#: ../move/move.pm:466
+#: ../move/move.pm:496
 #, c-format
-msgid "Please wait, setting up system configuration files on USB key..."
+msgid "Detect USB key again"
 msgstr ""
 
-#: ../move/move.pm:488
+#: ../move/move.pm:517
+#, fuzzy, c-format
+msgid "Setting up USB key"
+msgstr "ISA PNP ускуналари ўрнатилмоқда: "
+
+#: ../move/move.pm:517
+#, fuzzy, c-format
+msgid "Please wait, setting up system configuration files on USB key..."
+msgstr "Илтимос кутиб туринг, асбоб-ускуналар аниқланмоқда ва мосланмоқда..."
+
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr ""
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Auto configuration"
 msgstr "Авто-мослаш"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Please wait, detecting and configuring devices..."
 msgstr "Илтимос кутиб туринг, асбоб-ускуналар аниқланмоқда ва мосланмоқда..."
 
-#: ../move/move.pm:545 ../move/move.pm:601 ../move/move.pm:605
-#: ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117
-#: diskdrake/interactive.pm:220 diskdrake/interactive.pm:233
-#: diskdrake/interactive.pm:374 diskdrake/interactive.pm:389
-#: diskdrake/interactive.pm:510 diskdrake/interactive.pm:515
-#: diskdrake/smbnfs_gtk.pm:42 fsedit.pm:262 install_steps.pm:82
-#: install_steps_interactive.pm:40 interactive/http.pm:118
-#: interactive/http.pm:119 network/netconnect.pm:936 network/netconnect.pm:939
-#: network/netconnect.pm:984 network/netconnect.pm:988
-#: network/netconnect.pm:1055 network/netconnect.pm:1105
-#: network/netconnect.pm:1110 network/netconnect.pm:1125
-#: network/netconnect.pm:1333 printer/printerdrake.pm:213
-#: printer/printerdrake.pm:220 printer/printerdrake.pm:245
-#: printer/printerdrake.pm:393 printer/printerdrake.pm:398
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:421
-#: printer/printerdrake.pm:1067 printer/printerdrake.pm:1114
-#: printer/printerdrake.pm:1151 printer/printerdrake.pm:1195
-#: printer/printerdrake.pm:1199 printer/printerdrake.pm:1213
-#: printer/printerdrake.pm:1303 printer/printerdrake.pm:1383
-#: printer/printerdrake.pm:1387 printer/printerdrake.pm:1391
-#: printer/printerdrake.pm:1440 printer/printerdrake.pm:1497
-#: printer/printerdrake.pm:1501 printer/printerdrake.pm:1515
-#: printer/printerdrake.pm:1625 printer/printerdrake.pm:1629
-#: printer/printerdrake.pm:1666 printer/printerdrake.pm:1731
-#: printer/printerdrake.pm:1749 printer/printerdrake.pm:1758
-#: printer/printerdrake.pm:1767 printer/printerdrake.pm:1778
-#: printer/printerdrake.pm:1840 printer/printerdrake.pm:2285
-#: printer/printerdrake.pm:2551 printer/printerdrake.pm:2557
-#: printer/printerdrake.pm:3010 printer/printerdrake.pm:3014
-#: printer/printerdrake.pm:3018 printer/printerdrake.pm:3421
-#: printer/printerdrake.pm:3664 printer/printerdrake.pm:3677
-#: printer/printerdrake.pm:3817 printer/printerdrake.pm:3909
-#: standalone/drakTermServ:404 standalone/drakTermServ:758
-#: standalone/drakTermServ:765 standalone/drakTermServ:960
-#: standalone/drakTermServ:1430 standalone/drakTermServ:1435
-#: standalone/drakTermServ:1442 standalone/drakTermServ:1453
-#: standalone/drakTermServ:1475 standalone/drakauth:36
-#: standalone/drakbackup:511 standalone/drakbackup:625
-#: standalone/drakbackup:1118 standalone/drakbackup:1151
-#: standalone/drakbackup:1644 standalone/drakbackup:1807
-#: standalone/drakbackup:2419 standalone/drakbackup:4084
-#: standalone/drakbackup:4304 standalone/drakboot:255 standalone/drakbug:267
-#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:621
-#: standalone/drakconnect:624 standalone/drakconnect:645
-#: standalone/drakfloppy:302 standalone/drakfloppy:306
-#: standalone/drakfloppy:312 standalone/drakfont:210 standalone/drakfont:223
-#: standalone/drakfont:259 standalone/drakfont:600 standalone/draksplash:21
-#: standalone/drakxtv:105 standalone/logdrake:170 standalone/logdrake:467
-#: standalone/logdrake:472 standalone/scannerdrake:58
-#: standalone/scannerdrake:200 standalone/scannerdrake:259
-#: standalone/scannerdrake:688 standalone/scannerdrake:699
-#: standalone/scannerdrake:838 standalone/scannerdrake:849
-#: standalone/scannerdrake:919 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:223
+#: diskdrake/interactive.pm:236 diskdrake/interactive.pm:377
+#: diskdrake/interactive.pm:392 diskdrake/interactive.pm:515
+#: diskdrake/interactive.pm:520 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:167
+#: install_steps.pm:82 install_steps_interactive.pm:38 interactive/http.pm:117
+#: interactive/http.pm:118 network/netconnect.pm:995 network/netconnect.pm:999
+#: network/netconnect.pm:1004 network/netconnect.pm:1045
+#: network/netconnect.pm:1049 network/netconnect.pm:1187
+#: network/netconnect.pm:1192 network/netconnect.pm:1210
+#: network/netconnect.pm:1393 printer/printerdrake.pm:238
+#: printer/printerdrake.pm:245 printer/printerdrake.pm:270
+#: printer/printerdrake.pm:416 printer/printerdrake.pm:421
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:444
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:1182
+#: printer/printerdrake.pm:1229 printer/printerdrake.pm:1266
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1314
+#: printer/printerdrake.pm:1328 printer/printerdrake.pm:1418
+#: printer/printerdrake.pm:1498 printer/printerdrake.pm:1502
+#: printer/printerdrake.pm:1506 printer/printerdrake.pm:1555
+#: printer/printerdrake.pm:1612 printer/printerdrake.pm:1616
+#: printer/printerdrake.pm:1630 printer/printerdrake.pm:1740
+#: printer/printerdrake.pm:1744 printer/printerdrake.pm:1781
+#: printer/printerdrake.pm:1846 printer/printerdrake.pm:1864
+#: printer/printerdrake.pm:1873 printer/printerdrake.pm:1882
+#: printer/printerdrake.pm:1893 printer/printerdrake.pm:1955
+#: printer/printerdrake.pm:2408 printer/printerdrake.pm:2672
+#: printer/printerdrake.pm:2678 printer/printerdrake.pm:3188
+#: printer/printerdrake.pm:3192 printer/printerdrake.pm:3196
+#: printer/printerdrake.pm:3606 printer/printerdrake.pm:3846
+#: printer/printerdrake.pm:3866 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007 printer/printerdrake.pm:4123
+#: standalone/drakTermServ:379 standalone/drakTermServ:731
+#: standalone/drakTermServ:738 standalone/drakTermServ:933
+#: standalone/drakTermServ:1403 standalone/drakTermServ:1408
+#: standalone/drakTermServ:1415 standalone/drakTermServ:1426
+#: standalone/drakTermServ:1447 standalone/drakauth:37
+#: standalone/drakbackup:512 standalone/drakbackup:626
+#: standalone/drakbackup:1128 standalone/drakbackup:1161
+#: standalone/drakbackup:1665 standalone/drakbackup:1821
+#: standalone/drakbackup:2416 standalone/drakbackup:4105
+#: standalone/drakbackup:4325 standalone/drakbug:235 standalone/drakbug:254
+#: standalone/drakbug:260 standalone/drakclock:125 standalone/drakconnect:648
+#: standalone/drakconnect:651 standalone/drakconnect:670
+#: standalone/drakfloppy:297 standalone/drakfloppy:301
+#: standalone/drakfloppy:307 standalone/drakfont:210 standalone/drakfont:223
+#: standalone/drakfont:259 standalone/drakfont:604 standalone/draksplash:21
+#: standalone/draksplash:501 standalone/drakxtv:107 standalone/logdrake:169
+#: standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59
+#: standalone/scannerdrake:196 standalone/scannerdrake:255
+#: standalone/scannerdrake:684 standalone/scannerdrake:695
+#: standalone/scannerdrake:834 standalone/scannerdrake:845
+#: standalone/scannerdrake:915 wizards.pm:95 wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr "Хато"
 
-#: ../move/move.pm:546 install_steps.pm:83
+#: ../move/move.pm:605 install_steps.pm:83
 #, c-format
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
 
-#: ../move/move.pm:601 install_steps_interactive.pm:40
+#: ../move/move.pm:660 install_steps_interactive.pm:38
 #, c-format
 msgid "An error occurred"
 msgstr "Хато рўй берди"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -208,32 +223,39 @@ msgid ""
 "guess what's happening."
 msgstr ""
 
-#: ../move/move.pm:622
+#: ../move/move.pm:681
 #, c-format
 msgid "Remove system config files"
 msgstr "Тизимнинг мослама файлларини ўчириш"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
 msgstr ""
 
-#: ../move/tree/mdk_totem:60
+#: ../move/tree/mdk_totem:50 ../move/tree/mdk_totem:96
 #, c-format
 msgid "You can only run with no CDROM support"
 msgstr ""
 
-#: ../move/tree/mdk_totem:81
-#, c-format
+#: ../move/tree/mdk_totem:71
+#, fuzzy, c-format
 msgid "Kill those programs"
-msgstr ""
+msgstr "Х дастурларидан фойдаланишга рухсат этиш"
 
-#: ../move/tree/mdk_totem:82
+#: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
 msgstr ""
 
-#: ../move/tree/mdk_totem:87
+#: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:95
+#: diskdrake/interactive.pm:1005 diskdrake/interactive.pm:1015
+#: diskdrake/interactive.pm:1068
+#, c-format
+msgid "Read carefully!"
+msgstr "Диққат билан ўқинг!"
+
+#: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
 "You can't use another CDROM when the following programs are running: \n"
@@ -290,100 +312,100 @@ msgstr "32 Мб"
 msgid "64 MB or more"
 msgstr "64 Мб ёки кўпроқ"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
 msgstr "X сервери"
 
-#: Xconfig/card.pm:152
+#: Xconfig/card.pm:156
 #, c-format
 msgid "Choose an X server"
-msgstr "X серверини танланг"
+msgstr "График картани танлаш"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
 msgstr ""
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: Xconfig/card.pm:251
+#: Xconfig/card.pm:255
 #, c-format
-msgid "Can't install XFree package: %s"
-msgstr "Қуйидаги XFree пакетини ўрнатиб бўлмади: %s"
+msgid "Can't install Xorg package: %s"
+msgstr "Қуйидаги Xorg пакетини ўрнатиб бўлмади: %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "График картангизни хотирасининг ҳажмини танланг"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "XFree'ни мослаш"
+msgid "Xorg configuration"
+msgstr "Xorg мосламаси"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "XFree'нинг қандай мосламасини истайсиз?"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "Xorg'нинг қандай мосламасини истайсиз?"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr ""
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama кенгайтмасидан фойдаланиш"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Фақат \"%s\"%s картасини мослаш"
 
-#: Xconfig/card.pm:385 Xconfig/various.pm:23
+#: Xconfig/card.pm:405 Xconfig/various.pm:23
 #, c-format
-msgid "XFree %s"
-msgstr "XFree %s"
+msgid "Xorg %s"
+msgstr "Xorg %s"
 
-#: Xconfig/card.pm:392 Xconfig/various.pm:22
+#: Xconfig/card.pm:412 Xconfig/various.pm:22
 #, c-format
-msgid "XFree %s with 3D hardware acceleration"
+msgid "Xorg %s with 3D hardware acceleration"
 msgstr ""
 
-#: Xconfig/card.pm:394
+#: Xconfig/card.pm:414
 #, c-format
-msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgid "Your card can have 3D hardware acceleration support with Xorg %s."
 msgstr ""
 
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr ""
 
-#: Xconfig/card.pm:402
+#: Xconfig/card.pm:422
 #, c-format
 msgid ""
-"Your card can have 3D hardware acceleration support with XFree %s,\n"
+"Your card can have 3D hardware acceleration support with Xorg %s,\n"
 "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
 msgstr ""
 
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:112 any.pm:833
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:912
 #, c-format
 msgid "Custom"
 msgstr "Бошқа"
 
-#: Xconfig/main.pm:115 diskdrake/dav.pm:28 help.pm:14
-#: install_steps_interactive.pm:83 printer/printerdrake.pm:608
-#: printer/printerdrake.pm:4076 standalone/draksplash:120
-#: standalone/harddrake2:194 standalone/logdrake:175
-#: standalone/scannerdrake:450
+#: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
+#: install_steps_interactive.pm:88 printer/printerdrake.pm:712
+#: printer/printerdrake.pm:3937 printer/printerdrake.pm:4382
+#: standalone/draksplash:120 standalone/harddrake2:265 standalone/logdrake:174
+#: standalone/net_applet:160 standalone/scannerdrake:446
 #, c-format
 msgid "Quit"
 msgstr "Чиқиш"
@@ -393,12 +415,12 @@ msgstr "Чиқиш"
 msgid "Graphic Card"
 msgstr "График карта"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:106
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
 #, c-format
 msgid "Monitor"
 msgstr "Монитор"
 
-#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:217
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:222
 #, c-format
 msgid "Resolution"
 msgstr "Ўлчам"
@@ -408,14 +430,19 @@ msgstr "Ўлчам"
 msgid "Test"
 msgstr "Синаш"
 
-#: Xconfig/main.pm:133 diskdrake/dav.pm:67 diskdrake/interactive.pm:415
-#: diskdrake/removable.pm:25 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakfont:494 standalone/drakfont:554 standalone/harddrake2:191
+#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:418
+#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80
+#: standalone/drakfont:494 standalone/drakfont:556 standalone/harddrake2:262
 #, c-format
 msgid "Options"
 msgstr "Параметрлар"
 
-#: Xconfig/main.pm:177
+#: Xconfig/main.pm:167
+#, c-format
+msgid "Your Xorg configuration file is broken, we will ignore it."
+msgstr ""
+
+#: Xconfig/main.pm:184
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -428,40 +455,40 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr ""
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Мониторни танлаш"
 
-#: Xconfig/monitor.pm:113
+#: Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: Xconfig/monitor.pm:114 mouse.pm:49
+#: Xconfig/monitor.pm:118 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "Андоза"
 
-#: Xconfig/monitor.pm:115 standalone/drakconnect:569 standalone/harddrake2:73
-#: standalone/harddrake2:74
+#: Xconfig/monitor.pm:119 standalone/drakconnect:567 standalone/harddrake2:49
+#: standalone/harddrake2:83
 #, c-format
 msgid "Vendor"
 msgstr "Ишлаб чиқарувчи"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr ""
 "Plug'n Play аниқлаш муваффақиятсиз тугади. Илтимос тўғри келадиган мониторни "
 "танланг"
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -476,12 +503,12 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr ""
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr ""
@@ -506,58 +533,60 @@ msgstr "65 мингта ранг (16 бит)"
 msgid "16 million colors (24 bits)"
 msgstr "16 миллионта ранг (24 бит)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "Ўлчамлар"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "График карта: %s"
 
-#: Xconfig/resolution_and_depth.pm:278 interactive.pm:403
-#: interactive/gtk.pm:760 interactive/http.pm:103 interactive/http.pm:157
-#: interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39
+#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
+#: interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156
+#: interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakbackup:3941 standalone/drakbackup:4001
-#: standalone/drakbackup:4045 standalone/drakconnect:165
-#: standalone/drakconnect:799 standalone/drakconnect:886
-#: standalone/drakconnect:985 standalone/drakups:194
-#: standalone/net_monitor:307 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1084
-#: ugtk2.pm:1107
+#: standalone/drakTermServ:201 standalone/drakTermServ:474
+#: standalone/drakbackup:3962 standalone/drakbackup:4022
+#: standalone/drakbackup:4066 standalone/drakconnect:165
+#: standalone/drakconnect:850 standalone/drakconnect:937
+#: standalone/drakconnect:1036 standalone/drakfont:577 standalone/drakroam:388
+#: standalone/drakups:208 standalone/net_monitor:345 ugtk2.pm:417 ugtk2.pm:515
+#: ugtk2.pm:1122 ugtk2.pm:1145
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: Xconfig/resolution_and_depth.pm:278 any.pm:883 diskdrake/smbnfs_gtk.pm:81
-#: help.pm:197 help.pm:457 install_steps_gtk.pm:490
-#: install_steps_interactive.pm:775 interactive.pm:404 interactive/gtk.pm:764
-#: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307
-#: interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
-#: standalone/drakautoinst:217 standalone/drakbackup:3871
-#: standalone/drakbackup:3929 standalone/drakconnect:164
-#: standalone/drakconnect:884 standalone/drakconnect:984
-#: standalone/drakfont:663 standalone/drakfont:740 standalone/drakups:201
-#: standalone/logdrake:175 standalone/net_monitor:303 ugtk2.pm:407
-#: ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1084
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:412
+#: install_steps_interactive.pm:840 interactive.pm:404 interactive/gtk.pm:770
+#: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
+#: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3266
+#: standalone/drakautoinst:217 standalone/drakbackup:3888
+#: standalone/drakbackup:3892 standalone/drakbackup:3950
+#: standalone/drakconnect:164 standalone/drakconnect:935
+#: standalone/drakconnect:1035 standalone/drakfont:667 standalone/drakfont:744
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:344
+#: ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1122
 #, c-format
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
-#: Xconfig/resolution_and_depth.pm:278 diskdrake/hd_gtk.pm:154
-#: install_steps_gtk.pm:269 install_steps_gtk.pm:670 interactive.pm:498
-#: interactive/gtk.pm:624 interactive/gtk.pm:626 standalone/drakTermServ:304
-#: standalone/drakbackup:3867 standalone/drakbug:157
-#: standalone/drakconnect:160 standalone/drakconnect:239
-#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:296
-#: standalone/harddrake2:190 ugtk2.pm:1197 ugtk2.pm:1198
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/hd_gtk.pm:153
+#: install_steps_gtk.pm:239 install_steps_gtk.pm:644 interactive.pm:498
+#: interactive/gtk.pm:628 interactive/gtk.pm:630 standalone/drakTermServ:280
+#: standalone/drakbackup:3884 standalone/drakbug:128
+#: standalone/drakconnect:160 standalone/drakconnect:245
+#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:337
+#: standalone/draksec:339 standalone/draksec:357 standalone/draksec:359
+#: standalone/harddrake2:261 ugtk2.pm:1235 ugtk2.pm:1236
 #, c-format
 msgid "Help"
 msgstr "Ёрдам"
@@ -652,8 +681,8 @@ msgstr "Ўлчамлар: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "XFree86 драйвери: %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Xorg драйвери: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -664,12 +693,12 @@ msgstr "Тизим юкланаётганда график интерфейс"
 #, c-format
 msgid ""
 "I can setup your computer to automatically start the graphical interface "
-"(XFree) upon booting.\n"
-"Would you like XFree to start when you reboot?"
+"(Xorg) upon booting.\n"
+"Would you like Xorg to start when you reboot?"
 msgstr ""
-"Мен компьютерингизни шундай ўрнатишим мумкинки, система юкланаётганда график "
-"интерфейс (XFree) ишга туширилади.\n"
-"Ўчириб-ёқгандан кейин XFree ишга туширилишини истайсизми?"
+"Мен компьютерингизни шундай ўрнатишим мумкинки, тизим юкланаётганда график "
+"интерфейс (Xorg) ишга туширилади.\n"
+"Ўчириб-ёқгандан кейин Xorg ишга туширилишини истайсизми?"
 
 #: Xconfig/various.pm:87
 #, c-format
@@ -689,20 +718,49 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr ""
 
-#: any.pm:103 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259
-#: standalone/drakconnect:167 standalone/draksec:56 standalone/drakups:90
-#: standalone/drakxtv:90 standalone/harddrake2:140
-#: standalone/service_harddrake:126
+#: any.pm:116 harddrake/sound.pm:170 interactive.pm:441 standalone/drakbug:227
+#: standalone/drakconnect:167 standalone/drakconnect:611 standalone/draksec:68
+#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:211
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Please wait"
 msgstr "Илтимос кутиб туринг"
 
-#: any.pm:103
+#: any.pm:116
 #, c-format
 msgid "Bootloader installation in progress"
-msgstr "Операцион система юклагичини ўрнатиш давом этмоқда"
+msgstr "Операцион тизим юклагичини ўрнатиш давом этмоқда"
+
+#: any.pm:127
+#, c-format
+msgid ""
+"LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
+"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows "
+"error.\n"
+"This caution does not apply to Windows 95 or 98, or to NT data disks.\n"
+"\n"
+"Assign a new Volume ID?"
+msgstr ""
+
+#: any.pm:138
+#, c-format
+msgid "Installation of bootloader failed. The following error occurred:"
+msgstr ""
+"Операцион тизим юклагичини ўрнатиш муваффақиятсиз тугади. Қуйидаги хато рўй "
+"берди:"
+
+#: any.pm:144
+#, c-format
+msgid ""
+"You may need to change your Open Firmware boot-device to\n"
+" enable the bootloader.  If you don't see the bootloader prompt at\n"
+" reboot, hold down Command-Option-O-F at reboot and enter:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" Then type: shut-down\n"
+"At your next boot you should see the bootloader prompt."
+msgstr ""
 
-#: any.pm:142
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -712,274 +770,259 @@ msgid ""
 "On which drive are you booting?"
 msgstr ""
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:204 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Дискнинг биринчи сектори (MRB)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Туб қисмининг биринчи сектори"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "Дискетга"
 
-#: any.pm:170 help.pm:768 help.pm:800 printer/printerdrake.pm:3418
+#: any.pm:209 help.pm:739 printer/printerdrake.pm:3603
 #, c-format
 msgid "Skip"
 msgstr "Ўтказиб юбориш"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "SILO дастурини ўрнатиш"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LILO/grub дастурини ўрнатиш"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
-msgstr "Операцион система юклагичини қаерга ўрнатмоқчисиз?"
-
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "Дискнинг юклаш қисмининг биринчи сектори"
+msgstr "Операцион тизим юклагичини қаерга ўрнатмоқчисиз?"
 
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Тизимни юкаш услубини мослаш"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
-msgstr "Операцион система юклагичининг асосий параметрлари"
+msgstr "Операцион тизим юклагичининг асосий параметрлари"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "RAM'нинг ҳажмини киритинг (Мб)"
 
-#: any.pm:217
+#: any.pm:247
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: any.pm:218 any.pm:531 install_steps_interactive.pm:1150
+#: any.pm:248 any.pm:586 install_steps_interactive.pm:1215
 #, c-format
 msgid "The passwords do not match"
 msgstr "Махфий сўзлар мос келмайди"
 
-#: any.pm:218 any.pm:531 diskdrake/interactive.pm:1262
-#: install_steps_interactive.pm:1150
+#: any.pm:248 any.pm:586 diskdrake/interactive.pm:1261
+#: install_steps_interactive.pm:1215
 #, c-format
 msgid "Please try again"
 msgstr "Илтимос яна уриниб кўринг"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
-msgstr "ОС юклагичи"
-
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "OС юклагичини ўрнатиш"
+msgstr "ОТ юклагичи"
 
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "Тизимни юклаш ускунаси"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Андоза тасвирни юклашдан олдин кутиш вақти"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "ACPI'ни ёқиш"
 
-#: any.pm:232 help.pm:768
+#: any.pm:260
 #, c-format
 msgid "Force no APIC"
 msgstr "APIC'ни тақиқлаш"
 
-#: any.pm:234
+#: any.pm:262
 #, c-format
 msgid "Force No Local APIC"
 msgstr ""
 
-#: any.pm:236 any.pm:558 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1155 network/netconnect.pm:574
-#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1494
-#: standalone/drakbackup:1626 standalone/drakbackup:3496
-#: standalone/drakups:278
+#: any.pm:264 any.pm:613 diskdrake/smbnfs_gtk.pm:180
+#: install_steps_interactive.pm:1220 network/netconnect.pm:595
+#: printer/printerdrake.pm:1489 printer/printerdrake.pm:1609
+#: standalone/drakbackup:1647 standalone/drakbackup:3490
+#: standalone/drakups:295
 #, c-format
 msgid "Password"
 msgstr "Махфий сўз"
 
-#: any.pm:237 any.pm:559 install_steps_interactive.pm:1156
+#: any.pm:265 any.pm:614 install_steps_interactive.pm:1221
 #, c-format
 msgid "Password (again)"
 msgstr "Махфий сўз (яна)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "чегаралаш"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Тизимни юклашда /tmp директориясини бўшатиш"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Керак бўлса, RAM'нинг аниқ ҳажми (%d Мб топилди)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr ""
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr ""
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
 msgstr ""
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr ""
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr ""
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
 msgstr ""
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
-msgstr "Андоза ОС?"
+msgstr "Андоза ОТ?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
-msgstr "Тасвир"
+msgstr "Расм"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "Дискнинг туб қисми"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr ""
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "Видео усули"
 
-#: any.pm:308
+#: any.pm:344
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:317 any.pm:322 any.pm:324
+#: any.pm:345
+#, c-format
+msgid "Network profile"
+msgstr "Тармоқнинг профили"
+
+#: any.pm:354 any.pm:359 any.pm:361
 #, c-format
 msgid "Label"
 msgstr "Белги"
 
-#: any.pm:319 any.pm:329 harddrake/v4l.pm:275 standalone/drakfloppy:89
-#: standalone/drakfloppy:95
+#: any.pm:356 any.pm:366 harddrake/v4l.pm:275 standalone/drakfloppy:84
+#: standalone/drakfloppy:90 standalone/draksec:52
 #, c-format
 msgid "Default"
 msgstr "Андоза"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrd'нинг ҳажми"
 
-#: any.pm:328
+#: any.pm:365
 #, c-format
 msgid "NoVideo"
 msgstr "Видеосиз"
 
-#: any.pm:339
+#: any.pm:376
 #, c-format
 msgid "Empty label not allowed"
 msgstr "Бўш белгини ишлатиш мумкин эмас"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Кернелнинг тасвирини кўрсатишингиз керак."
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Дискнинг туб қисмини киритишингиз шарт"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
 msgstr "Белги аллақачон ишлатилган"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Банднинг қайси турини қўшмоқчисиз?"
 
-#: any.pm:355
+#: any.pm:393
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:355
+#: any.pm:393
 #, c-format
 msgid "Other OS (SunOS...)"
-msgstr "Бошқа ОС (SunOS...)"
+msgstr "Бошқа ОТ (SunOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
-msgstr "Бошқа ОС (MacOS...)"
+msgstr "Бошқа ОТ (MacOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Бошқа ОТ (Windows...)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -989,52 +1032,52 @@ msgstr ""
 "Қўшимча бандлар яратишингиз ёки мавжуд бўлган бандларни ўзгартиришингиз "
 "мумкин."
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
 msgstr "Х дастурларидан фойдаланишга рухсат этиш"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr "RPM воситаларидан фойдаланишга рухсат этиш"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr "\"su\" буйруғидан фойдаланишга рухсат этиш"
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
 msgstr "бошқарув файлларига рухсат"
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
 msgstr "тармоқ воситалардан фойдаланишни рухсат этиш"
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
 msgstr ""
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s аллақачон қўшилган)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "Бу махфий сўз жуда оддий"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "Илтимос фойдаланувчининг исмини киритинг"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -1042,22 +1085,22 @@ msgstr ""
 "Фойдаланувчининг исми фақат кичкина ҳарф, сон, \"-\" ва \"_\" белгиларидан "
 "иборат бўлиши шарт"
 
-#: any.pm:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
 msgstr "Фойдаланувчининг исми жуда узун"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "Фойдаланувчининг исми аллақачон қўшилган"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "Фойдаланувчини қўшиш"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1066,75 +1109,78 @@ msgstr ""
 "Фойдаланувчини киритинг\n"
 "%s"
 
-#: any.pm:544 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158
-#: diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:544
-#: interactive/http.pm:152 printer/printerdrake.pm:165
-#: printer/printerdrake.pm:352 printer/printerdrake.pm:4076
-#: standalone/drakbackup:2708 standalone/scannerdrake:641
-#: standalone/scannerdrake:791
+#: any.pm:599 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
+#: diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530
+#: interactive/http.pm:151 printer/printerdrake.pm:191
+#: printer/printerdrake.pm:376 printer/printerdrake.pm:4382
+#: standalone/drakbackup:2703 standalone/scannerdrake:637
+#: standalone/scannerdrake:787
 #, c-format
 msgid "Done"
 msgstr "Тайёр"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Қабул қилиш"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "Фойдаланувчининг ҳақиқий исми-шарифи"
 
-#: any.pm:557 help.pm:52 printer/printerdrake.pm:1373
-#: printer/printerdrake.pm:1493
+#: any.pm:612 standalone/drakbackup:1642
 #, c-format
-msgid "User name"
+msgid "Login name"
 msgstr "Фойдаланувчи"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "Консол"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "Нишонча"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Тизимга автоматик равишда кириш"
 
-#: any.pm:604
+#: any.pm:665
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
-"Мен компьютерингизни системага битта фойдаланувчи автоматик равишда киришга "
-"мослашим мумкин."
+"Компьютерни битта фойдаланувчи автоматик равишда киришга мослаш мумкин."
 
-#: any.pm:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Бу қулайликдан фойдаланишни истайсизми?"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
 msgstr "Андоза фойдаланувчини танланг:"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Ойналар бошқарувчисини танланг:"
 
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Илтимос фойдаланиш учун тилни танланг."
 
-#: any.pm:640
+#: any.pm:681
+#, c-format
+msgid "Language choice"
+msgstr "Тилни танлаш"
+
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1142,48 +1188,57 @@ msgid ""
 "when your installation is complete and you restart your system."
 msgstr ""
 
-#: any.pm:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Андоза сифатида Юникоддан фойдаланиш"
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Ҳамма тиллар"
 
-#: any.pm:698 help.pm:581 help.pm:991 install_steps_interactive.pm:895
+#: any.pm:765 help.pm:566 help.pm:855 install_steps_interactive.pm:960
 #, c-format
 msgid "Country / Region"
 msgstr "Давлат / Регион"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
 msgstr "Давлатингизни танланг."
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Мавжуд бўлган давлатларнинг тўлиқ рўйхати"
 
-#: any.pm:702 diskdrake/interactive.pm:297 help.pm:544 help.pm:581 help.pm:621
-#: help.pm:991 install_steps_interactive.pm:114
+#: any.pm:769
 #, c-format
-msgid "More"
-msgstr "Кўпроқ"
+msgid "Other Countries"
+msgstr "Бошқа давлатлар"
+
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "Киритиш усули:"
+
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "Йўқ"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr ""
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "Ҳамма фойдаланувчиларга рухсат"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1193,21 +1248,21 @@ msgid ""
 "\"Custom\" permit a per-user granularity.\n"
 msgstr ""
 
-#: any.pm:849
+#: any.pm:928
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr ""
 
-#: any.pm:852
+#: any.pm:931
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
 "systems."
 msgstr ""
 
-#: any.pm:860
+#: any.pm:939
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
@@ -1215,104 +1270,213 @@ msgstr ""
 "Сиз NFS ёки Samba ёрдамида экспорт қилишингиз мумкин. Илтимос биттасини "
 "танланг."
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr "Userdrake дастурини ишга тушириш"
 
-#: any.pm:885
+#: any.pm:964 printer/printerdrake.pm:3478 printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3482 printer/printerdrake.pm:3483
+#: printer/printerdrake.pm:4676 standalone/drakTermServ:289
+#: standalone/drakbackup:4084 standalone/drakbug:151 standalone/drakfont:500
+#: standalone/drakfont:594 standalone/net_monitor:123
+#: standalone/printerdrake:559
+#, c-format
+msgid "Close"
+msgstr "Ёпиш"
+
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
 "You can use userdrake to add a user to this group."
 msgstr ""
 
-#: authentication.pm:12
+#: authentication.pm:16
 #, c-format
-msgid "Local files"
-msgstr "Локал файллар"
+msgid "Local file"
+msgstr "Локал файл"
 
-#: authentication.pm:12
+#: authentication.pm:17
 #, c-format
 msgid "LDAP"
 msgstr "LDAP"
 
-#: authentication.pm:12
+#: authentication.pm:18
 #, c-format
 msgid "NIS"
 msgstr "NIS"
 
-#: authentication.pm:12 authentication.pm:72
+#: authentication.pm:19 authentication.pm:127
 #, c-format
 msgid "Windows Domain"
 msgstr ""
 
-#: authentication.pm:12
+#: authentication.pm:20
+#, c-format
+msgid "Active Directory with SFU"
+msgstr ""
+
+#: authentication.pm:21
+#, c-format
+msgid "Active Directory with Winbind"
+msgstr ""
+
+#: authentication.pm:30
+#, c-format
+msgid "Local file:"
+msgstr "Локал файл:"
+
+#: authentication.pm:30
+#, c-format
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+
+#: authentication.pm:31
+#, c-format
+msgid "LDAP:"
+msgstr "LDAP:"
+
+#: authentication.pm:31
+#, c-format
+msgid ""
+"Tells your computer to use LDAP for some or all authentication. LDAP "
+"consolidates certain types of information within your organization."
+msgstr ""
+
+#: authentication.pm:32
+#, c-format
+msgid "NIS:"
+msgstr "NIS:"
+
+#: authentication.pm:32
+#, c-format
+msgid ""
+"Allows you to run a group of computers in the same Network Information "
+"Service domain with a common password and group file."
+msgstr ""
+
+#: authentication.pm:33
+#, c-format
+msgid "Windows Domain:"
+msgstr "Windows домени:"
+
+#: authentication.pm:33
+#, c-format
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
+msgstr ""
+
+#: authentication.pm:34
 #, c-format
-msgid "Active Directory"
+msgid "Active Directory with SFU:"
 msgstr ""
 
-#: authentication.pm:38
+#: authentication.pm:34 authentication.pm:35
+#, c-format
+msgid ""
+"Kerberos is a secure system for providing network authentication services."
+msgstr ""
+
+#: authentication.pm:35
+#, c-format
+msgid "Active Directory with Winbind:"
+msgstr ""
+
+#: authentication.pm:60
 #, c-format
 msgid "Authentication LDAP"
 msgstr "Тасдиқловчи LDAP"
 
-#: authentication.pm:39
-#, c-format
+#: authentication.pm:61
+#, fuzzy, c-format
 msgid "LDAP Base dn"
-msgstr ""
+msgstr "LDAP махфий сўз:"
 
-#: authentication.pm:40
+#: authentication.pm:62 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "LDAP сервери"
 
-#: authentication.pm:50
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "осон"
+
+#: authentication.pm:76
+#, c-format
+msgid "TLS"
+msgstr "TLS"
+
+#: authentication.pm:77
+#, c-format
+msgid "SSL"
+msgstr ""
+
+#: authentication.pm:78
+#, c-format
+msgid "security layout (SASL/Kerberos)"
+msgstr ""
+
+#: authentication.pm:85 authentication.pm:123
 #, c-format
 msgid "Authentication Active Directory"
 msgstr ""
 
-#: authentication.pm:51 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "Домен"
 
-#: authentication.pm:52 diskdrake/dav.pm:65 help.pm:137
+#: authentication.pm:88 diskdrake/dav.pm:63 help.pm:146
+#: printer/printerdrake.pm:135 share/compssUsers.pl:81
 #, c-format
 msgid "Server"
 msgstr "Сервер"
 
-#: authentication.pm:53
-#, c-format
+#: authentication.pm:89
+#, fuzzy, c-format
 msgid "LDAP users database"
+msgstr "Маълумот базаси"
+
+#: authentication.pm:90
+#, c-format
+msgid "Use Anonymous BIND "
 msgstr ""
 
-#: authentication.pm:54
+#: authentication.pm:91
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
 msgstr ""
 
-#: authentication.pm:55
+#: authentication.pm:92
 #, c-format
 msgid "Password for user"
 msgstr "Фойдаланувчи учун махфий сўз"
 
-#: authentication.pm:62
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "Кодлаш"
+
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
 msgstr "Тасдиқловчи NIS"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
 msgstr "NIS домени"
 
-#: authentication.pm:64
+#: authentication.pm:106
 #, c-format
 msgid "NIS Server"
 msgstr "NIS сервери"
 
-#: authentication.pm:69
+#: authentication.pm:111
 #, c-format
 msgid ""
 "For this to work for a W2K PDC, you will probably need to have the admin "
@@ -1329,28 +1493,38 @@ msgid ""
 "good."
 msgstr ""
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr ""
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
 msgstr ""
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr ""
 
-#: authentication.pm:149
+#: authentication.pm:130
+#, c-format
+msgid "Use Idmap for store UID/SID "
+msgstr ""
+
+#: authentication.pm:131
+#, c-format
+msgid "Default Idmap "
+msgstr "Андоза Idmap "
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:532
+#: bootloader.pm:673
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1359,65 +1533,60 @@ msgid ""
 "wait for default boot.\n"
 "\n"
 msgstr ""
-"Operasion sistemani tanlash dasturiga marhamat!\n"
+"Operatsion tizimni tanlash dasturiga marhamat!\n"
 "\n"
-"Yuqoridagi ro'yxatdan operasion sistemani tanlang\n"
+"Yuqoridagi ro'yxatdan operasion tizimni tanlang\n"
 "yoki andoza uchun kutib turing.\n"
 "\n"
 
-#: bootloader.pm:663
-#, c-format
-msgid "SILO"
-msgstr "SILO"
-
-#: bootloader.pm:665 help.pm:768
+#: bootloader.pm:787
 #, c-format
 msgid "LILO with graphical menu"
 msgstr "LILO (график меню)"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO (матн меню)"
 
-#: bootloader.pm:668
+#: bootloader.pm:789
 #, c-format
 msgid "Grub"
 msgstr "Grub"
 
-#: bootloader.pm:670
+#: bootloader.pm:790
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1142
+#: bootloader.pm:852
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot директориясида етарли жой йўқ"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
-msgstr "Операцион система юклагичини дискнинг %s қисмига ўрнатолмайсиз\n"
+msgstr "Операцион тизим юклагичини дискнинг %s қисмига ўрнатиб бўлмайди\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr ""
 
-#: bootloader.pm:1222
+#: bootloader.pm:1327
 #, c-format
 msgid "Re-install Boot Loader"
-msgstr "ОС юклагичини қайтадан ўрнатиш"
+msgstr "ОТ юклагичини қайтадан ўрнатиш"
 
 #: common.pm:125
 #, c-format
@@ -1474,76 +1643,79 @@ msgstr "kdesu дастури етишмаяпти"
 msgid "consolehelper missing"
 msgstr "consolehelper дастури етишмаяпти"
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:240 network/adsl_consts.pm:44
-#: network/adsl_consts.pm:55 network/adsl_consts.pm:65
-#: network/adsl_consts.pm:75 network/adsl_consts.pm:86
-#: network/adsl_consts.pm:97 network/adsl_consts.pm:107
-#: network/adsl_consts.pm:117 network/adsl_consts.pm:264
-#: network/netconnect.pm:46
+#: crypto.pm:14 crypto.pm:28 lang.pm:254 network/adsl_consts.pm:309
+#: network/adsl_consts.pm:320 network/adsl_consts.pm:330
+#: network/adsl_consts.pm:340 network/adsl_consts.pm:350
+#: network/adsl_consts.pm:361 network/adsl_consts.pm:372
+#: network/adsl_consts.pm:382 network/adsl_consts.pm:392
+#: network/netconnect.pm:47
 #, c-format
 msgid "France"
 msgstr "Франция"
 
-#: crypto.pm:15 lang.pm:216
+#: crypto.pm:15 lang.pm:229
 #, c-format
 msgid "Costa Rica"
 msgstr "Коста Рика"
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:188 network/adsl_consts.pm:26
-#: network/adsl_consts.pm:36 network/netconnect.pm:49
+#: crypto.pm:16 crypto.pm:29 lang.pm:201 network/adsl_consts.pm:59
+#: network/adsl_consts.pm:66 network/adsl_consts.pm:77
+#: network/adsl_consts.pm:85 network/netconnect.pm:50
 #, c-format
 msgid "Belgium"
 msgstr "Белгия"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:221
+#: crypto.pm:17 crypto.pm:30 lang.pm:235
 #, c-format
 msgid "Czech Republic"
 msgstr "Чех Республикаси"
 
-#: crypto.pm:18 crypto.pm:31 lang.pm:222 network/adsl_consts.pm:134
-#: network/adsl_consts.pm:142
+#: crypto.pm:18 crypto.pm:31 lang.pm:236 network/adsl_consts.pm:410
+#: network/adsl_consts.pm:418
 #, c-format
 msgid "Germany"
 msgstr "Олмония"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:253
+#: crypto.pm:19 crypto.pm:32 lang.pm:267 network/adsl_consts.pm:428
 #, c-format
 msgid "Greece"
 msgstr "Греция"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:326
+#: crypto.pm:20 crypto.pm:33 lang.pm:340
 #, c-format
 msgid "Norway"
 msgstr "Норвегия"
 
-#: crypto.pm:21 crypto.pm:34 lang.pm:355 network/adsl_consts.pm:240
+#: crypto.pm:21 crypto.pm:34 lang.pm:369 network/adsl_consts.pm:561
 #, c-format
 msgid "Sweden"
 msgstr "Швеция"
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:325 network/adsl_consts.pm:178
-#: network/netconnect.pm:47
+#: crypto.pm:22 crypto.pm:36 lang.pm:339 network/adsl_consts.pm:495
+#: network/netconnect.pm:48
 #, c-format
 msgid "Netherlands"
 msgstr "Нидерландлар"
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:273 network/adsl_consts.pm:158
-#: network/adsl_consts.pm:168 network/netconnect.pm:48 standalone/drakxtv:45
+#: crypto.pm:23 crypto.pm:37 lang.pm:287 network/adsl_consts.pm:452
+#: network/adsl_consts.pm:462 network/adsl_consts.pm:469
+#: network/netconnect.pm:49 standalone/drakxtv:47
 #, c-format
 msgid "Italy"
 msgstr "Италия"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:181 network/adsl_consts.pm:20
+#: crypto.pm:24 crypto.pm:38 lang.pm:194 network/adsl_consts.pm:36
+#: network/adsl_consts.pm:44 network/adsl_consts.pm:52
 #, c-format
 msgid "Austria"
 msgstr "Австрия"
 
-#: crypto.pm:35 crypto.pm:65 lang.pm:389 network/netconnect.pm:50
+#: crypto.pm:35 crypto.pm:65 lang.pm:403 network/netconnect.pm:51
 #, c-format
 msgid "United States"
 msgstr "Қўшма Штатлар"
 
-#: diskdrake/dav.pm:19
+#: diskdrake/dav.pm:17
 #, c-format
 msgid ""
 "WebDAV is a protocol that allows you to mount a web server's directory\n"
@@ -1552,66 +1724,60 @@ msgid ""
 "points, select \"New\"."
 msgstr ""
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "Янги"
 
-#: diskdrake/dav.pm:63 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:425 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "Узиш"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:419 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "Улаш"
 
-#: diskdrake/dav.pm:66 diskdrake/interactive.pm:413
-#: diskdrake/interactive.pm:621 diskdrake/interactive.pm:640
-#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:79
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:416
+#: diskdrake/interactive.pm:627 diskdrake/interactive.pm:646
+#: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "Улаш нуқтаси"
 
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "Илтимос WebDAV серверининг URL'ини киритинг"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr "URL http:// ёки https:// билан бошланиши шарт"
 
-#: diskdrake/dav.pm:111
+#: diskdrake/dav.pm:109
 #, c-format
 msgid "Server: "
 msgstr "Сервер: "
 
-#: diskdrake/dav.pm:112 diskdrake/interactive.pm:474
-#: diskdrake/interactive.pm:1154 diskdrake/interactive.pm:1232
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:479
+#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1232
 #, c-format
 msgid "Mount point: "
 msgstr "Улаш нуқтаси: "
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Options: %s"
 msgstr "Параметрлар: %s"
 
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "Диққат билан ўқинг!"
-
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "Илтимос аввало маълумотларингиздан заҳира нусха олинг"
 
-#: diskdrake/hd_gtk.pm:99
+#: diskdrake/hd_gtk.pm:98
 #, c-format
 msgid ""
 "If you plan to use aboot, be careful to leave a free space (2048 sectors is "
@@ -1622,17 +1788,17 @@ msgstr ""
 "сектор етади)\n"
 "қолдириш эсингиздан чиқмасин"
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "Ёрдамчи"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "Амални танланг"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1643,241 +1809,247 @@ msgstr ""
 "Аввало, унинг ҳажмини ўзгартиришни таклиф қиламан\n"
 "(уни босинг кейин \"Ҳажмини ўгартириш\" тугмасини босинг)."
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "Илтимос дискнинг қисмини босинг"
 
-#: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:477
-#: standalone/drakbackup:2942 standalone/drakbackup:3004
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:474
+#: standalone/drakbackup:2938 standalone/drakbackup:2998
 #, c-format
 msgid "Details"
 msgstr "Тафсилотлар"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "Қаттиқ дисклар топилмади"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Ext2"
 msgstr "Ехт2"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Journalised FS"
 msgstr "Журналли ФС"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
 msgstr "Своп"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "SunOS"
 msgstr "SunOS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "HFS"
 msgstr "HFS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:329 mouse.pm:167
-#: services.pm:164 standalone/drakbackup:1582 standalone/drakperm:254
+#: diskdrake/hd_gtk.pm:326 install_steps_gtk.pm:298 mouse.pm:168
+#: services.pm:164 standalone/drakbackup:1603 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr "Бошқа"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
 msgstr "Бўш"
 
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
-msgstr "Файл системанинг турлари:"
+msgstr "Файл тизимнинг турлари:"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:350 diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:349 diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Бунинг ўрнига \"%s\"ни ишлатинг"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:353
-#: diskdrake/interactive.pm:414 diskdrake/interactive.pm:574
-#: diskdrake/removable.pm:26 diskdrake/removable.pm:49
-#: standalone/harddrake2:72
+#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:352
+#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:580
+#: diskdrake/removable.pm:25 diskdrake/removable.pm:48
+#: standalone/harddrake2:101
 #, c-format
 msgid "Type"
 msgstr "Тури"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
 #, c-format
 msgid "Create"
 msgstr "Яратиш"
 
 #. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: diskdrake/hd_gtk.pm:350 diskdrake/interactive.pm:423
-#: standalone/drakperm:124 standalone/printerdrake:236
+#: diskdrake/hd_gtk.pm:349 diskdrake/interactive.pm:426
+#: standalone/drakperm:124 standalone/printerdrake:242
 #, c-format
 msgid "Delete"
 msgstr "Ўчириш"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "Аввало \"Unmount\"ни ишлатинг"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "Дискнинг бошқа қисмини танлаш"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
 msgstr "Дискнинг қисмини танлаш"
 
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, c-format
 msgid "Exit"
 msgstr "Чиқиш"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
-msgstr "Амални бекор қилиш"
+msgstr "Бекор қилиш"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "Одий усулига ўтиш"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "Эксперт усулига ўтиш"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
-msgstr "Бунга қарамасдан давом этайми?"
+msgstr "Бунга қарамасдан давом этишни истайсизми?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "Сақламасдан чиқиш"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "Дискнинг қисмлар жадвалини сақламасдан чиқайми?"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "/etc/fstab файлига киритилган ўзгаришларни сақлашни истайсизми?"
 
-#: diskdrake/interactive.pm:282 install_steps_interactive.pm:301
+#: diskdrake/interactive.pm:285 install_steps_interactive.pm:313
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "Дискнинг қисмлар жадвалига киритилган ўзгаришлар кучга кириши учун "
 "компьютерни ўчириб-ёқишингиз керак."
 
-#: diskdrake/interactive.pm:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "Ҳаммасини тозалаш"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "Авто-тақсимлаш"
 
-#: diskdrake/interactive.pm:302
+#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:124
+#, c-format
+msgid "More"
+msgstr "Кўпроқ"
+
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
 msgstr "Қаттиқ диск ҳақида маълумот"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "Дискнинг ҳамма асосий қисмлари ишлатилмоқда"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
 msgstr "Бошқа қисм қўшиб бўлмайди"
 
-#: diskdrake/interactive.pm:336
+#: diskdrake/interactive.pm:339
 #, c-format
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr "Дискда кенгайтирилган қисм яратиш учун илтимос битта қисмни ўчиринг"
 
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "Дискнинг қисмлар жадвалини сақлаш"
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Дискнинг қисмлар жадвалини қайтадан тиклаш"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr ""
 
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "Дискнинг қисмлар жадвалини қайтадан юклаш"
 
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
 msgstr ""
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "Файлни танлаш"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
 
-#: diskdrake/interactive.pm:383 harddrake/sound.pm:226 keyboard.pm:340
-#: network/netconnect.pm:450 network/netconnect.pm:469
-#: printer/printerdrake.pm:936 printer/printerdrake.pm:1891
-#: printer/printerdrake.pm:1953 printer/printerdrake.pm:1987
-#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3149
-#: printer/printerdrake.pm:3426 printer/printerdrake.pm:3545
-#: printer/printerdrake.pm:4543 standalone/drakTermServ:340
-#: standalone/drakTermServ:1072 standalone/drakTermServ:1128
-#: standalone/drakTermServ:1801 standalone/drakbackup:510
-#: standalone/drakbackup:609 standalone/drakboot:156 standalone/drakclock:214
-#: standalone/drakconnect:921 standalone/drakfloppy:296 standalone/drakups:27
-#: standalone/scannerdrake:50 standalone/scannerdrake:913
+#: diskdrake/interactive.pm:386 harddrake/sound.pm:246 keyboard.pm:351
+#: lang.pm:1046 network/netconnect.pm:470 printer/printerdrake.pm:1037
+#: printer/printerdrake.pm:2009 printer/printerdrake.pm:2075
+#: printer/printerdrake.pm:2110 printer/printerdrake.pm:2414
+#: printer/printerdrake.pm:3330 printer/printerdrake.pm:3611
+#: printer/printerdrake.pm:3733 printer/printerdrake.pm:4823
+#: standalone/drakTermServ:315 standalone/drakTermServ:1045
+#: standalone/drakTermServ:1101 standalone/drakTermServ:1769
+#: standalone/drakbackup:511 standalone/drakbackup:610 standalone/drakboot:165
+#: standalone/drakclock:225 standalone/drakconnect:972
+#: standalone/drakfloppy:291 standalone/drakups:27 standalone/scannerdrake:51
+#: standalone/scannerdrake:909
 #, c-format
 msgid "Warning"
 msgstr "Диққат"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -1886,92 +2058,92 @@ msgstr ""
 "Дискетни ускунага қўйинг.\n"
 "Ундаги ҳамма маълумот йўқолади."
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr ""
 
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, c-format
 msgid "Detailed information"
 msgstr "Батафсил маълумот"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
 msgstr "Ҳажмини ўзгартириш"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "Кўчириш"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "Формат қилиш"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
 msgstr "RAID'га қўшиш"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "LVM'га қўшиш"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "RAID'дан олиб ташлаш"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "LVM'дан олиб ташлаш"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID'ни ўзгартириш"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "Loopback учун ишлатиш"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "Дискда янги қисм яратиш"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "Бошланғич сектор: "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "Ҳажми (Мб): "
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
-msgstr "Файл системанинг тури: "
+msgstr "Файл тизимнинг тури: "
 
-#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
 #, c-format
 msgid "Preference: "
 msgstr "Афзал кўриш: "
 
-#: diskdrake/interactive.pm:481
+#: diskdrake/interactive.pm:486
 #, c-format
 msgid "Logical volume name "
 msgstr ""
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -1983,12 +2155,12 @@ msgstr ""
 "Аввало дискнинг асосий қисмини олиб таншланг кейин дискнинг кенгайтирилган "
 "қисмини яратинг."
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "Loopback файлини олиб ташлайми?"
 
-#: diskdrake/interactive.pm:559
+#: diskdrake/interactive.pm:564
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
@@ -1996,230 +2168,225 @@ msgstr ""
 "Дискнинг %s қисмининг турини ўзгартиришдан кейин ундаги ҳамма маълумот "
 "йўқолади"
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "Дискнинг қисмининг турини ўзгартириш"
 
-#: diskdrake/interactive.pm:571 diskdrake/removable.pm:48
+#: diskdrake/interactive.pm:577 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "Сизга қанақа файл тизими керак?"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "Ext2 файл тизимидан ext3 файл тизимига ўтилмоқда"
 
-#: diskdrake/interactive.pm:608
+#: diskdrake/interactive.pm:614
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "%s loopback файлини қаерга уламоқчисиз?"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "%s ускунани қаерга уламоқчисиз?"
 
-#: diskdrake/interactive.pm:614
+#: diskdrake/interactive.pm:620
 #, c-format
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Дискнинг %s қисмини қаерга уламоқчисиз?"
 
-#: diskdrake/interactive.pm:663 diskdrake/interactive.pm:743
-#: install_interactive.pm:156 install_interactive.pm:186
+#: diskdrake/interactive.pm:669 diskdrake/interactive.pm:748
+#: install_interactive.pm:156 install_interactive.pm:188
 #, c-format
 msgid "Resizing"
 msgstr "Ҳажм ўзгартирилмоқда"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "FAT файл тизимининг боғлари ҳисобланмоқда"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "Дискнинг бу қисмининг ҳажмини ўзгартириб бўлмайди"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr ""
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "Дискнинг %s қисмининг ҳажмини ўзгартиргандан кейин у ердаги ҳамма маълумот "
 "йўқолади"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "Янги ҳажмни танланг"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
 msgstr "Янги ҳажм (Мб): "
 
-#: diskdrake/interactive.pm:756 install_interactive.pm:194
+#: diskdrake/interactive.pm:761 install_interactive.pm:196
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
 "filesystem checks will be run on your next boot into Windows(TM)"
 msgstr ""
 
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:784
 #, c-format
 msgid "Which disk do you want to move it to?"
 msgstr "Буни қайси дискга кўчирмоқчисиз?"
 
-#: diskdrake/interactive.pm:781
+#: diskdrake/interactive.pm:785
 #, c-format
 msgid "Sector"
 msgstr "Сектор"
 
-#: diskdrake/interactive.pm:782
+#: diskdrake/interactive.pm:786
 #, c-format
 msgid "Which sector do you want to move it to?"
 msgstr "Буни қайси секторга кўчирмоқчисиз?"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "Кўчирилмоқда"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "Дискнинг қисми кўчирилмоқда..."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Қўшиш учун мавжуд бўлган RAID'ни танланг"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "янги"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "Қўшиш учун мавжуд бўлган LVM'ни танланг"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
 msgstr "LVM номи?"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
 msgstr "Дискнинг бу қисмини loopback учун ишлатиб бўлмайди"
 
-#: diskdrake/interactive.pm:879
+#: diskdrake/interactive.pm:882
 #, c-format
 msgid "Loopback"
 msgstr "Loopback"
 
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:883
 #, c-format
 msgid "Loopback file name: "
 msgstr "Loopback файлининг номи:"
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
 msgstr "Файлнинг номини киритинг"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "Фйлни бошқа loopback ишлатаяпти, бошқасини танланг"
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "Файл аллақачон мавжуд. Ишлатайми?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
 msgstr "Улаш параметрлари"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
 msgstr "Ҳар хил"
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
 msgstr "ускуна"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "даража"
 
-#: diskdrake/interactive.pm:985
-#, c-format
-msgid "chunk size"
-msgstr ""
+#: diskdrake/interactive.pm:989
+#, fuzzy, c-format
+msgid "chunk size in KiB"
+msgstr "Янги ҳажм (Мб): "
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Эҳтиёт бўлинг: бу операция хавфли."
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Дискни қисмларга бўлишнинг қайси тури?"
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "%s пакети керак. Уни ўрнатайми?"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Ўзгаришлар амалда қўлланилиши учун компьютерни ўчириб-ёқиш керак"
 
-#: diskdrake/interactive.pm:1070
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "%s дискининг қисмлар жадвали дискга сақланиш арафасида!"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "Дискнинг %s қисми формат қилгандан кейин у ердаги ҳамма маълумот йўқолади"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Файлларни дискнинг янги қисмига кўчириш"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
 msgstr "Файлларни яшириш"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2228,53 +2395,53 @@ msgstr ""
 "Директорияда (%s) аллақачон маълумот бор\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "Файллар дискнинг янги қисмига кўчирилмоқда"
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
 msgstr "%s'дан нусха кўчирилмоқда"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, c-format
 msgid "Removing %s"
 msgstr "%s олиб ташланмоқда"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "дискнинг %s қисми энди %s сифатида маълум"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "Ускуна: "
 
-#: diskdrake/interactive.pm:1156
+#: diskdrake/interactive.pm:1157
 #, c-format
 msgid "Devfs name: "
 msgstr "Devfs номи: "
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1158
 #, c-format
 msgid "Volume label: "
 msgstr ""
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1159
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS дискининг ҳарфи: %s (таваккалига)\n"
 
-#: diskdrake/interactive.pm:1162 diskdrake/interactive.pm:1170
-#: diskdrake/interactive.pm:1236
+#: diskdrake/interactive.pm:1163 diskdrake/interactive.pm:1170
+#: diskdrake/interactive.pm:1235
 #, c-format
 msgid "Type: "
 msgstr "Тури: "
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "Номи: "
@@ -2321,8 +2488,8 @@ msgstr "Уланган\n"
 
 #: diskdrake/interactive.pm:1184
 #, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+msgid "RAID %s\n"
+msgstr "RAID %s\n"
 
 #: diskdrake/interactive.pm:1186
 #, c-format
@@ -2347,7 +2514,7 @@ msgstr "%s даража\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
+msgid "Chunk size %d KiB\n"
 msgstr ""
 
 #: diskdrake/interactive.pm:1191
@@ -2417,38 +2584,38 @@ msgstr "Диск қисмлар жадвалининг тури: %s\n"
 msgid "on channel %d id %d\n"
 msgstr ""
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, c-format
 msgid "Filesystem encryption key"
-msgstr "Файл системанинг кодлаш калити"
+msgstr "Файл тизимнинг кодлаш калити"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
-msgstr "Файл системангизнинг кодлаш калитини танланг"
+msgstr "Файл тизимнгизнинг кодлаш калитини танланг"
 
-#: diskdrake/interactive.pm:1261
+#: diskdrake/interactive.pm:1260
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "Кодлаш калити жуда содда (у энг ками %d белгидан иборат бўлиши шарт)"
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Кодлаш калитлари мос келмайди"
 
-#: diskdrake/interactive.pm:1265 network/netconnect.pm:979
-#: standalone/drakconnect:404
+#: diskdrake/interactive.pm:1264 network/netconnect.pm:1040
+#: standalone/drakconnect:395
 #, c-format
 msgid "Encryption key"
 msgstr "Кодлаш калити"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Кодлаш калити (яна)"
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "Турини ўзгартириш"
@@ -2479,7 +2646,7 @@ msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr ""
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "Фойдаланувчи"
@@ -2494,46 +2661,91 @@ msgstr "Серверларни қидириш"
 msgid "Search new servers"
 msgstr "Янги серверларни қидириш"
 
-#: do_pkgs.pm:21
+#: do_pkgs.pm:16 do_pkgs.pm:31
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "Пакет (%s) ўрнатилиши керак. Уни ўрнатишни истайсизми?"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Шарт бўлган пакет (%s) етишмаяпти"
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
 msgstr "Пакетлар ўрнатилмоқда..."
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:216
 #, c-format
 msgid "Removing packages..."
 msgstr "Пакетлар ўчирилмоқда..."
 
-#: fs.pm:416
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "Диск қисми (%s) уланмоқда"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "Диск қисмини (%s) директорияга (%s) улаш муваффақиятсиз тугади"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "%s текширилмоқда"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "%s'ни ажратишда хато: %s"
+
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "Дискнинг своп қисми (%s) ёқилмоқда"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Дискнинг қисми (%s) формат қилинмоқда"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "%s файли яратилмоқда ва формат қилинмоқда"
+
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "%s'ни %s турида қандай формат қилишни билмайман"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s турида %s'ни формат қилиш муваффақиятсиз тугади"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2541,7 +2753,7 @@ msgid ""
 "containing binaries for architectures other than its own."
 msgstr ""
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2549,17 +2761,17 @@ msgid ""
 "have suidperl(1) installed.)"
 msgstr ""
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Файл тизимларни фақат ўқишга деб улаш."
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr ""
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2570,65 +2782,28 @@ msgid ""
 "user,exec,dev,suid )."
 msgstr ""
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Оддий фойдаланувчиларга ёзиш рухсатини бериш"
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "Оддий фойдаланувчиларга фақат ўқишга рухсатини бериш"
 
-#: fs.pm:588 fs.pm:598 fs.pm:602 fs.pm:606 fs.pm:610 fs.pm:614 swap.pm:12
-#, c-format
-msgid "%s formatting of %s failed"
-msgstr "%s турида %s'ни формат қилиш муваффақиятсиз тугади"
-
-#: fs.pm:655
+#: fs/type.pm:364
 #, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "%s'ни %s турида қандай формат қилишни билмайман"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Дискнинг қисми (%s) формат қилинмоқда"
-
-#: fs.pm:666
-#, c-format
-msgid "Creating and formatting file %s"
-msgstr "%s файли яратилмоқда ва формат қилинмоқда"
-
-#: fs.pm:726 fs.pm:775
-#, c-format
-msgid "Mounting partition %s"
-msgstr "Диск қисми (%s) уланмоқда"
-
-#: fs.pm:727 fs.pm:776
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "Диск қисмини (%s) директорияга (%s) улаш муваффақиятсиз тугади"
-
-#: fs.pm:747 fs.pm:754
-#, c-format
-msgid "Checking %s"
-msgstr "%s текширилмоқда"
-
-#: fs.pm:792 partition_table.pm:639
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "%s'ни ажратишда хато: %s"
-
-#: fs.pm:824
-#, c-format
-msgid "Enabling swap partition %s"
-msgstr "Дискнинг своп қисми (%s) ёқилмоқда"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr ""
+"Ҳажми 16 Мб'дан кичик бўлган қисмлар учун JFS файл тизимини ишлатиб бўлмайди"
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr "осон"
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr ""
+"Ҳажми 32 Мб'дан кичик бўлган қисмлар учун ReiserFS файл тизимини ишлатиб "
+"бўлмайди"
 
 #: fsedit.pm:25
 #, c-format
@@ -2640,7 +2815,7 @@ msgstr "/usr билан"
 msgid "server"
 msgstr "сервер"
 
-#: fsedit.pm:263
+#: fsedit.pm:168
 #, c-format
 msgid ""
 "I can't read the partition table of device %s, it's too corrupted for me :(\n"
@@ -2651,35 +2826,22 @@ msgid ""
 "Do you agree to lose all the partitions?\n"
 msgstr ""
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr ""
-"Ҳажми 16 Мб'дан кичик бўлган қисмлар учун JFS файл тизимини ишлатиб бўлмайди"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr ""
-"Ҳажми 32 Мб'дан кичик бўлган қисмлар учун ReiserFS файл тизимини ишлатиб "
-"бўлмайди"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Улаш нуқталари \"/\" белгиси билан бошланиши шарт"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Улаш нуқталари фақат сон ёки ҳарфлардан иборат бўлиши мумкин"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "%s улаш нуқтали дискнинг қисми аллақачон мавжуд\n"
 
-#: fsedit.pm:548
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2687,12 +2849,12 @@ msgid ""
 "Please be sure to add a /boot partition"
 msgstr ""
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr ""
 
-#: fsedit.pm:553
+#: fsedit.pm:394
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -2700,19 +2862,19 @@ msgid ""
 "Please be sure to add a /boot partition"
 msgstr ""
 
-#: fsedit.pm:556
+#: fsedit.pm:397
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
 "multiple PVs)"
 msgstr ""
 
-#: fsedit.pm:559 fsedit.pm:561
+#: fsedit.pm:400 fsedit.pm:402
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Бу директория туб файл тизимида бўлиши керак"
 
-#: fsedit.pm:563 fsedit.pm:565
+#: fsedit.pm:404 fsedit.pm:406
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2721,133 +2883,127 @@ msgstr ""
 "Бу улаш нуқтаси учун ҳақиқий файл тизими (ext2/ext3, reiserfs, xfs, ёки jfs) "
 "керак\n"
 
-#: fsedit.pm:567
+#: fsedit.pm:408
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr "%s улаш нуқтаси учун кодланган файл тизимини ишлатиб бўлмайди"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Авто-тақсимлаш учун етарлича жой йўқ"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "Бажариш учун ҳеч нарса йўқ"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Ёзиш учун %s'ни очишда хато: %s"
 
-#: harddrake/data.pm:55
+#: harddrake/data.pm:61
 #, c-format
 msgid "Floppy"
 msgstr "Дискет"
 
-#: harddrake/data.pm:65
+#: harddrake/data.pm:71
 #, c-format
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:75
+#: harddrake/data.pm:81
 #, c-format
 msgid "Disk"
 msgstr "Диск"
 
-#: harddrake/data.pm:84
+#: harddrake/data.pm:90
 #, c-format
 msgid "CDROM"
 msgstr "Компакт-диск"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:100
 #, c-format
 msgid "CD/DVD burners"
 msgstr "Ёзадиган компакт-диск/DVD"
 
-#: harddrake/data.pm:104
+#: harddrake/data.pm:110
 #, c-format
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: harddrake/data.pm:114 standalone/drakbackup:2025
+#: harddrake/data.pm:120 standalone/drakbackup:2045
 #, c-format
 msgid "Tape"
 msgstr "Магнит тасма"
 
-#: harddrake/data.pm:123
+#: harddrake/data.pm:129
 #, c-format
 msgid "Videocard"
 msgstr "Видео карта"
 
-#: harddrake/data.pm:133
+#: harddrake/data.pm:139
 #, c-format
 msgid "Tvcard"
 msgstr "ТВ карта"
 
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "Бошқа мултимедиа ускуналар"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, c-format
 msgid "Soundcard"
 msgstr "Товуш картаси"
 
-#: harddrake/data.pm:160
+#: harddrake/data.pm:166
 #, c-format
 msgid "Webcam"
 msgstr "Веб-камера"
 
-#: harddrake/data.pm:174
+#: harddrake/data.pm:181
 #, c-format
 msgid "Processors"
 msgstr "Процессорлар"
 
-#: harddrake/data.pm:183
+#: harddrake/data.pm:191
 #, c-format
 msgid "ISDN adapters"
 msgstr "ISDN адаптерлар"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
 msgstr "Ethernet карта"
 
-#: harddrake/data.pm:208 network/netconnect.pm:464
+#: harddrake/data.pm:219 network/netconnect.pm:484
 #, c-format
 msgid "Modem"
 msgstr "Модем"
 
-#: harddrake/data.pm:217
+#: harddrake/data.pm:229
 #, c-format
 msgid "ADSL adapters"
 msgstr "ADSL адаптерлар"
 
-#: harddrake/data.pm:230
+#: harddrake/data.pm:243
 #, c-format
 msgid "AGP controllers"
 msgstr "AGP контроллерлар"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
-msgstr "Кўприклар ва системанинг контроллерлари"
+msgstr "Кўприклар ва тизимнинг контроллерлари"
 
-#: harddrake/data.pm:248 help.pm:203 help.pm:991
-#: install_steps_interactive.pm:927 printer/printerdrake.pm:687
-#: printer/printerdrake.pm:4175
+#: harddrake/data.pm:261 help.pm:186 help.pm:855
+#: install_steps_interactive.pm:992 printer/printerdrake.pm:875
 #, c-format
 msgid "Printer"
 msgstr "Принтер"
 
-#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
-#, c-format
-msgid "Mouse"
-msgstr "Сичқонча"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
@@ -2870,50 +3026,72 @@ msgstr "Файервол контроллерлар"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "PCMCIA контроллерлар"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr "SCSI контроллерлар"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr "USB контроллерлар"
 
-#: harddrake/data.pm:326
+#: harddrake/data.pm:339
 #, c-format
 msgid "USB ports"
 msgstr "USB портлар"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus контроллерлар"
 
-#: harddrake/data.pm:344
+#: harddrake/data.pm:357
+#, c-format
+msgid "UPS"
+msgstr "UPS"
+
+#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
+#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#, c-format
+msgid "Keyboard"
+msgstr "Тугматаг"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "Сичқонча"
+
+#: harddrake/data.pm:393
 #, c-format
 msgid "Scanner"
 msgstr "Сканнер"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
 msgstr "Номаълум/Бошқалар"
 
-#: harddrake/data.pm:374
+#: harddrake/data.pm:431
 #, c-format
 msgid "cpu # "
 msgstr "процессор # "
 
-#: harddrake/sound.pm:150 standalone/drakconnect:169
+#: harddrake/sound.pm:170 standalone/drakconnect:169
+#: standalone/drakconnect:613
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Илтимос кутиб туринг... Мосламалар қўлланилмоқда"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
 msgstr "Бошқа драйвер йўқ"
 
-#: harddrake/sound.pm:187
+#: harddrake/sound.pm:207
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
@@ -2922,12 +3100,12 @@ msgstr ""
 "Сизнинг %s товуш картангизга, жорий ҳолда %s драйвери ишлатилмоқда, маълум "
 "бўлган бошқа OSS/ALSA драйвери мавжуд эмас."
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
 msgstr "Товушни мослаш"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -2936,7 +3114,7 @@ msgstr ""
 "Бу ерда %s товуш картангиз учун бошқа драйверни (OSS ёки ALSA) танлашингиз "
 "мумкин."
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -2949,7 +3127,7 @@ msgstr ""
 "Сизнинг картангиз %s\"%s\" драйверини ишлатмоқда (картангизнинг андоза "
 "драйвери \"%s\")"
 
-#: harddrake/sound.pm:199
+#: harddrake/sound.pm:219
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -2969,64 +3147,65 @@ msgid ""
 "the ALSA library.\n"
 msgstr ""
 
-#: harddrake/sound.pm:213 harddrake/sound.pm:293 standalone/drakups:134
+#: harddrake/sound.pm:233 harddrake/sound.pm:318 standalone/drakups:146
 #, c-format
 msgid "Driver:"
 msgstr "Драйвер:"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr "Носозликларни топиш ва бартараф қилиш"
 
-#: harddrake/sound.pm:226
+#: harddrake/sound.pm:246
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
 "\n"
 "It has been reported to oops the kernel on unloading.\n"
 "\n"
-"The new \"%s\" driver'll only be used on next bootstrap."
+"The new \"%s\" driver will only be used on next bootstrap."
 msgstr ""
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
 msgstr ""
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:255
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
 "driver at \"%s\"."
 msgstr ""
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr "Маълум бўлган драйвер йўқ"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "Сизнинг \"%s\" товуш картангиз учун маълум бўлган драйвер мавжуд эмас."
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr "Номаълум драйвер"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "Хато: Товуш картангиз учун \"%s\" драйвери рўйхатда йўқ"
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Товуш носозликларини топиш ва бартараф қилиш"
 
-#: harddrake/sound.pm:258
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: harddrake/sound.pm:281
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3050,17 +3229,18 @@ msgid ""
 "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
 msgstr ""
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Бошқа драйверни танлаш"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Ихтиёрий драйвер танланмоқда"
 
-#: harddrake/sound.pm:288
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: harddrake/sound.pm:313
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3142,17 +3322,17 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
-"terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
-"will reboot your computer."
+"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
+"button will reboot your computer."
 msgstr ""
 "Давом этишдан олдин лицензиянинг шартларини эътибор билан ўқиб\n"
 "чиқинг. Лицензия бутун Mandrakelinux'га тегишли. Агар унинг барча\n"
 "шартларига рози бўлсангиз, \"%s\"ни танланг. Агар рози бўлмасангиз,\n"
-"компьютерингизни ўчириб-ёқиш учун \"%s\" тугмасини босинг."
+"компьютерни ўчириб-ёқиш учун \"%s\" тугмасини босинг."
 
-#: help.pm:14 install_steps_gtk.pm:598 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:690 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:567 install_steps_interactive.pm:94
+#: install_steps_interactive.pm:745 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
 msgstr "Қабул қилиш"
@@ -3160,61 +3340,65 @@ msgstr "Қабул қилиш"
 #: help.pm:17
 #, c-format
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user may have their own\n"
-"preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point will not be\n"
-"authorized to change anything except their own files and their own\n"
-"configurations, protecting the system from unintentional or malicious\n"
-"changes that impact on the system as a whole. You will have to create at\n"
-"least one regular user for yourself -- this is the account which you should\n"
-"use for routine, day-to-day use. Although it is very easy to log in as\n"
-"\"root\" to do anything and everything, it may also be very dangerous! A\n"
-"very simple mistake could mean that your system will not work any more. If\n"
-"you make a serious mistake as a regular user, the worst that will happen is\n"
-"that you will lose some information, but not affect the entire system.\n"
+"GNU/Linux is a multi-user system which means each user can have his or her\n"
+"own preferences, own files and so on. But unlike \"root\", who is the\n"
+"system administrator, the users you add at this point won't be authorized\n"
+"to change anything except their own files and their own configurations,\n"
+"protecting the system from unintentional or malicious changes which could\n"
+"impact on the system as a whole. You'll have to create at least one regular\n"
+"user for yourself -- this is the account which you should use for routine,\n"
+"day-to-day usage. Although it's very easy to log in as \"root\" to do\n"
+"anything and everything, it may also be very dangerous! A very simple\n"
+"mistake could mean that your system won't work any more. If you make a\n"
+"serious mistake as a regular user, the worst that can happen is that you'll\n"
+"lose some information, but you won't affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"you type in this field and copy it to the \"%s\" one, which is the name\n"
 "this user will enter to log onto the system. If you like, you may override\n"
 "the default and change the user name. The next step is to enter a password.\n"
 "From a security point of view, a non-privileged (regular) user password is\n"
-"not as crucial as the \"root\" password, but that is no reason to neglect\n"
-"it by making it blank or too simple: after all, your files could be the\n"
-"ones at risk.\n"
+"not as crucial as the \"root\" password, but that's no reason to neglect it\n"
+"by making it blank or too simple: after all, your files could be the ones\n"
+"at risk.\n"
 "\n"
 "Once you click on \"%s\", you can add other users. Add a user for each one\n"
-"of your friends: your father or your sister, for example. Click \"%s\" when\n"
-"you have finished adding users.\n"
+"of your friends, your father, your sister, etc. Click \"%s\" when you're\n"
+"finished adding users.\n"
 "\n"
 "Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
 "that user (bash by default).\n"
 "\n"
-"When you have finished adding users, you will be asked to choose a user who\n"
-"can automatically log into the system when the computer boots up. If you\n"
-"are interested in that feature (and do not care much about local security),\n"
-"choose the desired user and window manager, then click \"%s\". If you are\n"
-"not interested in this feature, uncheck the \"%s\" box."
+"When you're finished adding users, you'll be asked to choose a user who\n"
+"will be automatically logged into the system when the computer boots up. If\n"
+"you're interested in that feature (and don't care much about local\n"
+"security), choose the desired user and window manager, then click on\n"
+"\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
 
-#: help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005
-#: install_steps_gtk.pm:277 interactive.pm:403 interactive/newt.pm:308
-#: network/netconnect.pm:271 network/tools.pm:166 printer/printerdrake.pm:3090
-#: standalone/drakTermServ:397 standalone/drakbackup:3920
-#: standalone/drakbackup:4014 standalone/drakbackup:4031
-#: standalone/drakbackup:4049 ugtk2.pm:510
+#: help.pm:51 printer/printerdrake.pm:1488 printer/printerdrake.pm:1608
+#, c-format
+msgid "User name"
+msgstr "Фойдаланувчи"
+
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:247
+#: interactive.pm:403 interactive/newt.pm:317 network/netconnect.pm:280
+#: network/tools.pm:198 printer/printerdrake.pm:3268
+#: standalone/drakTermServ:372 standalone/drakbackup:3941
+#: standalone/drakbackup:4035 standalone/drakbackup:4052
+#: standalone/drakbackup:4070 ugtk2.pm:515
 #, c-format
 msgid "Next"
-msgstr "Кейингиси"
+msgstr "Кейинги"
 
-#: help.pm:52 help.pm:418 help.pm:444 help.pm:660 help.pm:733 help.pm:768
+#: help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
 #: interactive.pm:371
 #, c-format
 msgid "Advanced"
 msgstr "Қўшимча"
 
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3248,36 +3432,45 @@ msgid ""
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
-#: help.pm:86
+#: help.pm:85
 #, c-format
 msgid ""
 "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
-"CD and ask you to insert the correct CD as required."
+"CD and ask you to insert the required one. If you do not have the requested\n"
+"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
+"installed."
 msgstr ""
-"Mandrakelinux бир нечта компакт-дискларда тарқатилади. Агар\n"
-"танланган пакет бошқа компакт-дискда жойлашган бўлса, DrakX\n"
-"жорий компакт-дискни чиқаради ва тегишлисини қўйишни сўрайди."
+"Mandrakelinux бир нечта компакт-дискларда тарқатилади. Агар танланган пакет\n"
+"бошқа компакт-дискда жойлашган бўлса, DrakX жорий компакт-дискни\n"
+"чиқаради ва тегишлисини қўйишни сўрайди. Агар сўралган компакт-диск сизда\n"
+"бўлмаса, \"%s\" тугмасини босинг. Бу ҳолда, тегишли пакетлар ўрнатилмайди."
 
-#: help.pm:91
+#: help.pm:92
 #, c-format
 msgid ""
-"It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrakelinux, and\n"
-"to make it simpler to manage the packages have been placed into groups of\n"
-"similar applications.\n"
+"It's now time to specify which programs you wish to install on your system.\n"
+"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"simpler to manage, they have been placed into groups of similar\n"
+"applications.\n"
 "\n"
-"Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
-"mix and match applications from the various categories, so a\n"
-"``Workstation'' installation can still have applications from the\n"
-"``Development'' category installed.\n"
+"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"match applications from the various categories, so a ``Workstation''\n"
+"installation can still have applications from the ``Server'' category\n"
+"installed.\n"
 "\n"
 " * \"%s\": if you plan to use your machine as a workstation, select one or\n"
-"more of the groups that are in the workstation category.\n"
+"more of the groups in the workstation category.\n"
 "\n"
 " * \"%s\": if you plan on using your machine for programming, select the\n"
-"appropriate groups from that category.\n"
+"appropriate groups from that category. The special \"LSB\" group will\n"
+"configure your system so that it complies as much as possible with the\n"
+"Linux Standard Base specifications.\n"
+"\n"
+"   Selecting the \"LSB\" group will also install the \"2.4\" kernel series,\n"
+"instead of the default \"2.6\" one. This is to ensure 100%%-LSB compliance\n"
+"of the system. However, if you do not select the \"LSB\" group you will\n"
+"still have a system which is nearly 100%% LSB-compliant.\n"
 "\n"
 " * \"%s\": if your machine is intended to be a server, select which of the\n"
 "more common services you wish to install on your machine.\n"
@@ -3287,9 +3480,19 @@ msgid ""
 "interface available.\n"
 "\n"
 "Moving the mouse cursor over a group name will display a short explanatory\n"
-"text about that group. If you unselect all groups when performing a regular\n"
-"installation (as opposed to an upgrade), a dialog will pop up proposing\n"
-"different options for a minimal installation:\n"
+"text about that group.\n"
+"\n"
+"You can check the \"%s\" box, which is useful if you're familiar with the\n"
+"packages being offered or if you want to have total control over what will\n"
+"be installed.\n"
+"\n"
+"If you start the installation in \"%s\" mode, you can deselect all groups\n"
+"and prevent the installation of any new packages. This is useful for\n"
+"repairing or updating an existing system.\n"
+"\n"
+"If you deselect all groups when performing a regular installation (as\n"
+"opposed to an upgrade), a dialog will pop up suggesting different options\n"
+"for a minimal installation:\n"
 "\n"
 " * \"%s\": install the minimum number of packages possible to have a\n"
 "working graphical desktop.\n"
@@ -3299,187 +3502,147 @@ msgid ""
 "\n"
 " * \"%s\": will install the absolute minimum number of packages necessary\n"
 "to get a working Linux system. With this installation you will only have a\n"
-"command line interface. The total size of this installation is about 65\n"
-"megabytes.\n"
-"\n"
-"You can check the \"%s\" box, which is useful if you are familiar with the\n"
-"packages being offered or if you want to have total control over what will\n"
-"be installed.\n"
-"\n"
-"If you started the installation in \"%s\" mode, you can unselect all groups\n"
-"to avoid installing any new package. This is useful for repairing or\n"
-"updating an existing system."
+"command-line interface. The total size of this installation is about 65\n"
+"megabytes."
 msgstr ""
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, c-format
 msgid "Workstation"
 msgstr "Иш станцияси"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
 msgstr "Тузиш"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
 msgstr "График муҳит"
 
-#: help.pm:137 install_steps_interactive.pm:552
+#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#, c-format
+msgid "Individual package selection"
+msgstr "Пакетларни биттама-битта танлаш"
+
+#: help.pm:146 help.pm:588
+#, c-format
+msgid "Upgrade"
+msgstr "Янгилаш"
+
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
 msgstr "X билан"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "With basic documentation"
 msgstr "Асосий қўлланмалар билан"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "Truly minimal install"
 msgstr "Ҳақиқий минимал ўрнатиш"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "Пакетларни биттама-битта танлаш"
-
-#: help.pm:137 help.pm:602
-#, c-format
-msgid "Upgrade"
-msgstr "Янгилаш"
-
-#: help.pm:140
+#: help.pm:149
 #, c-format
 msgid ""
-"If you told the installer that you wanted to individually select packages,\n"
-"it will present a tree containing all packages classified by groups and\n"
-"subgroups. While browsing the tree, you can select entire groups,\n"
-"subgroups, or individual packages.\n"
+"If you choose to install packages individually, the installer will present\n"
+"a tree containing all packages classified by groups and subgroups. While\n"
+"browsing the tree, you can select entire groups, subgroups, or individual\n"
+"packages.\n"
 "\n"
-"Whenever you select a package on the tree, a description appears on the\n"
-"right to let you know the purpose of the package.\n"
+"Whenever you select a package on the tree, a description will appear on the\n"
+"right to let you know the purpose of that package.\n"
 "\n"
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
-"you will be asked to confirm that you really want those servers to be\n"
+"you'll be asked to confirm that you really want those servers to be\n"
 "installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
-"the time the distribution was shipped, it is entirely possible that that\n"
+"the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
-"install the listed services and they will be started automatically by\n"
-"default during boot. !!\n"
+"finalized. If you don't know what a particular service is supposed to do or\n"
+"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
+"the listed services and they will be started automatically at boot time. !!\n"
 "\n"
 "The \"%s\" option is used to disable the warning dialog which appears\n"
 "whenever the installer automatically selects a package to resolve a\n"
-"dependency issue. Some packages have relationships between each them such\n"
-"that installation of one package requires that some other program is also\n"
-"required to be installed. The installer can determine which packages are\n"
-"required to satisfy a dependency to successfully complete the installation.\n"
+"dependency issue. Some packages depend on others and the installation of\n"
+"one particular package may require the installation of another package. The\n"
+"installer can determine which packages are required to satisfy a dependency\n"
+"to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
 "package list created during a previous installation. This is useful if you\n"
 "have a number of machines that you wish to configure identically. Clicking\n"
-"on this icon will ask you to insert a floppy disk previously created at the\n"
-"end of another installation. See the second tip of last step on how to\n"
-"create such a floppy."
+"on this icon will ask you to insert the floppy disk created at the end of\n"
+"another installation. See the second tip of the last step on how to create\n"
+"such a floppy."
 msgstr ""
 
-#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:411
-#: interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:225
-#: ugtk2.pm:1083 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:722
+#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2503
+#: standalone/draksec:54 standalone/harddrake2:299 ugtk2.pm:1121
+#: wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "Йўқ"
 
-#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:411 interactive.pm:149
-#: modules/interactive.pm:71 printer/printerdrake.pm:607 standalone/drakgw:288
-#: standalone/drakgw:289 standalone/drakgw:297 standalone/drakgw:307
-#: standalone/harddrake2:224 ugtk2.pm:1083 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:722 interactive.pm:149
+#: modules/interactive.pm:71 printer/printerdrake.pm:711
+#: standalone/drakbackup:2503 standalone/drakgw:290 standalone/drakgw:291
+#: standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:55
+#: standalone/harddrake2:298 ugtk2.pm:1121 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "Ҳа"
 
-#: help.pm:172
+#: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
 msgstr ""
 
-#: help.pm:175
-#, c-format
-msgid ""
-"You will now set up your Internet/network connection. If you wish to\n"
-"connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
-"this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
-"configure the network, or to do it later, in which case clicking the \"%s\"\n"
-"button will take you to the next step.\n"
-"\n"
-"When configuring your network, the available connections options are:\n"
-"Normal modem connection, Winmodem connection, ISDN modem, ADSL connection,\n"
-"cable modem, and finally a simple LAN connection (Ethernet).\n"
-"\n"
-"We will not detail each configuration option - just make sure that you have\n"
-"all the parameters, such as IP address, default gateway, DNS servers, etc.\n"
-"from your Internet Service Provider or system administrator.\n"
-"\n"
-"About Winmodem Connection. Winmodems are special integrated low-end modems\n"
-"that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrakelinux, some others do not. You\n"
-"can consult the list of supported modems at LinModems.\n"
-"\n"
-"You can consult the ``Starter Guide'' chapter about Internet connections\n"
-"for details about the configuration, or simply wait until your system is\n"
-"installed and use the program described there to configure your connection."
-msgstr ""
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "Авто-аниқлашдан фойдаланиш"
-
-#: help.pm:200
+#: help.pm:183
 #, c-format
 msgid ""
 "\"%s\": clicking on the \"%s\" button will open the printer configuration\n"
 "wizard. Consult the corresponding chapter of the ``Starter Guide'' for more\n"
-"information on how to setup a new printer. The interface presented there is\n"
-"similar to the one used during installation."
+"information on how to set up a new printer. The interface presented in our\n"
+"manual is similar to the one used during installation."
 msgstr ""
 
-#: help.pm:203 help.pm:581 help.pm:991 install_steps_gtk.pm:648
-#: standalone/drakbackup:2313 standalone/drakbackup:2321
-#: standalone/drakbackup:2329 standalone/drakbackup:2337
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:622
+#: standalone/drakbackup:2329 standalone/drakbackup:2333
+#: standalone/drakbackup:2337 standalone/drakbackup:2341
 #, c-format
 msgid "Configure"
 msgstr "Мослаш"
 
-#: help.pm:206
+#: help.pm:189
 #, c-format
 msgid ""
-"This dialog is used to choose which services you wish to start at boot\n"
+"This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not needed at boot\n"
+"DrakX will list all services available on the current installation. Review\n"
+"each one of them carefully and uncheck those which aren't needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
+"selected. However, if you're not sure whether a service is useful or not,\n"
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services that you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
+"server: you probably don't want to start any services which you don't need.\n"
+"Please remember that some services can be dangerous if they're enabled on a\n"
+"server. In general, select only those services you really need. !!"
 msgstr ""
 
-#: help.pm:224
+#: help.pm:206
 #, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
@@ -3487,72 +3650,79 @@ msgid ""
 "motherboard is set to local time, you may deactivate this by unselecting\n"
 "\"%s\", which will let GNU/Linux know that the system clock and the\n"
 "hardware clock are in the same time zone. This is useful when the machine\n"
-"also hosts another operating system like Windows.\n"
+"also hosts another operating system.\n"
 "\n"
-"The \"%s\" option will automatically regulate the clock by connecting to a\n"
-"remote time server on the Internet. For this feature to work, you must have\n"
-"a working Internet connection. It is best to choose a time server located\n"
-"near you. This option actually installs a time server that can be used by\n"
-"other machines on your local network as well."
+"The \"%s\" option will automatically regulate the system clock by\n"
+"connecting to a remote time server on the Internet. For this feature to\n"
+"work, you must have a working Internet connection. We recommend that you\n"
+"choose a time server located near you. This option actually installs a time\n"
+"server which can be used by other machines on your local network as well."
 msgstr ""
 
-#: help.pm:235 install_steps_interactive.pm:822
+#: help.pm:217 install_steps_interactive.pm:887
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr ""
 
-#: help.pm:235
+#: help.pm:217
 #, c-format
 msgid "Automatic time synchronization"
 msgstr ""
 
-#: help.pm:238
-#, c-format
+#: help.pm:220
+#, fuzzy, c-format
 msgid ""
 "Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs."
 msgstr ""
+"Монитор\n"
+"\n"
+"   Одатда, ўрнатувчи компьютерингизга уланган мониторни\n"
+"автоматик равишда аниқлайди ва мослайди. Агар бу нотўғри\n"
+"бўлса, аслида уланган мониторни рўйхатдан танлашингиз мумкин."
 
-#: help.pm:249
+#: help.pm:231
 #, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
-"You will be presented with a list of different parameters to change to get\n"
-"an optimal graphical display: Graphic Card\n"
+"You'll see a list of different parameters to change to get an optimal\n"
+"graphical display.\n"
+"\n"
+"Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer.\n"
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture.\n"
 "\n"
 "\n"
@@ -3561,31 +3731,31 @@ msgid ""
 "\n"
 "   Depending on your hardware, this entry might not appear.\n"
 "\n"
-"   the system will try to open a graphical screen at the desired\n"
-"resolution. If you can see the message during the test and answer \"%s\",\n"
-"then DrakX will proceed to the next step. If you cannot see the message, it\n"
+"   The system will try to open a graphical screen at the desired\n"
+"resolution. If you see the test message during the test and answer \"%s\",\n"
+"then DrakX will proceed to the next step. If you do not see it, then it\n"
 "means that some part of the auto-detected configuration was incorrect and\n"
-"the test will automatically end after 12 seconds, bringing you back to the\n"
+"the test will automatically end after 12 seconds and return you to the\n"
 "menu. Change settings until you get a correct graphical display.\n"
 "\n"
 "\n"
 "\n"
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 
-#: help.pm:304
+#: help.pm:288
 #, c-format
 msgid ""
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer."
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer."
 msgstr ""
 "Монитор\n"
 "\n"
@@ -3593,92 +3763,93 @@ msgstr ""
 "автоматик равишда аниқлайди ва мослайди. Агар бу нотўғри\n"
 "бўлса, аслида уланган мониторни рўйхатдан танлашингиз мумкин."
 
-#: help.pm:311
+#: help.pm:295
 #, c-format
 msgid ""
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture."
 msgstr ""
 
-#: help.pm:319
+#: help.pm:303
 #, c-format
 msgid ""
 "In the situation where different servers are available for your card, with\n"
-"or without 3D acceleration, you are asked to choose the server that best\n"
+"or without 3D acceleration, you're asked to choose the server which best\n"
 "suits your needs."
 msgstr ""
 
-#: help.pm:324
+#: help.pm:308
 #, c-format
 msgid ""
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 
-#: help.pm:332
+#: help.pm:316
 #, c-format
 msgid ""
-"At this point, you need to decide where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space you will\n"
-"have to partition the drive. Basically, partitioning a hard drive consists\n"
-"of logically dividing it to create the space needed to install your new\n"
+"You now need to decide where you want to install the Mandrakelinux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space you will have to\n"
+"partition the drive. Basically, partitioning a hard drive means to\n"
+"logically divide it to create the space needed to install your new\n"
 "Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"and can lead to data losses, partitioning can be intimidating and stressful\n"
+"for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"Depending on the configuration of your hard drive, several options are\n"
+"available:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+" * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+" * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
 "your hard drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
-"data, provided you have previously defragmented the Windows partition.\n"
-"Backing up your data is strongly recommended.. Using this option is\n"
+"data, provided you've previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended. Using this option is\n"
 "recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"than when you started. You'll have less free space under Microsoft Windows\n"
+"to store your data or to install new software.\n"
 "\n"
-" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\n"
+" * \"%s\". If you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"this option. Be careful, because you won't be able to undo this operation\n"
+"after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+"Microsoft Windows. Choosing this option will simply erase everything on the\n"
+"drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
+" * \"%s\". Choose this option if you want to manually partition your hard\n"
 "drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
 "easily lose all your data. That's why this option is really only\n"
 "recommended if you have done something like this before and have some\n"
@@ -3686,52 +3857,53 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "Бўш жойдан фойдаланиш"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Use existing partition"
 msgstr "Дискда бор қисмлардан фойдаланиш"
 
-#: help.pm:389 install_interactive.pm:137
+#: help.pm:374 install_interactive.pm:137
 #, c-format
 msgid "Use the free space on the Windows partition"
 msgstr "Дискнинг Windows қисмидаги бўш жойдан фойдаланиш"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "Бутун дискни ўчириш"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Remove Windows"
 msgstr "Windows'ни ўчириш"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "Дискни бошқача бўлиш"
 
-#: help.pm:392
+#: help.pm:377
 #, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
-"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
-"bootloader menu, giving you the choice of which operating system to start.\n"
+"boot-loader menu, giving you the choice of which operating system to start.\n"
 "\n"
 "The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * \"%s\": enables you to create an installation floppy disk which will\n"
+"automatically perform a whole installation without the help of an operator,\n"
+"similar to the installation you've just configured.\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   Note that two different options are available after clicking on that\n"
+"button:\n"
 "\n"
 "    * \"%s\". This is a partially automated installation. The partitioning\n"
 "step is the only interactive procedure.\n"
@@ -3739,119 +3911,119 @@ msgid ""
 "    * \"%s\". Fully automated installation: the hard disk is completely\n"
 "rewritten, all data is lost.\n"
 "\n"
-"   This feature is very handy when installing a number of similar machines.\n"
-"See the Auto install section on our web site for more information.\n"
+"   This feature is very handy when installing on a number of similar\n"
+"machines. See the Auto install section on our web site for more\n"
+"information.\n"
+"\n"
+" * \"%s\"(*): saves a list of the packages selected in this installation.\n"
+"To use this selection with another installation, insert the floppy and\n"
+"start the installation. At the prompt, press the [F1] key, type >>linux\n"
+"defcfg=\"floppy\"<< and press the [Enter] key.\n"
 "\n"
-" * \"%s\": saves a list of the packages selected in this installation. To\n"
-"use this selection with another installation, insert the floppy and start\n"
-"the installation. At the prompt, press the [F1] key and type >>linux\n"
-"defcfg=\"floppy\" <<."
+"(*) You need a FAT-formatted floppy. To create one under GNU/Linux, type\n"
+"\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
+"/dev/fd0\"."
 msgstr ""
 
-#: help.pm:418
+#: help.pm:409
 #, c-format
 msgid "Generate auto-install floppy"
 msgstr "Авто-ўрнатиш дискетни яратиш"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "Қайтариш"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Automated"
 msgstr "Автоматик"
 
-#: help.pm:418 install_steps_interactive.pm:1319
+#: help.pm:409 install_steps_interactive.pm:1366
 #, c-format
 msgid "Save packages selection"
 msgstr "Пакетлар танловини сақлаш"
 
-#: help.pm:421
+#: help.pm:412
 #, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
+"If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
+"reformat some of them and erase any data they contain. To do so, please\n"
+"select those partitions as well.\n"
 "\n"
-"At this time, you may wish to reformat some already existing partitions to\n"
-"erase any data they contain. If you wish to do that, please select those\n"
-"partitions as well.\n"
-"\n"
-"Please note that it is not necessary to reformat all pre-existing\n"
+"Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
-"reformat partitions containing data that you wish to keep (typically\n"
-"\"/home\").\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
-"Please be careful when selecting partitions. After formatting, all data on\n"
-"the selected partitions will be deleted and you will not be able to recover\n"
-"it.\n"
+"Please be careful when selecting partitions. After the formatting is\n"
+"completed, all data on the selected partitions will be deleted and you\n"
+"won't be able to recover it.\n"
 "\n"
-"Click on \"%s\" when you are ready to format the partitions.\n"
+"Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
 "Mandrakelinux operating system installation.\n"
 "\n"
-"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
 
-#: help.pm:444 help.pm:1005 install_steps_gtk.pm:433 interactive.pm:404
-#: interactive/newt.pm:307 printer/printerdrake.pm:3088
-#: standalone/drakTermServ:376 standalone/drakbackup:3880
-#: standalone/drakbackup:3919 standalone/drakbackup:4030
-#: standalone/drakbackup:4045 ugtk2.pm:508
+#: help.pm:431 install_steps_gtk.pm:402 interactive.pm:404
+#: interactive/newt.pm:316 printer/printerdrake.pm:3266
+#: standalone/drakTermServ:351 standalone/drakbackup:3901
+#: standalone/drakbackup:3940 standalone/drakbackup:4051
+#: standalone/drakbackup:4066 ugtk2.pm:513
 #, c-format
 msgid "Previous"
-msgstr "Олдингиси"
+msgstr "Олдинги"
 
-#: help.pm:447
+#: help.pm:434
 #, c-format
 msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
-"packages will have been updated since the initial release. Bugs may have\n"
-"been fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"%s\"\n"
-"if you have a working Internet connection, or \"%s\" if you prefer to\n"
-"install updated packages later.\n"
+"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"have been updated since the initial release. Bugs may have been fixed,\n"
+"security issues resolved. To allow you to benefit from these updates,\n"
+"you're now able to download them from the Internet. Check \"%s\" if you\n"
+"have a working Internet connection, or \"%s\" if you prefer to install\n"
+"updated packages later.\n"
 "\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one near to you. A package-selection tree will\n"
-"appear: review the selection, and press \"%s\" to retrieve and install the\n"
-"selected package(s), or \"%s\" to abort."
+"Choosing \"%s\" will display a list of web locations from which updates can\n"
+"be retrieved. You should choose one near to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
 
-#: help.pm:457 help.pm:602 install_steps_gtk.pm:432
-#: install_steps_interactive.pm:148 standalone/drakbackup:4077
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:401
+#: install_steps_interactive.pm:158 standalone/drakbackup:4098
 #, c-format
 msgid "Install"
 msgstr "Ўрнатиш"
 
-#: help.pm:460
+#: help.pm:447
 #, c-format
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use.\n"
+"At this point, DrakX will allow you to choose the security level you desire\n"
+"for your machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine is to contain crucial data, or if it's to be directly\n"
+"exposed to the Internet. The trade-off that a higher security level is\n"
+"generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, stay with the default option. You will\n"
-"be able to change that security level later with tool draksec from the\n"
-"Mandrake Control Center.\n"
+"If you don't know what to choose, keep the default option. You'll be able\n"
+"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"Control Center.\n"
 "\n"
-"The \"%s\" field can inform the system of the user on this computer who\n"
-"will be responsible for security. Security messages will be sent to that\n"
-"address."
+"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
+"security. Security messages will be sent to that address."
 msgstr ""
 
-#: help.pm:472
+#: help.pm:458
 #, c-format
 msgid "Security Administrator"
 msgstr "Хавфсизлик бошқарувчиси"
 
-#: help.pm:475
+#: help.pm:461
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
@@ -3926,17 +4098,17 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Removable media auto-mounting"
 msgstr ""
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "Одий/эксперт усулига ўтиш"
 
-#: help.pm:547
+#: help.pm:533
 #, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
@@ -3970,80 +4142,81 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 
-#: help.pm:578
+#: help.pm:564
 #, c-format
 msgid ""
-"\"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list."
+"\"%s\": check the current country selection. If you're not in this country,\n"
+"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 
-#: help.pm:584
+#: help.pm:569
 #, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
-"DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrakelinux system:\n"
+"DrakX now needs to know if you want to perform a new installation or an\n"
+"upgrade of an existing Mandrakelinux system:\n"
 "\n"
-" * \"%s\": For the most part, this completely wipes out the old system. If\n"
-"you wish to change how your hard drives are partitioned, or change the file\n"
-"system, you should use this option. However, depending on your partitioning\n"
-"scheme, you can prevent some of your existing data from being over-written.\n"
+" * \"%s\". For the most part, this completely wipes out the old system.\n"
+"However, depending on your partitioning scheme, you can prevent some of\n"
+"your existing data (notably \"home\" directories) from being over-written.\n"
+"If you wish to change how your hard drives are partitioned, or to change\n"
+"the file system, you should use this option.\n"
 "\n"
-" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
-"partitioning scheme and user data is not altered. Most of other\n"
-"configuration steps remain available, similar to a standard installation.\n"
+" * \"%s\". This installation class allows you to update the packages\n"
+"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"scheme and user data won't be altered. Most of the other configuration\n"
+"steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
-"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 
-#: help.pm:605
+#: help.pm:591
 #, c-format
 msgid ""
-"Depending on the language you chose in section , DrakX will automatically\n"
-"select a particular type of keyboard configuration. Check that the\n"
-"selection suits you or choose another keyboard layout.\n"
+"Depending on the language you chose (), DrakX will automatically select a\n"
+"particular type of keyboard configuration. Check that the selection suits\n"
+"you or choose another keyboard layout.\n"
 "\n"
-"Also, you may not have a keyboard that corresponds exactly to your\n"
+"Also, you may not have a keyboard which corresponds exactly to your\n"
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard do not match. In either case, this installation step\n"
+"country-set keyboard don't match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
-"Click on the \"%s\" button to be presented with the complete list of\n"
-"supported keyboards.\n"
+"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
+"dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
 
-#: help.pm:624
+#: help.pm:609
 #, c-format
 msgid ""
-"Your choice of preferred language will affect the language of the\n"
-"documentation, the installer and the system in general. Select first the\n"
-"region you are located in, and then the language you speak.\n"
+"The first step is to choose your preferred language.\n"
+"\n"
+"Your choice of preferred language will affect the installer, the\n"
+"documentation, and the system in general. First select the region you're\n"
+"located in, then the language you speak.\n"
 "\n"
 "Clicking on the \"%s\" button will allow you to select other languages to\n"
 "be installed on your workstation, thereby installing the language-specific\n"
-"files for system documentation and applications. For example, if you will\n"
-"host users from Spain on your machine, select English as the default\n"
-"language in the tree view and \"%s\" in the Advanced section.\n"
+"files for system documentation and applications. For example, if Spanish\n"
+"users are to use your machine, select English as the default language in\n"
+"the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
-"cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux will be using it\n"
-"or not depending on the user choices:\n"
+"cover all existing languages. However full support for it in GNU/Linux is\n"
+"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"depend on the user's choices:\n"
 "\n"
-" * If you choose a languages with a strong legacy encoding (latin1\n"
+" * If you choose a language with a strong legacy encoding (latin1\n"
 "languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
 "iso-8859-2 languages), the legacy encoding will be used by default;\n"
 "\n"
@@ -4052,66 +4225,74 @@ msgid ""
 " * If two or more languages are required, and those languages are not using\n"
 "the same encoding, then unicode will be used for the whole system;\n"
 "\n"
-" * Finally, unicode can also be forced for the system at user request by\n"
-"selecting option \"%s\" independently of which language(s) have been\n"
-"chosen.\n"
+" * Finally, unicode can also be forced for use throughout the system at a\n"
+"user's request by selecting the \"%s\" option independently of which\n"
+"languages were been chosen.\n"
 "\n"
 "Note that you're not limited to choosing a single additional language. You\n"
-"may choose several ones, or even install them all by selecting the \"%s\"\n"
-"box. Selecting support for a language means translations, fonts, spell\n"
-"checkers, etc. for that language will also be installed.\n"
+"may choose several, or even install them all by selecting the \"%s\" box.\n"
+"Selecting support for a language means translations, fonts, spell checkers,\n"
+"etc. will also be installed for that language.\n"
 "\n"
-"To switch between the various languages installed on the system, you can\n"
-"launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
-"language used by the entire system. Running the command as a regular user\n"
-"will only change the language settings for that particular user."
+"To switch between the various languages installed on your system, you can\n"
+"launch the \"localedrake\" command as \"root\" to change the language used\n"
+"by the entire system. Running the command as a regular user will only\n"
+"change the language settings for that particular user."
 msgstr ""
 
-#: help.pm:660
+#: help.pm:647
 #, c-format
 msgid "Espanol"
 msgstr ""
 
-#: help.pm:663
+#: help.pm:650
 #, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
 "configure it for third-button emulation. The third-button mouse button of a\n"
-"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"two-button mouse can be obtained by simultaneously clicking the left and\n"
 "right mouse buttons. DrakX will automatically know whether your mouse uses\n"
 "a PS/2, serial or USB interface.\n"
 "\n"
-"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
-"that says \"%s\". DrakX will then configure your mouse so that you can\n"
-"simulate the wheel with it: to do so, press the middle button and move your\n"
-"mouse up and down.\n"
+"If you have a 3-button mouse without a wheel, you can choose a \"%s\"\n"
+"mouse. DrakX will then configure your mouse so that you can simulate the\n"
+"wheel with it: to do so, press the middle button and move your mouse\n"
+"pointer up and down.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
 "from the list provided.\n"
 "\n"
-"If you choose a mouse other than the default, a test screen will be\n"
+"You can select the \"%s\" entry to chose a ``generic'' mouse type which\n"
+"will work with nearly all mice.\n"
+"\n"
+"If you choose a mouse other than the default one, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
 "correct and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
+"working well, press the space bar or [Return] key to cancel the test and\n"
+"you will be returned to the mouse list.\n"
 "\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"Occasionally wheel mice are not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
-"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-"buttons and check that the mouse pointer moves on-screen as you move your\n"
-"mouse."
+"pressing the \"%s\" button, a mouse image will be displayed on-screen.\n"
+"Scroll the mouse wheel to ensure that it is activating correctly. As you\n"
+"scroll your mouse wheel, you will see the on-screen scroll wheel moving.\n"
+"Test the buttons and check that the mouse pointer moves on-screen as you\n"
+"move your mouse about."
 msgstr ""
 
-#: help.pm:691
+#: help.pm:681
 #, c-format
 msgid "with Wheel emulation"
 msgstr ""
 
-#: help.pm:694
+#: help.pm:681
+#, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr "Истаган PS/2 ва USB сичқонча"
+
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
@@ -4120,16 +4301,16 @@ msgstr ""
 "Илтимос тўғри портни танланг. Масалан, Windows'даги \"COM1\"\n"
 "портининг номи GNU/Linux'да \"ttyS0\"."
 
-#: help.pm:698
+#: help.pm:688
 #, c-format
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"Root\" is the system\n"
+"system: you must enter the \"root\" password. \"Root\" is the system\n"
 "administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if the password you chose is too easy. As you\n"
-"can see, you are not forced to enter a password, but we strongly advise you\n"
+"do everything! That's why you must choose a password which is difficult to\n"
+"guess: DrakX will tell you if the password you chose is too simple. As you\n"
+"can see, you're not forced to enter a password, but we strongly advise\n"
 "against this. GNU/Linux is just as prone to operator error as any other\n"
 "operating system. Since \"root\" can overcome all limitations and\n"
 "unintentionally erase all data on partitions by carelessly accessing the\n"
@@ -4138,201 +4319,104 @@ msgid ""
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
 "characters long. Never write down the \"root\" password -- it makes it far\n"
-"too easy to compromise a system.\n"
+"too easy to compromise your system.\n"
 "\n"
-"One caveat -- do not make the password too long or complicated because you\n"
+"One caveat: don't make the password too long or too complicated because you\n"
 "must be able to remember it!\n"
 "\n"
-"The password will not be displayed on screen as you type it in. To reduce\n"
-"the chance of a blind typing error you will need to enter the password\n"
-"twice. If you do happen to make the same typing error twice, this\n"
-"``incorrect'' password will be the one you will have use the first time you\n"
-"connect.\n"
+"The password won't be displayed on screen as you type it. To reduce the\n"
+"chance of a blind typing error you'll need to enter the password twice. If\n"
+"you do happen to make the same typing error twice, you'll have to use this\n"
+"``incorrect'' password the first time you'll try to connect as \"root\".\n"
 "\n"
-"If you wish access to this computer to be controlled by an authentication\n"
-"server, click the \"%s\" button.\n"
+"If you want an authentication server to control access to your computer,\n"
+"click on the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one for \"%s\". If you do not know which\n"
+"services, select the appropriate one for \"%s\". If you don't know which\n"
 "one to use, you should ask your network administrator.\n"
 "\n"
-"If you happen to have problems with remembering passwords, if your computer\n"
-"will never be connected to the Internet and you absolutely trust everybody\n"
-"who uses your computer, you can choose to have \"%s\"."
+"If you happen to have problems with remembering passwords, or if your\n"
+"computer will never be connected to the Internet and you absolutely trust\n"
+"everybody who uses your computer, you can choose to have \"%s\"."
 msgstr ""
 
-#: help.pm:733
+#: help.pm:722
 #, c-format
 msgid "authentication"
 msgstr "тасдиқлаш"
 
 #. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:733 install_steps_interactive.pm:1146
+#: help.pm:722 install_steps_interactive.pm:1211
 #, c-format
 msgid "No password"
 msgstr "Махфий сўзсиз"
 
-#: help.pm:736
-#, c-format
-msgid ""
-"This dialog allows you to fine tune your bootloader:\n"
-"\n"
-" * \"%s\": there are three choices for your bootloader:\n"
-"\n"
-"    * \"%s\": if you prefer GRUB (text menu).\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its text menu interface.\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its graphical interface.\n"
-"\n"
-" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
-"you prefer, the bootloader can be installed on the second hard drive\n"
-"(\"%s\"), or even on a floppy disk (\"%s\");\n"
-"\n"
-" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
-"given to the user at the console to select a boot entry other than the\n"
-"default.\n"
-"\n"
-" * \"%s\": ACPI is a new standard (appeared during year 2002) for power\n"
-"management, notably for laptops. If you know your hardware supports it and\n"
-"you need it, check this box.\n"
-"\n"
-" * \"%s\": If you noticed hardware problems on your machine (IRQ conflicts,\n"
-"instabilities, machine freeze, ...) you should try disabling APIC by\n"
-"checking this box.\n"
-"\n"
-"!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
-"system! Be sure you know what you are doing before changing any of the\n"
-"options. !!\n"
-"\n"
-"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
-"are normally reserved for the expert user."
-msgstr ""
-
-#: help.pm:768
-#, c-format
-msgid "GRUB"
-msgstr "GRUB"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/hda"
-msgstr "/dev/hda"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/hdb"
-msgstr "/dev/hdb"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/fd0"
-msgstr "/dev/fd0"
-
-#: help.pm:768
-#, c-format
-msgid "Delay before booting the default image"
-msgstr "Андоза ОСни юклашдан олдин кутиб туриш вақти"
-
-#: help.pm:771
+#: help.pm:725
 #, c-format
 msgid ""
-"After you have configured the general bootloader parameters, the list of\n"
-"boot options that will be available at boot time will be displayed.\n"
-"\n"
-"If there are other operating systems installed on your machine they will\n"
-"automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
-"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
-"changes.\n"
-"\n"
-"You may also not want to give access to these other operating systems to\n"
-"anyone who goes to the console and reboots the machine. You can delete the\n"
-"corresponding entries for the operating systems to remove them from the\n"
-"bootloader menu, but you will need a boot disk in order to boot those other\n"
-"operating systems!"
-msgstr ""
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakbackup:1513 standalone/drakfont:589 standalone/drakfont:655
-#: standalone/drakups:280 standalone/drakups:329 standalone/drakups:349
-#: standalone/drakvpn:333 standalone/drakvpn:694
-#, c-format
-msgid "Add"
-msgstr "Қўшиш"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, c-format
-msgid "Modify"
-msgstr "Ўзгартириш"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakups:282 standalone/drakups:331 standalone/drakups:351
-#: standalone/drakvpn:333 standalone/drakvpn:694
-#, c-format
-msgid "Remove"
-msgstr "Олиб ташлаш"
-
-#: help.pm:787
-#, c-format
-msgid ""
-"LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
-"automated. DrakX will analyze the disk boot sector and act according to\n"
-"what it finds there:\n"
+"A boot loader is a little program which is started by the computer at boot\n"
+"time. It's responsible for starting up the whole system. Normally, the boot\n"
+"loader installation is totally automated. DrakX will analyze the disk boot\n"
+"sector and act according to what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a GRUB/LILO\n"
-"boot sector. This way you will be able to load either GNU/Linux or any\n"
-"other OS installed on your machine.\n"
+"boot sector. This way you'll be able to load either GNU/Linux or any other\n"
+"OS installed on your machine.\n"
 "\n"
-" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
-"one.\n"
+" * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
-"won't install any bootloader. Use it only if you know what you are doing."
+"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"where it should place it. Generally, the \"%s\" is the safest place.\n"
+"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"know what you're doing."
 msgstr ""
 
-#: help.pm:803
+#: help.pm:742
 #, c-format
 msgid ""
-"Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
-"is best suited to particular types of configuration.\n"
+"Now, it's time to select a printing system for your computer. Other\n"
+"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
-"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
-"experience with GNU/Linux.\n"
-"\n"
-" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
-"printing to your local printer or to one halfway around the planet. It is\n"
-"simple to configure and can act as a server or a client for the ancient\n"
-"\"lpd \" printing system, so it is compatible with older operating systems\n"
-"which may still need print services. While quite powerful, the basic setup\n"
-"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
-"front-ends for printing or choosing printer options and for managing the\n"
-"printer.\n"
+"within networks.) It's recommended that you use \"pdq\" if this is your\n"
+"first experience with GNU/Linux.\n"
+"\n"
+" * \"%s\" stands for `` Common Unix Printing System'' and is an excellent\n"
+"choice for printing to your local printer or to one halfway around the\n"
+"planet. It's simple to configure and can act as a server or a client for\n"
+"the ancient \"lpd\" printing system, so it's compatible with older\n"
+"operating systems which may still need print services. While quite\n"
+"powerful, the basic setup is almost as easy as \"pdq\". If you need to\n"
+"emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.\n"
+"\"%s\" includes graphical front-ends for printing or choosing printer\n"
+"options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrake Control\n"
-"Center and clicking the expert button."
+"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"Control Center and clicking on the \"%s\" button."
 msgstr ""
 
-#: help.pm:826
+#: help.pm:765
 #, c-format
 msgid "pdq"
 msgstr ""
 
-#: help.pm:826 printer/cups.pm:115 printer/data.pm:83
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
 
-#: help.pm:829
+#: help.pm:765
+#, c-format
+msgid "Expert"
+msgstr "Эксперт"
+
+#: help.pm:768
 #, c-format
 msgid ""
 "DrakX will first detect any IDE devices present in your computer. It will\n"
@@ -4353,157 +4437,74 @@ msgid ""
 "configure the driver."
 msgstr ""
 
-#: help.pm:847
-#, c-format
-msgid ""
-"You can add additional entries in yaboot for other operating systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
-"partition.\n"
-"\n"
-"For Linux, there are a few possible options:\n"
-"\n"
-" * Label: this is the name you will have to type at the yaboot prompt to\n"
-"select this boot option.\n"
-"\n"
-" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
-"variation of vmlinux with an extension.\n"
-"\n"
-" * Root: the \"root\" device or ``/'' for your Linux installation.\n"
-"\n"
-" * Append: on Apple hardware, the kernel append option is often used to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button\n"
-"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
-"The following are some examples:\n"
-"\n"
-"   \t      video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-"   \t      video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: this option can be used either to load initial modules before\n"
-"the boot device is available, or to load a ramdisk image for an emergency\n"
-"boot situation.\n"
-"\n"
-" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
-"need to allocate a large ramdisk, this option can be used to specify a\n"
-"ramdisk larger than the default.\n"
-"\n"
-" * Read-write: normally the \"root\" partition is initially mounted as\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
-"You can override the default with this option.\n"
-"\n"
-" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in ``novideo'' mode, with\n"
-"native frame buffer support.\n"
-"\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
-"highlighted with a ``*'' if you press [Tab] to see the boot selections."
-msgstr ""
-
-#: help.pm:894
+#: help.pm:786
 #, c-format
 msgid ""
-"Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to\n"
-"boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly\n"
-"detected and installed in the bootloader menu. If this is not the case, you\n"
-"can add an entry by hand in this screen. Take care to choose the correct\n"
-"parameters.\n"
-"\n"
-"Yaboot's main options are:\n"
-"\n"
-" * Init Message: a simple text message displayed before the boot prompt.\n"
-"\n"
-" * Boot Device: indicates where you want to place the information required\n"
-"to boot to GNU/Linux. Generally, you set up a bootstrap partition earlier\n"
-"to hold this information.\n"
-"\n"
-" * Open Firmware Delay: unlike LILO, there are two delays available with\n"
-"yaboot. The first delay is measured in seconds and at this point, you can\n"
-"choose between CD, OF boot, MacOS or Linux;\n"
-"\n"
-" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second increments\n"
-"before your default kernel description is selected;\n"
-"\n"
-" * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
-"at the first boot prompt.\n"
-"\n"
-" * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
-"Open Firmware at the first boot prompt.\n"
-"\n"
-" * Default OS: you can select which OS will boot by default when the Open\n"
-"Firmware Delay expires."
+"\"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver."
 msgstr ""
-
-#: help.pm:926
-#, c-format
-msgid ""
-"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
-"If you notice the sound card displayed is not the one that is actually\n"
-"present on your system, you can click on the button and choose another\n"
-"driver."
-msgstr ""
-"\"%s\": агар системангизда товуш картаси аниқланса у шу ерда кўрсатилади.\n"
-"Агар кўрсатилган товуш картаси системангиздаги товуш картаси\n"
+"\"%s\": агар компьютерда товуш картаси аниқланса у шу ерда кўрсатилади.\n"
+"Агар кўрсатилган товуш картаси компьютердаги товуш картаси\n"
 "билан мос келмаса, тугмани босиб бошқа драйверни танлашингиз мумкин."
 
-#: help.pm:929 help.pm:991 install_steps_interactive.pm:954
-#: install_steps_interactive.pm:971
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1019
+#: install_steps_interactive.pm:1036
 #, c-format
 msgid "Sound card"
 msgstr "Товуш карта"
 
-#: help.pm:932
+#: help.pm:791
 #, c-format
 msgid ""
-"As a review, DrakX will present a summary of information it has about your\n"
-"system. Depending on your installed hardware, you may have some or all of\n"
-"the following entries. Each entry is made up of the configuration item to\n"
-"be configured, followed by a quick summary of the current configuration.\n"
-"Click on the corresponding \"%s\" button to change that.\n"
+"As a review, DrakX will present a summary of information it has gathered\n"
+"about your system. Depending on the hardware installed on your machine, you\n"
+"may have some or all of the following entries. Each entry is made up of the\n"
+"hardware item to be configured, followed by a quick summary of the current\n"
+"configuration. Click on the corresponding \"%s\" button to make the change.\n"
 "\n"
 " * \"%s\": check the current keyboard map configuration and change it if\n"
 "necessary.\n"
 "\n"
-" * \"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
+" * \"%s\": check the current country selection. If you're not in this\n"
+"country, click on the \"%s\" button and choose another. If your country\n"
+"isn't in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
-" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+" * \"%s\": by default, DrakX deduces your time zone based on the country\n"
 "you have chosen. You can click on the \"%s\" button here if this is not\n"
 "correct.\n"
 "\n"
-" * \"%s\": check the current mouse configuration and click on the button to\n"
-"change it if necessary.\n"
+" * \"%s\": verify the current mouse configuration and click on the button\n"
+"to change it if necessary.\n"
 "\n"
 " * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
+"Guide'' for more information on how to set up a new printer. The interface\n"
+"presented in our manual is similar to the one used during installation.\n"
+"\n"
+" * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver.\n"
 "\n"
-" * \"%s\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver.\n"
+" * \"%s\": if you have a TV card, this is where information about its\n"
+"configuration will be displayed. If you have a TV card and it isn't\n"
+"detected, click on \"%s\" to try to configure it manually.\n"
+"\n"
+" * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
+"the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
-"\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
+" * \"%s\": if you wish to configure your Internet or local network access,\n"
+"you can do so now. Refer to the printed documentation or use the\n"
+"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"from full in-line help.\n"
 "\n"
-" * \"%s\": If you wish to configure your Internet or local network access\n"
-"now.\n"
+" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
+"you're installing on is to be located behind a proxy server.\n"
 "\n"
 " * \"%s\": this entry allows you to redefine the security level as set in a\n"
 "previous step ().\n"
@@ -4513,66 +4514,67 @@ msgid ""
 "the corresponding section of the ``Starter Guide'' for details about\n"
 "firewall settings.\n"
 "\n"
-" * \"%s\": if you wish to change your bootloader configuration, click that\n"
-"button. This should be reserved to advanced users.\n"
+" * \"%s\": if you wish to change your bootloader configuration, click this\n"
+"button. This should be reserved to advanced users. Refer to the printed\n"
+"documentation or the in-line help about bootloader configuration in the\n"
+"Mandrakelinux Control Center.\n"
 "\n"
-" * \"%s\": here you'll be able to fine control which services will be run\n"
+" * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
 "idea to review this setup."
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "Тугматаг"
-
-#: help.pm:991 install_steps_interactive.pm:913 standalone/drakclock:75
+#: help.pm:855 install_steps_interactive.pm:978 standalone/drakclock:101
 #, c-format
 msgid "Timezone"
 msgstr "Вақт зонаси"
 
-#: help.pm:991
-#, c-format
-msgid "Graphical Interface"
-msgstr "График интерфейс"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "ТВ карта"
 
-#: help.pm:991
+#: help.pm:855
 #, c-format
 msgid "ISDN card"
 msgstr "ISDN karta"
 
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "График интерфейс"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr "Тармоқ"
 
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "Проксилар"
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "Хавфсизлик даражаси"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr "Файервол"
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, c-format
 msgid "Bootloader"
-msgstr "ОС юклагичи"
+msgstr "ОТ юклагичи"
 
-#: help.pm:991 install_steps_interactive.pm:1069 services.pm:195
+#: help.pm:855 install_steps_interactive.pm:1137 services.pm:195
 #, c-format
 msgid "Services"
 msgstr "Хизматлар"
 
-#: help.pm:994
+#: help.pm:858
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
@@ -4580,7 +4582,7 @@ msgid ""
 "and will not be recoverable!"
 msgstr ""
 
-#: help.pm:999
+#: help.pm:863
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
@@ -4599,7 +4601,17 @@ msgstr ""
 "Маълумотни ва дискнинг барча қисмларини йўқотмасдан бу\n"
 "операцияни тўхтатиш учун \"%s\"ни босинг."
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "Кейинги ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- Олдинги"
+
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
@@ -4607,12 +4619,82 @@ msgid ""
 "Installation medium (please create a newer boot floppy)"
 msgstr ""
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "Сиз %s'ни ҳам формат қилишингиз керак"
 
-#: install_any.pm:402
+#: install_any.pm:390
+#, c-format
+msgid ""
+"The following installation media have been found.\n"
+"If you want to skip some of them, you can unselect them now."
+msgstr ""
+
+#: install_any.pm:411
+#, c-format
+msgid "Do you have further supplementary media?"
+msgstr "Сизда қўшимча компакт-диск борми?"
+
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:414
+#, c-format
+msgid ""
+"The following media have been found and will be used during install: %s.\n"
+"\n"
+"\n"
+"Do you have a supplementary installation media to configure?"
+msgstr ""
+"Ўрнатиш учун ишлатиладиган қуйидаги манба топилди: %s\n"
+"\n"
+"\n"
+"Сизда қўшимчи манба борми?"
+
+#: install_any.pm:420 printer/printerdrake.pm:2652
+#: printer/printerdrake.pm:2659 standalone/scannerdrake:176
+#: standalone/scannerdrake:184 standalone/scannerdrake:235
+#: standalone/scannerdrake:242
+#, c-format
+msgid "CD-ROM"
+msgstr "Компакт-диск"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (http)"
+msgstr "Тармоқ (http)"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "Тармоқ (ftp)"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "Ҳеч қандай ускуна топилмади"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr ""
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr ""
+
+#: install_any.pm:502 install_any.pm:506
+#, c-format
+msgid "URL of the mirror?"
+msgstr ""
+
+#: install_any.pm:532
+#, fuzzy, c-format
+msgid "Can't find hdlist file on this mirror"
+msgstr "%s'ни %s'да топиб бўлмади."
+
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:713
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -4626,7 +4708,8 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: install_any.pm:423
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:736
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -4639,41 +4722,46 @@ msgstr ""
 "\n"
 "Давом этишни истайсизми?\n"
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Илтимос %s ускунасига формати FAT бўлган дискетни қўйинг"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Бу дискетнинг формати FAT эмас"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
 
-#: install_any.pm:862 partition_table.pm:848
+#: install_any.pm:1160 partition_table.pm:595
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s файлини ўқишда хато рўй берди"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, c-format
+msgid "%s (was %s)"
+msgstr "%s (аввал %s)"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
 msgstr ""
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "Тизимни ўрнатиш"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
 msgstr "Тизимни мослаш"
@@ -4707,7 +4795,7 @@ msgstr ""
 "\n"
 "Бунга қарамасдан давом этишни истайсизми?"
 
-#: install_interactive.pm:70 install_steps.pm:207
+#: install_interactive.pm:70 install_steps.pm:211
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Сизда /boot/efi нуқтасига уланган дискнинг FAT қисми бўлиши шарт"
@@ -4767,7 +4855,7 @@ msgstr "Дискнинг қайси қисмининг ҳажмини ўзгар
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
 msgstr ""
 
 #: install_interactive.pm:156
@@ -4783,7 +4871,8 @@ msgid ""
 "installation."
 msgstr ""
 
-#: install_interactive.pm:164
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_interactive.pm:166
 #, c-format
 msgid ""
 "WARNING!\n"
@@ -4798,55 +4887,55 @@ msgid ""
 "When sure, press Ok."
 msgstr ""
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr ""
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "дискнинг %s қисми"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
 msgstr "Дискнинг Windows қисмининг ҳажмини ўзгартириш"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Дискнинг FAT қисмининг ҳажмини ўзгартириш муваффақиятсиз тугади: %s"
 
-#: install_interactive.pm:206
+#: install_interactive.pm:208
 #, c-format
 msgid "There is no FAT partition to resize (or not enough space left)"
 msgstr ""
 "Ҳажмини ўзгартириш учу дискда FAT қисм мавжуд эмас (ёки етарли жой мавжуд "
 "эмас)"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "Windows(TM)'ни ўчириш"
 
-#: install_interactive.pm:213
+#: install_interactive.pm:215
 #, c-format
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
 "Сизда биттадан кўп қаттиқ диск мавжуд. Уларни қайсига Linux'ни ўрнатасиз?"
 
-#: install_interactive.pm:217
+#: install_interactive.pm:219
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "%s дискнинг барча қисмлари ва улардаги барча маълумот ўчирилади"
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
 msgstr "Fdisk дастуридан фойдаланиш"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4855,32 +4944,33 @@ msgstr ""
 "Энди сиз %s дискни бўлишингиз мумкин.\n"
 "Тугатгач \"w\" билан сақлаш эсингиздан чиқмасин."
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "Ўрнатиш учун жой топилмади"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX дискни бўлиш ёрдамчиси қуйидаги ечимларни топди:"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Дискни бўлиш муваффақиятсиз тугади: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "Тармоқ ишга туширилмоқда"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "Тармоқ ўчирилмоқда"
 
-#: install_messages.pm:9
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
 #, c-format
 msgid ""
 "Introduction\n"
@@ -4898,7 +4988,7 @@ msgid ""
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"MandrakeSoft S.A. which applies to the Software Products.\n"
+"Mandrakesoft S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -4920,7 +5010,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"MandrakeSoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -4928,14 +5018,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if MandrakeSoft S.A. has been advised of the possibility or "
-"occurence of such \n"
+"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, MandrakeSoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -4965,10 +5055,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to MandrakeSoft.\n"
-"The programs developed by MandrakeSoft S.A. are governed by the GPL License. "
+"to Mandrakesoft.\n"
+"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by MandrakeSoft S.A. is governed by a specific license. Please refer to the "
+"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -4979,11 +5069,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
+"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
 "\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"MandrakeSoft S.A.  \n"
+"Mandrakesoft S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -4999,14 +5089,14 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A.  \n"
+"For any question on this document, please contact Mandrakesoft S.A.  \n"
 msgstr ""
 "Кириш\n"
 "\n"
-"Mandrakelinux дистрибутивида мавжуд бўлган операцион система ва унинг турли "
+"Mandrakelinux дистрибутивида мавжуд бўлган операцион тизим ва унинг турли "
 "қисмлари \n"
 "бундан буён \"Дастурий Маҳсулотлар\" деб юритилади. Дастурий маҳсулотлар \n"
-"Mandrakelinux дистрибутивнинг қисмлари ва операцион система билан боғлиқ "
+"Mandrakelinux дистрибутивнинг қисмлари ва операцион тизим билан боғлиқ "
 "бўлган\n"
 "дастурлар тўплами, усуллар, қоидалар ва қўлланмаларни ўз ичига олади, аммо "
 "бу билан чекланмайди.\n"
@@ -5015,7 +5105,7 @@ msgstr ""
 "1. Лицензия келишуви\n"
 "\n"
 "Илтимос, ушбу ҳужжатни диққат билан ўқиб чиқинг. Бу ҳужжат Сиз билан "
-"MandrakeSoft S.A. \n"
+"Mandrakesoft S.A. \n"
 "ўртасида Дастурий Маҳсулотлари бўйича имзоланадиган лицензия келишувидир.\n"
 "Дастурий Маҳсулотларни ҳар қандай мақсад билан ўрнатиб, кўпайтириб ёки \n"
 "улардан фойдаланиб Сиз мазкур Лицензиянинг шартлари ва қоидаларини тўлиқ "
@@ -5037,7 +5127,7 @@ msgstr ""
 "\n"
 "Дастурий Маҳсулотлар ва уларга илова қилинган қўлланмалар \"ўз ҳолича\", "
 "қонунда йўл қўйилган\n"
-"даражада ҳеч қандай кафолатларсиз тақдим қилинади. MandrakeSoft S.A. қонунда "
+"даражада ҳеч қандай кафолатларсиз тақдим қилинади. Mandrakesoft S.A. қонунда "
 "йўл қўйилган\n"
 "даражада ҳеч қандай ҳолатда Дастурий Маҳсулотлардан фойдаланиш ёки "
 "фойдаланмаслик оқибатида\n"
@@ -5046,19 +5136,19 @@ msgstr ""
 "касод бўлиши, тижорат фаолиятидаги узилишлар, молиявий зарарлар, суд "
 "маҳкамалари натижасидаги\n"
 "суд харажатлари ёки жарималар ёки бошқа ҳар қандай билвосита йўқотишлар) "
-"учун, ҳатто MandrakeSoft S.A.'га\n"
+"учун, ҳатто Mandrakesoft S.A.'га\n"
 "шундай зарар кўриш имконияти ёки ҳолатлари маълум бўлган тақдирда ҳам,\n"
 "жавобгар бўлмайди.\n"
 "\n"
 "БАЪЗИ МАМЛАКАТЛАРДА МАН ҚИЛИНГАН ДАСТУРИЙ МАҲСУЛОТЛАРГА ЭГАЛИК ҚИЛИШ\n"
 "ЁКИ УЛАРДАН ФОЙДАЛАНИШ БИЛАН БОҒЛИҚ ЧЕКЛАНГАН МАСЪУЛИЯТ\n"
 "\n"
-"MandrakeSoft S.A. ёки унинг тарқатувчилари қонунда йўл қўйилган даражада ҳеч "
+"Mandrakesoft S.A. ёки унинг тарқатувчилари қонунда йўл қўйилган даражада ҳеч "
 "қандай ҳолатда\n"
 "баъзи мамлакатларнинг маҳаллий қонунлари билан чекланган ёки ман қилинган "
 "дастурий\n"
-"маҳсулотларнинг қисмларига эгалик қилиш ва улардан фойдаланиш, ёки Mandrake "
-"Linux\n"
+"маҳсулотларнинг қисмларига эгалик қилиш ва улардан фойдаланиш, ёки "
+"Mandrakelinux\n"
 "сайтларининг биридан дастурий маҳсулотнинг қисмларини кўчириб олиш оқибатида "
 "тасодифий,\n"
 "тўғридан-тўғри, бевосита ёки билвосита етказилган зарарлар (шу жумладан "
@@ -5086,11 +5176,11 @@ msgstr ""
 "ҳар бири\n"
 "учун лицензия келишувининг шартлари ва қоидаларини диққат билан ўқиб чиқинг. "
 "Қисмнинг\n"
-"лицензиясига оид ҳар қандай саволлар MandrakeSoft'га эмас, балки қисмнинг "
+"лицензиясига оид ҳар қандай саволлар Mandrakesoft'га эмас, балки қисмнинг "
 "муаллифига юборилиши\n"
-"лозим. MandrakeSoft S.A. томонидан ишлаб чиқилган дастурлар GPL лицензияси "
+"лозим. Mandrakesoft S.A. томонидан ишлаб чиқилган дастурлар GPL лицензияси "
 "таъсири\n"
-"остидадир. MandrakeSoft S.A. томонидан ёзилган қўлланмалар эса махсус "
+"остидадир. Mandrakesoft S.A. томонидан ёзилган қўлланмалар эса махсус "
 "лицензия таъсири\n"
 "остидадир. Илтимос, қўшимча маълумот учун қўлланмаларга мурожаат қилинг.\n"
 "\n"
@@ -5101,12 +5191,12 @@ msgstr ""
 "муаллифларига\n"
 "тегишли бўлиб, интеллектуал мулк ва дастурий маҳсулотларга оид муаллифлик "
 "ҳуқуқи\n"
-"тўғрисидаги қонунлар билан ҳимояланади. MandrakeSoft S.A. Дастурий "
+"тўғрисидаги қонунлар билан ҳимояланади. Mandrakesoft S.A. Дастурий "
 "Маҳсулотларни тўлиқ\n"
 "ёки қисман, ҳар қандай йўл билан ва исталган мақсадларда ўзгартириш ёки "
 "мослаштириш ҳуқуқини\n"
 "ўзида сақлаб қолади. \"Mandrake\", \"Mandrakelinux\" ва тегишли белгилар "
-"MandrakeSoft S.A.'га\n"
+"Mandrakesoft S.A.'га\n"
 "тегишли савдо белгиларидир.\n"
 "\n"
 "\n"
@@ -5124,10 +5214,10 @@ msgstr ""
 "судда муҳокама қилинади.\n"
 "Сўнгги навбатда масаланинг кўрилиши тегишли Париж (Франция) Қонунчилик "
 "судига ҳавола қилинади.\n"
-"Илтимос, мазкур ҳужжатга оид ҳар қандай саволлар бўйича MandrakeSoft S.A. "
+"Илтимос, мазкур ҳужжатга оид ҳар қандай саволлар бўйича Mandrakesoft S.A. "
 "билан боғланинг.\n"
 
-#: install_messages.pm:89
+#: install_messages.pm:90
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -5139,7 +5229,8 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#: install_messages.pm:96
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:98
 #, c-format
 msgid ""
 "\n"
@@ -5172,7 +5263,7 @@ msgid ""
 "copyright laws applicable to software programs.\n"
 msgstr ""
 
-#: install_messages.pm:128
+#: install_messages.pm:131
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -5205,30 +5296,31 @@ msgstr ""
 "Тизимни мослаш ҳақида маълумот Mandrakelinux\n"
 "фойдаланувчилари учун расмий қўлланмасида мавжуд."
 
-#: install_messages.pm:141
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/100errata.php3"
-msgstr "http://www.mandrakelinux.com/en/100errata.php3"
+msgid "http://www.mandrakelinux.com/en/101errata.php3"
+msgstr "http://www.mandrakelinux.com/en/101errata.php3"
 
-#: install_steps.pm:242
+#: install_steps.pm:246
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Бир ҳил улаш нуқталари %s"
 
-#: install_steps.pm:407
+#: install_steps.pm:477
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
 "\"\n"
 msgstr ""
 "Баъзи бир муҳим пакетлар тўғри ўрнатилмади.\n"
 "Сизнинг компакт-диск ускунангизда ёки компакт-дискингизда хато бор.\n"
-"Компакт-дискни ўрнатилган компьютерда \"rpm -qpl Mandrake/RPMS/*.rpm\" "
-"буйруғи билан текшириб кўринг.\n"
+"Компакт-дискни ўрнатилган компьютерда \"rpm -qpl media/main/*.rpm\" буйруғи "
+"билан текшириб кўринг.\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "Ҳеч қандай дискет ускунаси мавжуд эмас"
@@ -5238,7 +5330,7 @@ msgstr "Ҳеч қандай дискет ускунаси мавжуд эмас"
 msgid "Entering step `%s'\n"
 msgstr "%s босқичга ўтилмоқда\n"
 
-#: install_steps_gtk.pm:178
+#: install_steps_gtk.pm:184
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -5247,94 +5339,94 @@ msgid ""
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: install_steps_gtk.pm:232 install_steps_interactive.pm:580
+#: install_steps_gtk.pm:235 install_steps_interactive.pm:628
 #, c-format
 msgid "Package Group Selection"
 msgstr "Пакетларни гуруҳ бўйича танлаш"
 
-#: install_steps_gtk.pm:294 install_steps_interactive.pm:519
+#: install_steps_gtk.pm:264 install_steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Жами: %d / %d Мб"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
 msgstr "Ёмон пакет"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
 #, c-format
 msgid "Version: "
 msgstr "Версияси: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "Size: "
 msgstr "Ҳажми: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "%d KB\n"
 msgstr "%d Кб\n"
 
-#: install_steps_gtk.pm:344
+#: install_steps_gtk.pm:313
 #, c-format
 msgid "Importance: "
 msgstr "Муҳимлиги: "
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
 msgstr "Бу пакетни танлолмайсиз/танлашни бекор қилолмайсиз"
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
 #, c-format
 msgid "due to missing %s"
 msgstr "%s етишмагани учун"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "in order to keep %s"
-msgstr ""
+msgstr "%s'ни қолдириш учун"
 
-#: install_steps_gtk.pm:389
+#: install_steps_gtk.pm:358
 #, c-format
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr ""
 "Бу пакетни танлолмайсиз, чунки уни ўрнатиш учун етарли жой мавжуд эмас."
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Қуйидаги пакетлар ўрнатилади"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Қуйидаги пакетлар олиб ташланилади."
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Бу ўрнатилиши шарт бўлган пакет, уни танлашни бекор қилиб бўлмайди."
 
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
 #, c-format
 msgid "You can't unselect this package. It is already installed"
 msgstr "Бу пакетни танлашни бекор қилолмайсиз. У аллақачон ўрнатилган."
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -5343,237 +5435,241 @@ msgstr ""
 "Бу пакет янгиланиши шарт.\n"
 "Уни танлашни бекор қилишга ишончингиз комилми?"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Бу пакетни танлашни бекор қилолмайсиз. У янгиланиши шарт."
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Автоматик равишда танланган пакетларни кўрсатиш"
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "Дискетдан/га юклаш/сақлаш"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "Пакетлар танлови янгиланмоқда"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "Минимал ўрнатиш"
 
-#: install_steps_gtk.pm:455 install_steps_interactive.pm:427
+#: install_steps_gtk.pm:424 install_steps_interactive.pm:481
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Сиз ўрнатмоқчи бўлган пакетларни танланг"
 
-#: install_steps_gtk.pm:471 install_steps_interactive.pm:666
+#: install_steps_gtk.pm:440 install_steps_interactive.pm:720
 #, c-format
 msgid "Installing"
 msgstr "Ўрнатилмоқда"
 
-#: install_steps_gtk.pm:477
-#, c-format
-msgid "No details"
-msgstr "Тафсилотларсиз"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "Чамаланмоқда"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "Қолган вақт "
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "Илтимос кутиб туринг, ўрнатишга тайёрланмоқда..."
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "Тафсилотларсиз"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "%d пакет"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "%s пакети ўрнатилмоқда"
 
-#: install_steps_gtk.pm:598 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:690
+#: install_steps_gtk.pm:567 install_steps_interactive.pm:94
+#: install_steps_interactive.pm:745
 #, c-format
 msgid "Refuse"
 msgstr "Рад этиш"
 
-#: install_steps_gtk.pm:599 install_steps_interactive.pm:691
+#: install_steps_gtk.pm:571 install_steps_interactive.pm:749
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
-"\n"
 "Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
 "done.\n"
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "Компакт-дискни алмаштиринг!\n"
 "\n"
-"Илтимос \"%s\" белгили компакт-дискни қўйинг ва \"Ок\" тугмасини босинг.\n"
+"Илтимос '%s' белгили компакт-дискни қўйинг ва \"Ок\" тугмасини босинг.\n"
 "Агар у сизда бўлмаса, бу компакт-дискдан ўрнатишни бекор қилиш учун \"Бекор "
 "қилиш\" тугмасини босинг."
 
-#: install_steps_gtk.pm:614 install_steps_interactive.pm:703
+#: install_steps_gtk.pm:586 install_steps_interactive.pm:760
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Қуйидаги пакетларни саралашда хато рўй берди:"
 
-#: install_steps_gtk.pm:614 install_steps_gtk.pm:618
-#: install_steps_interactive.pm:703 install_steps_interactive.pm:707
+#: install_steps_gtk.pm:586 install_steps_gtk.pm:590
+#: install_steps_interactive.pm:760 install_steps_interactive.pm:764
 #, c-format
 msgid "Go on anyway?"
 msgstr "Бунга қарамасдан давом этишни истайсизми?"
 
-#: install_steps_gtk.pm:618 install_steps_interactive.pm:707
+#: install_steps_gtk.pm:590 install_steps_interactive.pm:764
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "Қуйидаги пакетларни ўрнатишда хато рўй берди:"
 
-#: install_steps_gtk.pm:658 install_steps_interactive.pm:869
-#: install_steps_interactive.pm:1021
+#: install_steps_gtk.pm:632 install_steps_interactive.pm:934
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "not configured"
 msgstr "мосланмаган"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, c-format
 msgid "Do you want to recover your system?"
 msgstr ""
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "Лицензия келишуви"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr "Янги нарсалар"
+
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Илтимос тугмалар тартибини танланг."
 
-#: install_steps_interactive.pm:113
+#: install_steps_interactive.pm:123
 #, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "Мавжуд бўлган тугматагларнинг тўлиқ рўйхати"
 
-#: install_steps_interactive.pm:143
+#: install_steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Ўрнатиш/Янгилаш"
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Бу ўрнатишми ёки янгилашми?"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s'ни янгилаш"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s учун кодлаш калити"
 
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Илтимос сичқончанинг турини танланг."
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Сичқончанинг порти"
 
-#: install_steps_interactive.pm:187 standalone/mousedrake:47
+#: install_steps_interactive.pm:197 standalone/mousedrake:47
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Илтимос сичқонча уланган кетма-кет портини танланг."
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
 #, c-format
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr "PCMCIA карталар мосланмоқда..."
 
-#: install_steps_interactive.pm:228
+#: install_steps_interactive.pm:238
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: install_steps_interactive.pm:228
+#: install_steps_interactive.pm:238
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE'ни мослаш"
 
-#: install_steps_interactive.pm:248 network/tools.pm:155
+#: install_steps_interactive.pm:258 network/tools.pm:187
 #, c-format
 msgid "No partition available"
 msgstr "Дискнинг қисми йўқ."
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Улаш нуқталарини топиш учун дискнинг қисмлари текширилмоқда"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "Улаш нуқталарини танланг"
 
-#: install_steps_interactive.pm:288
+#: install_steps_interactive.pm:300
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Формат қилиш учун дискнинг қисмларини танланг"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
 msgstr " Хато блокларни текширайми?"
 
-#: install_steps_interactive.pm:359
+#: install_steps_interactive.pm:371
 #, c-format
 msgid ""
 "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
@@ -5582,83 +5678,94 @@ msgstr ""
 "%s файл тизимини текшириш муваффақиятсиз тугади. Хатоларни тузатишни "
 "истайсизми? (эсингизда турсин, сиз маълумотни йўқотишингиз мумкин)"
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr ""
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr ""
 "Мавжуд бўлган пакетларни қидириш ва rpm маълумот базасини бошқадан яратиш "
 "бажарилмоқда..."
 
-#: install_steps_interactive.pm:370 install_steps_interactive.pm:389
+#: install_steps_interactive.pm:382 install_steps_interactive.pm:442
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Мавжуд бўлган пакетлар қидирилмоқда..."
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Аллақачон ўрнатилган пакетлар қидирилмоқда..."
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Янгилаш учун пакетлар қидирилмоқда..."
 
-#: install_steps_interactive.pm:398
+#: install_steps_interactive.pm:405 install_steps_interactive.pm:834
+#, c-format
+msgid ""
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr ""
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "Пакетларни олиш учун ойнани танланг"
+
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
 "> %d)"
 msgstr "Тизимда ўрнатиш ёки янгилаш учун етарли жой қолмади (%d > %d)"
 
-#: install_steps_interactive.pm:439
+#: install_steps_interactive.pm:493
 #, c-format
 msgid ""
 "Please choose load or save package selection on floppy.\n"
 "The format is the same as auto_install generated floppies."
 msgstr ""
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
 msgstr "Дискетдан юклаш"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
 msgstr "Дискетга сақлаш"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "Пакетларни танлаш"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
 msgstr "Дискетдан юкланмоқда"
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "Пакетлар танлови мавжуд бўлган дискетни қўйинг"
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Танланган ҳажм мавжуд бўлган бўш жойдан катта"
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "Ўрнатишнинг тури"
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
@@ -5667,22 +5774,22 @@ msgstr ""
 "Сиз ҳеч қандай пакетлар гуруҳини танламадингиз.\n"
 "Илтимос сиз истаган минимал ўрнатишни танланг:"
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Асосий қўлланмалар билан (тавсия қилинади!)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Ҳақиқий минимал ўрнатиш (хусусан urpmi'сиз)"
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "Ҳаммаси"
 
-#: install_steps_interactive.pm:641
+#: install_steps_interactive.pm:694
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -5695,17 +5802,17 @@ msgstr ""
 "Агар улардан баъзи бири бўлмаса, уларни танлашни бекор қилинг ва \"Ок\" "
 "тугмасини босинг."
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "\"%s\" белгили компакт-диск"
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
 msgstr "Ўрнатишга тайёрланмоқда"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5714,17 +5821,17 @@ msgstr ""
 "%s пакети ўрнатилмоқда\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "Ўрнатишдан кейин мослаш"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr ""
 
-#: install_steps_interactive.pm:748
+#: install_steps_interactive.pm:813
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -5734,88 +5841,77 @@ msgid ""
 "To download these packages, you will need to have a working Internet \n"
 "connection.\n"
 "\n"
-"Do you want to install the updates ?"
-msgstr ""
-
-#: install_steps_interactive.pm:769
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Do you want to install the updates?"
 msgstr ""
 
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "Пакетларни олиш учун ойнани танланг"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr ""
 "Мавжуд бўлган пакетларнинг рўйхатини олиш учун ойна билан алоқа "
 "ўрнатилмоқда..."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Ойна (%s)билан алоқа ўрнатиб бўлмади."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Бошқадан уриниб кўришни истайсизми?"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Вақт зонангизни танланг?"
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr ""
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
 #, c-format
 msgid "NTP Server"
 msgstr "NTP сервери"
 
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Ҳисобот"
 
-#: install_steps_interactive.pm:886 install_steps_interactive.pm:894
-#: install_steps_interactive.pm:912 install_steps_interactive.pm:919
-#: install_steps_interactive.pm:1068 services.pm:135
-#: standalone/drakbackup:1572
+#: install_steps_interactive.pm:951 install_steps_interactive.pm:959
+#: install_steps_interactive.pm:977 install_steps_interactive.pm:984
+#: install_steps_interactive.pm:1136 services.pm:135
+#: standalone/drakbackup:1593
 #, c-format
 msgid "System"
 msgstr "Тизим"
 
-#: install_steps_interactive.pm:926 install_steps_interactive.pm:953
-#: install_steps_interactive.pm:970 install_steps_interactive.pm:986
-#: install_steps_interactive.pm:997
+#: install_steps_interactive.pm:991 install_steps_interactive.pm:1018
+#: install_steps_interactive.pm:1035 install_steps_interactive.pm:1051
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "Hardware"
 msgstr "Асбоб-ускуналар"
 
-#: install_steps_interactive.pm:932 install_steps_interactive.pm:941
+#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
 #, c-format
 msgid "Remote CUPS server"
 msgstr "Масофадаги CUPS сервери"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "Принтер йўқ"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Сизда ISA товуш картаси борми?"
 
-#: install_steps_interactive.pm:976
+#: install_steps_interactive.pm:1041
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -5824,97 +5920,92 @@ msgstr ""
 "Ўрнатишдан кейин, товуш картангизни мослаш учун, \"sndconfig\" ёки \"alsaconf"
 "\" дастурини ишга туширинг"
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Товуш картаси топилмади. Ўрнатишдан кейин \"harddrake\" дастурини синаб "
 "кўринг."
 
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
 #, c-format
 msgid "Graphical interface"
 msgstr "График интерфейс"
 
-#: install_steps_interactive.pm:1004 install_steps_interactive.pm:1019
+#: install_steps_interactive.pm:1069 install_steps_interactive.pm:1084
 #, c-format
 msgid "Network & Internet"
 msgstr "Тармоқ ва Интернет"
 
-#: install_steps_interactive.pm:1020
-#, c-format
-msgid "Proxies"
-msgstr "Проксилар"
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "configured"
 msgstr "мосланган"
 
-#: install_steps_interactive.pm:1030 install_steps_interactive.pm:1044
+#: install_steps_interactive.pm:1095 install_steps_interactive.pm:1109
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "Хавфсизлик"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "activated"
 msgstr "ишлаяпти"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "disabled"
 msgstr "ўчирилган"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
 msgstr "Тизимни юкланиши"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:1127
 #, c-format
 msgid "%s on %s"
 msgstr "%s %s'да"
 
-#: install_steps_interactive.pm:1073 services.pm:177
+#: install_steps_interactive.pm:1141 services.pm:177
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "Хизматлар: %d ишламоқда %d қайд қилинган"
 
-#: install_steps_interactive.pm:1083
+#: install_steps_interactive.pm:1151
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Сиз X'ни мосламадингиз. Ростдан буни истайсизми?"
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr ""
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "Root учун махфий сўз"
 
-#: install_steps_interactive.pm:1152
+#: install_steps_interactive.pm:1217
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "Бу махфий сўз жуда қисқа (у энг ками %d белгидан иборат бўлиши шарт)"
 
-#: install_steps_interactive.pm:1157 network/netconnect.pm:575
-#: standalone/drakauth:26 standalone/drakconnect:461
+#: install_steps_interactive.pm:1222 network/netconnect.pm:596
+#: standalone/drakauth:25 standalone/drakauth:27 standalone/drakconnect:457
 #, c-format
 msgid "Authentication"
 msgstr "Тасдиқлаш"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
-msgstr "ОС юклагичи тайёрланмоқда..."
+msgstr "ОТ юклагичи тайёрланмоқда..."
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -5923,64 +6014,41 @@ msgid ""
 " need to use BootX or some other means to boot your machine"
 msgstr ""
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "aboot дастуридан фойдаланишни истайсизми?"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "ОС юклагичи ўрнатилмоқда"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr ""
-"Операцион система юклагичини ўрнатиш муваффақиятсиз тугади. Қуйидаги хато "
-"рўй берди:"
-
-#: install_steps_interactive.pm:1230
-#, c-format
-msgid ""
-"You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader.  If you don't see the bootloader prompt at\n"
-" reboot, hold down Command-Option-O-F at reboot and enter:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Then type: shut-down\n"
-"At your next boot you should see the bootloader prompt."
-msgstr ""
-
-#: install_steps_interactive.pm:1243
+#: install_steps_interactive.pm:1294
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: install_steps_interactive.pm:1275 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1322 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Бўш дискетни %s ускунасига қўйинг"
 
-#: install_steps_interactive.pm:1280
+#: install_steps_interactive.pm:1327
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "Илтимос драйверлар учун бошқа дискетни қўйинг"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Авто-ўрнатиш дискети яратилмоқда..."
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -5991,12 +6059,12 @@ msgstr ""
 "\n"
 "Ростдан чиқишни истайсизми?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Авто-ўрнатиш дискетни яратиш"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -6011,7 +6079,8 @@ msgstr ""
 msgid "Mandrakelinux Installation %s"
 msgstr "Mandrakelinux'ни ўрнатиш %s"
 
-#: install_steps_newt.pm:33
+#. -PO: This string must fit in a 80-char wide text screen
+#: install_steps_newt.pm:34
 #, c-format
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
@@ -6023,17 +6092,37 @@ msgstr ""
 msgid "Choose a file"
 msgstr "Файлни танланг"
 
+#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakbackup:1534
+#: standalone/drakfont:592 standalone/drakfont:659 standalone/drakups:297
+#: standalone/drakups:357 standalone/drakups:377 standalone/drakvpn:333
+#: standalone/drakvpn:694
+#, c-format
+msgid "Add"
+msgstr "Қўшиш"
+
+#: interactive.pm:295 interactive/gtk.pm:482
+#, c-format
+msgid "Modify"
+msgstr "Ўзгартириш"
+
+#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakups:299
+#: standalone/drakups:359 standalone/drakups:379 standalone/drakvpn:333
+#: standalone/drakvpn:694
+#, c-format
+msgid "Remove"
+msgstr "Олиб ташлаш"
+
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr "Асосий"
 
-#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:510
+#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:515
 #, c-format
 msgid "Finish"
 msgstr "Тайёр"
 
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
 #, c-format
 msgid "Do"
 msgstr "Бажариш"
@@ -6109,572 +6198,765 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Бошқадан жўнатиш"
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "Чехча (qwertz)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "Олмонча"
 
-#: keyboard.pm:163
+#: keyboard.pm:165
 #, c-format
-msgid "Dvorak"
+msgid ""
+"_: keyboard\n"
+"Dvorak"
 msgstr "Дворак"
 
-#: keyboard.pm:164 keyboard.pm:204
+#: keyboard.pm:166 keyboard.pm:206
 #, c-format
-msgid "Spanish"
+msgid ""
+"_: keyboard\n"
+"Spanish"
 msgstr "Испанча"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "Финча"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
 #, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
 msgstr "Французча"
 
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
 #, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
 msgstr "Норвегча"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "Полякча"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "Русча"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "Шведча"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "Буюк Британия"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "АҚШ"
 
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "Албанча"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "Арманча (эски)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "Арманча (ёзиш мошинаси)"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "Арманча (фонетик)"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr "Арабча"
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "Озарбайжонча (лотин)"
 
-#: keyboard.pm:182
+#: keyboard.pm:183
 #, c-format
-msgid "Belgian"
+msgid ""
+"_: keyboard\n"
+"Belgian"
 msgstr "Белгиача"
 
-#: keyboard.pm:183
+#: keyboard.pm:184
 #, c-format
-msgid "Bengali"
+msgid ""
+"_: keyboard\n"
+"Bengali"
 msgstr "Бенгалча"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "Болгарча (фонетик)"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "Болгарча (BDS)"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "Бразилча (ABNT-2)"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
 msgstr "Боснияча"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr "Белорусча"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "Швейцария (Олмонча)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "Швейцария (Французча)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "Чехча (qwerty)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "Олмонча (ўлик тугмаларсиз)"
 
-#: keyboard.pm:197
+#: keyboard.pm:198
 #, c-format
-msgid "Devanagari"
+msgid ""
+"_: keyboard\n"
+"Devanagari"
 msgstr "Деванагари"
 
-#: keyboard.pm:198
+#: keyboard.pm:199
 #, c-format
-msgid "Danish"
+msgid ""
+"_: keyboard\n"
+"Danish"
 msgstr "Дания"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Дворак (АҚШ)"
 
-#: keyboard.pm:200
+#: keyboard.pm:201
 #, c-format
-msgid "Dvorak (Esperanto)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
 msgstr "Дворак (Эсперанто)"
 
-#: keyboard.pm:201
+#: keyboard.pm:202
 #, c-format
-msgid "Dvorak (Norwegian)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
 msgstr "Дворак (Норвегча)"
 
-#: keyboard.pm:202
+#: keyboard.pm:203
 #, c-format
-msgid "Dvorak (Swedish)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
 msgstr "Дворак (Шведча)"
 
-#: keyboard.pm:203
+#: keyboard.pm:205
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "Эстонча"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "Грузинча (рус)"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "Грузинча (лотин)"
 
-#: keyboard.pm:209
+#: keyboard.pm:211
 #, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
 msgstr "Грекча"
 
-#: keyboard.pm:210
+#: keyboard.pm:212
 #, c-format
-msgid "Greek (polytonic)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
 msgstr "Грекча (политоник)"
 
-#: keyboard.pm:211
+#: keyboard.pm:213
 #, c-format
-msgid "Gujarati"
+msgid ""
+"_: keyboard\n"
+"Gujarati"
 msgstr "Гужарати"
 
-#: keyboard.pm:212
+#: keyboard.pm:214
 #, c-format
-msgid "Gurmukhi"
+msgid ""
+"_: keyboard\n"
+"Gurmukhi"
 msgstr "Гурмухи"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
-msgid "Hungarian"
+msgid ""
+"_: keyboard\n"
+"Hungarian"
 msgstr "Венгрча"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
 msgstr "Хорватча"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
 msgstr "Ирландча"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
-msgid "Israeli"
+msgid ""
+"_: keyboard\n"
+"Israeli"
 msgstr "Исроилча"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
 msgstr "Исроилча (фонетик)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "Эронча"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
 msgstr "Исландча"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
 msgstr "Италянча"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
-msgid "Inuktitut"
+msgid ""
+"_: keyboard\n"
+"Inuktitut"
 msgstr "Инуктитут"
 
-#: keyboard.pm:225
+#: keyboard.pm:229
 #, c-format
-msgid "Japanese 106 keys"
+msgid ""
+"_: keyboard\n"
+"Japanese 106 keys"
 msgstr "Японча 106 тугма"
 
-#: keyboard.pm:226
+#: keyboard.pm:230
 #, c-format
-msgid "Kannada"
+msgid ""
+"_: keyboard\n"
+"Kannada"
 msgstr "Каннада"
 
-#: keyboard.pm:229
+#: keyboard.pm:233
 #, c-format
-msgid "Korean keyboard"
+msgid ""
+"_: keyboard\n"
+"Korean"
 msgstr "Корейсча"
 
-#: keyboard.pm:230
+#: keyboard.pm:234
 #, c-format
-msgid "Kyrgyz keyboard"
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
 msgstr "Қирғизча"
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "Лотин Америкача"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "Лаосча"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "Литвача AZERTY (эски)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "Литвача AZERTY (янги)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "Литвача \"рақамли қатор\" (qwerty)"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "Литвача \"фонетик\" (qwerty)"
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "Латвиача"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr "Малайалам"
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "Македонча"
 
-#: keyboard.pm:241
+#: keyboard.pm:249
 #, c-format
-msgid "Myanmar (Burmese)"
+msgid ""
+"_: keyboard\n"
+"Myanmar (Burmese)"
 msgstr "Мянмар (Бирма)"
 
-#: keyboard.pm:242
+#: keyboard.pm:250
 #, c-format
-msgid "Mongolian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Mongolian (cyrillic)"
 msgstr "Муғулча (кирил)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "Малта (Буюк Британия)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "Малта (АҚШ)"
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "Голландча"
 
-#: keyboard.pm:247
+#: keyboard.pm:255
 #, c-format
-msgid "Oriya"
+msgid ""
+"_: keyboard\n"
+"Oriya"
 msgstr "Ория"
 
-#: keyboard.pm:248
+#: keyboard.pm:256
 #, c-format
-msgid "Polish (qwerty layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwerty layout)"
 msgstr "Полякча (qwerty)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "Полякча (qwertz)"
 
-#: keyboard.pm:250
+#: keyboard.pm:258
 #, c-format
-msgid "Portuguese"
+msgid ""
+"_: keyboard\n"
+"Portuguese"
 msgstr "Португалча"
 
-#: keyboard.pm:251
+#: keyboard.pm:260
 #, c-format
-msgid "Canadian (Quebec)"
+msgid ""
+"_: keyboard\n"
+"Canadian (Quebec)"
 msgstr "Канадча (Квебек)"
 
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr "Руминча (qwertz)"
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "Руминча (qwerty)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "Русча (фонетик)"
 
-#: keyboard.pm:257
+#: keyboard.pm:266
 #, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
 msgstr "Саами (Норвегча)"
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr "Саами (Шведча/Финча)"
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "Словенча"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "Словакча (qwertz)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "Словакча (qwerty)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "Сербча (кирилча)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "Сурияча"
 
-#: keyboard.pm:266
+#: keyboard.pm:275
 #, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
 msgstr "Эски Сурияча (фонетик)"
 
-#: keyboard.pm:267
+#: keyboard.pm:276
 #, c-format
-msgid "Telugu"
+msgid ""
+"_: keyboard\n"
+"Telugu"
 msgstr "Телегу"
 
-#: keyboard.pm:269
+#: keyboard.pm:278
 #, c-format
-msgid "Tamil (ISCII-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (ISCII-layout)"
 msgstr "Тамилча (ISCII)"
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "Тамилча (ёзиш мошинаси)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "Тайча"
 
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "Тожикча"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "Туркча (анъанавий \"F\" модели)"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "Туркча (замонавий \"Q\" модели)"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "Украинча"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
 msgstr "АҚШ (халқаро)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "Ўзбекча (кирил)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "Ветнамча \"рақамли қатор\" (qwerty)"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
 msgstr "Югославча (лотин)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "Ўнг Alt тугмаси"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Бир вақтда иккала Shift тугмалари"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Бир вақтда Ctrl ва Shift тугмалари"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock тугмаси"
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "Бир вақтда Shift ва CapsLock тугмалари"
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Бир вақтда Ctrl ва Alt тугмалари"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Бир вақтда Alt ва Shift тугмалари"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Меню\" тугмаси"
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Чап \"Windows\" тугмаси"
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Ўнг \"Windows\" тугмаси"
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Бир вақтда иккала Ctrl тугмалари"
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Бир вақтда иккала Alt тугмалари"
 
-#: keyboard.pm:301
+#: keyboard.pm:312
 #, c-format
 msgid "Left Shift key"
 msgstr "Чап Shift тугмаси"
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
 msgstr "Ўнг Shift тугмаси"
 
-#: keyboard.pm:303
+#: keyboard.pm:314
 #, c-format
 msgid "Left Alt key"
 msgstr "Чап Alt тугмаси"
 
-#: keyboard.pm:304
+#: keyboard.pm:315
 #, c-format
 msgid "Left Control key"
 msgstr "Чап Ctrl тугмаси"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, c-format
 msgid "Right Control key"
 msgstr "Ўнг Ctrl тугмаси"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -6685,7 +6967,7 @@ msgstr ""
 "яратувчи тугма ёки тугмалар бирикмасини танлашингиз\n"
 "мумкин. (м-н: лотин ва лотин эмас)"
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -6696,1164 +6978,1188 @@ msgstr ""
 "Ўрнатиш вақтида турли тугмалар тартибини танлаш учун\n"
 "ўнг \"Ctrl\" турмасини ишлатинг."
 
-#: lang.pm:153
+#. -PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
+#. -PO: or as "default:RTL", depending if your language is written from
+#. -PO: left to right, or from right to left; any other string is wrong.
+#: lang.pm:165
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:169
-#, c-format
-msgid "Afghanistan"
-msgstr "Афғонистон"
-
-#: lang.pm:170
+#: lang.pm:182
 #, c-format
 msgid "Andorra"
 msgstr "Андорра"
 
-#: lang.pm:171
+#: lang.pm:183
 #, c-format
 msgid "United Arab Emirates"
 msgstr "Бирлашган Араб Амирликлари"
 
-#: lang.pm:172
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "Афғонистон"
+
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Антигуа ва Барбуда"
 
-#: lang.pm:173
+#: lang.pm:186
 #, c-format
 msgid "Anguilla"
 msgstr "Ангвилла"
 
-#: lang.pm:174
+#: lang.pm:187
 #, c-format
 msgid "Albania"
 msgstr "Албания"
 
-#: lang.pm:175
+#: lang.pm:188
 #, c-format
 msgid "Armenia"
 msgstr "Арманистон"
 
-#: lang.pm:176
+#: lang.pm:189
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Нидерландлар Антил Ороллари"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "Ангола"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "Антарктика"
 
-#: lang.pm:179 standalone/drakxtv:48
+#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "Аргентина"
 
-#: lang.pm:180
+#: lang.pm:193
 #, c-format
 msgid "American Samoa"
 msgstr "Америка Самоаси"
 
-#: lang.pm:182 standalone/drakxtv:46
+#: lang.pm:195 standalone/drakxtv:48
 #, c-format
 msgid "Australia"
 msgstr "Австралия"
 
-#: lang.pm:183
+#: lang.pm:196
 #, c-format
 msgid "Aruba"
 msgstr "Аруба"
 
-#: lang.pm:184
+#: lang.pm:197
 #, c-format
 msgid "Azerbaijan"
 msgstr "Озарбайжон"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Босния ва Герцоговина"
 
-#: lang.pm:186
+#: lang.pm:199
 #, c-format
 msgid "Barbados"
 msgstr "Барбадос"
 
-#: lang.pm:187
+#: lang.pm:200
 #, c-format
 msgid "Bangladesh"
 msgstr "Бангладеш"
 
-#: lang.pm:189
+#: lang.pm:202
 #, c-format
 msgid "Burkina Faso"
 msgstr "Буркина-Фассо"
 
-#: lang.pm:190
+#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
 #, c-format
 msgid "Bulgaria"
 msgstr "Болгария"
 
-#: lang.pm:191
+#: lang.pm:204
 #, c-format
 msgid "Bahrain"
 msgstr "Баҳрайн"
 
-#: lang.pm:192
+#: lang.pm:205
 #, c-format
 msgid "Burundi"
 msgstr "Бурунди"
 
-#: lang.pm:193
+#: lang.pm:206
 #, c-format
 msgid "Benin"
 msgstr "Бенин"
 
-#: lang.pm:194
+#: lang.pm:207
 #, c-format
 msgid "Bermuda"
 msgstr "Бермуда Ороллари"
 
-#: lang.pm:195
+#: lang.pm:208
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Бруней Доруссалом"
 
-#: lang.pm:196
+#: lang.pm:209
 #, c-format
 msgid "Bolivia"
 msgstr "Боливия"
 
-#: lang.pm:197
+#: lang.pm:210 network/adsl_consts.pm:92 network/adsl_consts.pm:102
+#: network/adsl_consts.pm:110 network/adsl_consts.pm:118
 #, c-format
 msgid "Brazil"
 msgstr "Бразилия"
 
-#: lang.pm:198
+#: lang.pm:211
 #, c-format
 msgid "Bahamas"
 msgstr "Багама Ороллари"
 
-#: lang.pm:199
+#: lang.pm:212
 #, c-format
 msgid "Bhutan"
 msgstr "Бутан"
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr "Буве Ороли"
 
-#: lang.pm:201
+#: lang.pm:214
 #, c-format
 msgid "Botswana"
 msgstr "Боцвана"
 
-#: lang.pm:202
+#: lang.pm:215
 #, c-format
 msgid "Belarus"
 msgstr "Белорус"
 
-#: lang.pm:203
+#: lang.pm:216
 #, c-format
 msgid "Belize"
 msgstr "Белиз"
 
-#: lang.pm:204
+#: lang.pm:217
 #, c-format
 msgid "Canada"
 msgstr "Канада"
 
-#: lang.pm:205
+#: lang.pm:218
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Кокос (Килинг) Ороллари"
 
-#: lang.pm:206
+#: lang.pm:219
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Конго (Киншаса)"
 
-#: lang.pm:207
+#: lang.pm:220
 #, c-format
 msgid "Central African Republic"
 msgstr "Марказий Африка Республикаси"
 
-#: lang.pm:208
+#: lang.pm:221
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Конго (Браззавиль)"
 
-#: lang.pm:209
+#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
 #, c-format
 msgid "Switzerland"
 msgstr "Швейцария"
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Кот д'Ивуар"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "Кук Ороллари"
 
-#: lang.pm:212
+#: lang.pm:225
 #, c-format
 msgid "Chile"
 msgstr "Чили"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr "Камерун"
 
-#: lang.pm:214
+#: lang.pm:227 network/adsl_consts.pm:142 network/adsl_consts.pm:150
+#: network/adsl_consts.pm:158 network/adsl_consts.pm:166
+#: network/adsl_consts.pm:174 network/adsl_consts.pm:182
+#: network/adsl_consts.pm:190 network/adsl_consts.pm:198
+#: network/adsl_consts.pm:206 network/adsl_consts.pm:214
+#: network/adsl_consts.pm:222 network/adsl_consts.pm:230
+#: network/adsl_consts.pm:238 network/adsl_consts.pm:246
+#: network/adsl_consts.pm:254 network/adsl_consts.pm:262
+#: network/adsl_consts.pm:270 network/adsl_consts.pm:278
+#: network/adsl_consts.pm:286 network/adsl_consts.pm:294
 #, c-format
 msgid "China"
 msgstr "Хитой"
 
-#: lang.pm:215
+#: lang.pm:228
 #, c-format
 msgid "Colombia"
 msgstr "Колумбия"
 
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr "Сербия ва Монтенегро"
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "Куба"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "Кейп Верде"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr "Крисмас Ороли"
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr "Кипр"
 
-#: lang.pm:223
+#: lang.pm:237
 #, c-format
 msgid "Djibouti"
 msgstr "Жибути"
 
-#: lang.pm:224
+#: lang.pm:238 network/adsl_consts.pm:302
 #, c-format
 msgid "Denmark"
 msgstr "Дания"
 
-#: lang.pm:225
+#: lang.pm:239
 #, c-format
 msgid "Dominica"
 msgstr "Доминика"
 
-#: lang.pm:226
+#: lang.pm:240
 #, c-format
 msgid "Dominican Republic"
 msgstr "Доминикана Республикаси"
 
-#: lang.pm:227
+#: lang.pm:241
 #, c-format
 msgid "Algeria"
 msgstr "Жазоир"
 
-#: lang.pm:228
+#: lang.pm:242
 #, c-format
 msgid "Ecuador"
 msgstr "Эквадор"
 
-#: lang.pm:229
+#: lang.pm:243
 #, c-format
 msgid "Estonia"
 msgstr "Эстония"
 
-#: lang.pm:230
+#: lang.pm:244
 #, c-format
 msgid "Egypt"
 msgstr "Миср"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
 msgstr "Ғарбий Сахара"
 
-#: lang.pm:232
+#: lang.pm:246
 #, c-format
 msgid "Eritrea"
 msgstr "Эритрия"
 
-#: lang.pm:233 network/adsl_consts.pm:202 network/adsl_consts.pm:210
-#: network/adsl_consts.pm:219 network/adsl_consts.pm:230
+#: lang.pm:247 network/adsl_consts.pm:531 network/adsl_consts.pm:540
+#: network/adsl_consts.pm:551
 #, c-format
 msgid "Spain"
 msgstr "Испания"
 
-#: lang.pm:234
+#: lang.pm:248
 #, c-format
 msgid "Ethiopia"
 msgstr "Эфиопия"
 
-#: lang.pm:235 network/adsl_consts.pm:127
+#: lang.pm:249 network/adsl_consts.pm:402
 #, c-format
 msgid "Finland"
 msgstr "Финляндия"
 
-#: lang.pm:236
+#: lang.pm:250
 #, c-format
 msgid "Fiji"
 msgstr "Фижи"
 
-#: lang.pm:237
+#: lang.pm:251
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Фолкленд (Малвин) Ороллари"
 
-#: lang.pm:238
+#: lang.pm:252
 #, c-format
 msgid "Micronesia"
 msgstr "Микронезия"
 
-#: lang.pm:239
+#: lang.pm:253
 #, c-format
 msgid "Faroe Islands"
 msgstr "Фарер Ороллари"
 
-#: lang.pm:241
+#: lang.pm:255
 #, c-format
 msgid "Gabon"
 msgstr "Габон"
 
-#: lang.pm:242 network/adsl_consts.pm:247 network/adsl_consts.pm:255
-#: network/netconnect.pm:51
+#: lang.pm:256 network/adsl_consts.pm:593 network/adsl_consts.pm:601
+#: network/netconnect.pm:52
 #, c-format
 msgid "United Kingdom"
 msgstr "Буюк Британия"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr "Гренада"
 
-#: lang.pm:244
+#: lang.pm:258
 #, c-format
 msgid "Georgia"
-msgstr "Грузия"
+msgstr "Гуржистон"
 
-#: lang.pm:245
+#: lang.pm:259
 #, c-format
 msgid "French Guiana"
 msgstr "Француз Гвинея"
 
-#: lang.pm:246
+#: lang.pm:260
 #, c-format
 msgid "Ghana"
 msgstr "Гана"
 
-#: lang.pm:247
+#: lang.pm:261
 #, c-format
 msgid "Gibraltar"
 msgstr "Гибралтар"
 
-#: lang.pm:248
+#: lang.pm:262
 #, c-format
 msgid "Greenland"
 msgstr "Гренландия"
 
-#: lang.pm:249
+#: lang.pm:263
 #, c-format
 msgid "Gambia"
 msgstr "Гамбия"
 
-#: lang.pm:250
+#: lang.pm:264
 #, c-format
 msgid "Guinea"
 msgstr "Гвинея"
 
-#: lang.pm:251
+#: lang.pm:265
 #, c-format
 msgid "Guadeloupe"
 msgstr "Гваделупа"
 
-#: lang.pm:252
+#: lang.pm:266
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Экваториал Гвинея"
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Жанубий Жоржия ва Жанубий Сендвич Ороллари"
 
-#: lang.pm:255
+#: lang.pm:269
 #, c-format
 msgid "Guatemala"
 msgstr "Гватемала"
 
-#: lang.pm:256
+#: lang.pm:270
 #, c-format
 msgid "Guam"
 msgstr "Гуам"
 
-#: lang.pm:257
+#: lang.pm:271
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Гвинея-Биссау"
 
-#: lang.pm:258
+#: lang.pm:272
 #, c-format
 msgid "Guyana"
 msgstr "Гвиана"
 
-#: lang.pm:259
+#: lang.pm:273
 #, c-format
-msgid "China (Hong Kong)"
+msgid "Hong Kong SAR (China)"
 msgstr "Хитой (Гонконг)"
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Херд ва МакДоналд Ороллари"
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr "Гондурас"
 
-#: lang.pm:262
+#: lang.pm:276
 #, c-format
 msgid "Croatia"
 msgstr "Хорватия"
 
-#: lang.pm:263
+#: lang.pm:277
 #, c-format
 msgid "Haiti"
 msgstr "Гаити"
 
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
 #, c-format
 msgid "Hungary"
 msgstr "Венгрия"
 
-#: lang.pm:265
+#: lang.pm:279
 #, c-format
 msgid "Indonesia"
 msgstr "Индонезия"
 
-#: lang.pm:266 standalone/drakxtv:45
+#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr "Ирландия"
 
-#: lang.pm:267
+#: lang.pm:281
 #, c-format
 msgid "Israel"
 msgstr "Исроил"
 
-#: lang.pm:268
+#: lang.pm:282
 #, c-format
 msgid "India"
 msgstr "Ҳиндистон"
 
-#: lang.pm:269
+#: lang.pm:283
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "Ҳинд Океаннинг Британия Ерлари"
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr "Ироқ"
 
-#: lang.pm:271
+#: lang.pm:285
 #, c-format
 msgid "Iran"
 msgstr "Эрон"
 
-#: lang.pm:272
+#: lang.pm:286
 #, c-format
 msgid "Iceland"
 msgstr "Исландия"
 
-#: lang.pm:274
+#: lang.pm:288
 #, c-format
 msgid "Jamaica"
 msgstr "Ямайка"
 
-#: lang.pm:275
+#: lang.pm:289
 #, c-format
 msgid "Jordan"
 msgstr "Иордан"
 
-#: lang.pm:276
+#: lang.pm:290
 #, c-format
 msgid "Japan"
 msgstr "Япония"
 
-#: lang.pm:277
+#: lang.pm:291
 #, c-format
 msgid "Kenya"
 msgstr "Кения"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Қирғизистон"
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr "Камбоджа"
 
-#: lang.pm:280
+#: lang.pm:294
 #, c-format
 msgid "Kiribati"
 msgstr "Кирибати"
 
-#: lang.pm:281
+#: lang.pm:295
 #, c-format
 msgid "Comoros"
 msgstr "Коморос"
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Сент-Кристофер ва Невис"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr "Шимолий Корея"
 
-#: lang.pm:284
+#: lang.pm:298
 #, c-format
 msgid "Korea"
 msgstr "Корея"
 
-#: lang.pm:285
+#: lang.pm:299
 #, c-format
 msgid "Kuwait"
 msgstr "Кувайт"
 
-#: lang.pm:286
+#: lang.pm:300
 #, c-format
 msgid "Cayman Islands"
 msgstr "Кайман Ороллари"
 
-#: lang.pm:287
+#: lang.pm:301
 #, c-format
 msgid "Kazakhstan"
 msgstr "Қозоғистон"
 
-#: lang.pm:288
+#: lang.pm:302
 #, c-format
 msgid "Laos"
 msgstr "Лаос"
 
-#: lang.pm:289
+#: lang.pm:303
 #, c-format
 msgid "Lebanon"
 msgstr "Лебанон"
 
-#: lang.pm:290
+#: lang.pm:304
 #, c-format
 msgid "Saint Lucia"
 msgstr "Сент-Люсия"
 
-#: lang.pm:291
+#: lang.pm:305
 #, c-format
 msgid "Liechtenstein"
 msgstr "Лихтенштейн"
 
-#: lang.pm:292
+#: lang.pm:306
 #, c-format
 msgid "Sri Lanka"
 msgstr "Шри Ланка"
 
-#: lang.pm:293
+#: lang.pm:307
 #, c-format
 msgid "Liberia"
 msgstr "Либерия"
 
-#: lang.pm:294
+#: lang.pm:308
 #, c-format
 msgid "Lesotho"
 msgstr "Лесото"
 
-#: lang.pm:295
+#: lang.pm:309 network/adsl_consts.pm:479
 #, c-format
 msgid "Lithuania"
 msgstr "Литва"
 
-#: lang.pm:296
+#: lang.pm:310
 #, c-format
 msgid "Luxembourg"
 msgstr "Люксембург"
 
-#: lang.pm:297
+#: lang.pm:311
 #, c-format
 msgid "Latvia"
 msgstr "Латвия"
 
-#: lang.pm:298
+#: lang.pm:312
 #, c-format
 msgid "Libya"
 msgstr "Либия"
 
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
 #, c-format
 msgid "Morocco"
 msgstr "Марокаш"
 
-#: lang.pm:300
+#: lang.pm:314
 #, c-format
 msgid "Monaco"
 msgstr "Монако"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr "Молдова"
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr "Мадагаскар"
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr "Маршалл Ороллари"
 
-#: lang.pm:304
+#: lang.pm:318
 #, c-format
 msgid "Macedonia"
 msgstr "Македония"
 
-#: lang.pm:305
+#: lang.pm:319
 #, c-format
 msgid "Mali"
 msgstr "Мали"
 
-#: lang.pm:306
+#: lang.pm:320
 #, c-format
 msgid "Myanmar"
 msgstr "Мянмар"
 
-#: lang.pm:307
+#: lang.pm:321
 #, c-format
 msgid "Mongolia"
 msgstr "Муғилистон"
 
-#: lang.pm:308
+#: lang.pm:322
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Шимолий Мариана Ороллари"
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr "Мартиника"
 
-#: lang.pm:310
+#: lang.pm:324
 #, c-format
 msgid "Mauritania"
 msgstr "Мавритания"
 
-#: lang.pm:311
+#: lang.pm:325
 #, c-format
 msgid "Montserrat"
 msgstr "Монцеррат"
 
-#: lang.pm:312
+#: lang.pm:326
 #, c-format
 msgid "Malta"
 msgstr "Малта"
 
-#: lang.pm:313
+#: lang.pm:327
 #, c-format
 msgid "Mauritius"
 msgstr "Маврикий"
 
-#: lang.pm:314
+#: lang.pm:328
 #, c-format
 msgid "Maldives"
 msgstr "Малдив Ороллари"
 
-#: lang.pm:315
+#: lang.pm:329
 #, c-format
 msgid "Malawi"
 msgstr "Малави"
 
-#: lang.pm:316
+#: lang.pm:330
 #, c-format
 msgid "Mexico"
 msgstr "Мексика"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr "Малайзия"
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr "Мозамбик"
 
-#: lang.pm:319
+#: lang.pm:333
 #, c-format
 msgid "Namibia"
 msgstr "Намибия"
 
-#: lang.pm:320
+#: lang.pm:334
 #, c-format
 msgid "New Caledonia"
 msgstr "Янги Каледония"
 
-#: lang.pm:321
+#: lang.pm:335
 #, c-format
 msgid "Niger"
 msgstr "Нигер"
 
-#: lang.pm:322
+#: lang.pm:336
 #, c-format
 msgid "Norfolk Island"
 msgstr "Норфолк Ороли"
 
-#: lang.pm:323
+#: lang.pm:337
 #, c-format
 msgid "Nigeria"
 msgstr "Нигерия"
 
-#: lang.pm:324
+#: lang.pm:338
 #, c-format
 msgid "Nicaragua"
 msgstr "Никарагуа"
 
-#: lang.pm:327
+#: lang.pm:341
 #, c-format
 msgid "Nepal"
 msgstr "Непал"
 
-#: lang.pm:328
+#: lang.pm:342
 #, c-format
 msgid "Nauru"
 msgstr "Науру"
 
-#: lang.pm:329
+#: lang.pm:343
 #, c-format
 msgid "Niue"
 msgstr "Ниуе"
 
-#: lang.pm:330
+#: lang.pm:344
 #, c-format
 msgid "New Zealand"
 msgstr "Янги Зеландия"
 
-#: lang.pm:331
+#: lang.pm:345
 #, c-format
 msgid "Oman"
 msgstr "Уммон"
 
-#: lang.pm:332
+#: lang.pm:346
 #, c-format
 msgid "Panama"
 msgstr "Панама"
 
-#: lang.pm:333
+#: lang.pm:347
 #, c-format
 msgid "Peru"
 msgstr "Перу"
 
-#: lang.pm:334
+#: lang.pm:348
 #, c-format
 msgid "French Polynesia"
 msgstr "Француз Полинезия"
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Папуа Янги Гвинея"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "Филиппин"
 
-#: lang.pm:337
+#: lang.pm:351
 #, c-format
 msgid "Pakistan"
 msgstr "Покистон"
 
-#: lang.pm:338 network/adsl_consts.pm:186
+#: lang.pm:352 network/adsl_consts.pm:503
 #, c-format
 msgid "Poland"
 msgstr "Польша"
 
-#: lang.pm:339
+#: lang.pm:353
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Сент-Пер ва Микелон"
 
-#: lang.pm:340
+#: lang.pm:354
 #, c-format
 msgid "Pitcairn"
 msgstr "Питкерн"
 
-#: lang.pm:341
+#: lang.pm:355
 #, c-format
 msgid "Puerto Rico"
 msgstr "Пуэрто-Рико"
 
-#: lang.pm:342
+#: lang.pm:356
 #, c-format
 msgid "Palestine"
 msgstr "Фаластин"
 
-#: lang.pm:343 network/adsl_consts.pm:196
+#: lang.pm:357 network/adsl_consts.pm:513
 #, c-format
 msgid "Portugal"
 msgstr "Португалия"
 
-#: lang.pm:344
+#: lang.pm:358
 #, c-format
 msgid "Paraguay"
 msgstr "Парагвай"
 
-#: lang.pm:345
+#: lang.pm:359
 #, c-format
 msgid "Palau"
 msgstr "Палау"
 
-#: lang.pm:346
+#: lang.pm:360
 #, c-format
 msgid "Qatar"
 msgstr "Қатар"
 
-#: lang.pm:347
+#: lang.pm:361
 #, c-format
 msgid "Reunion"
 msgstr "Реюнион"
 
-#: lang.pm:348
+#: lang.pm:362
 #, c-format
 msgid "Romania"
 msgstr "Руминия"
 
-#: lang.pm:349
+#: lang.pm:363
 #, c-format
 msgid "Russia"
 msgstr "Россия"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr "Рванда"
 
-#: lang.pm:351
+#: lang.pm:365
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Саудия Арабистони"
 
-#: lang.pm:352
+#: lang.pm:366
 #, c-format
 msgid "Solomon Islands"
 msgstr "Соломон Ороллари"
 
-#: lang.pm:353
+#: lang.pm:367
 #, c-format
 msgid "Seychelles"
 msgstr "Сейшел Ороллари"
 
-#: lang.pm:354
+#: lang.pm:368
 #, c-format
 msgid "Sudan"
 msgstr "Судан"
 
-#: lang.pm:356
+#: lang.pm:370
 #, c-format
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: lang.pm:357
+#: lang.pm:371
 #, c-format
 msgid "Saint Helena"
 msgstr "Авлиё Елена Ороли"
 
-#: lang.pm:358
+#: lang.pm:372 network/adsl_consts.pm:520
 #, c-format
 msgid "Slovenia"
 msgstr "Словения"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Свалбард ва Ян Майен Ороллари"
 
-#: lang.pm:360
+#: lang.pm:374
 #, c-format
 msgid "Slovakia"
 msgstr "Словакия"
 
-#: lang.pm:361
+#: lang.pm:375
 #, c-format
 msgid "Sierra Leone"
 msgstr "Серра-Леоне"
 
-#: lang.pm:362
+#: lang.pm:376
 #, c-format
 msgid "San Marino"
 msgstr "Сан-Марино"
 
-#: lang.pm:363
+#: lang.pm:377
 #, c-format
 msgid "Senegal"
 msgstr "Сенегал"
 
-#: lang.pm:364
+#: lang.pm:378
 #, c-format
 msgid "Somalia"
 msgstr "Сомали"
 
-#: lang.pm:365
+#: lang.pm:379
 #, c-format
 msgid "Suriname"
 msgstr "Суринам"
 
-#: lang.pm:366
+#: lang.pm:380
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Сан-Томе ва Принсипи"
 
-#: lang.pm:367
+#: lang.pm:381
 #, c-format
 msgid "El Salvador"
 msgstr "Салвадор"
 
-#: lang.pm:368
+#: lang.pm:382
 #, c-format
 msgid "Syria"
 msgstr "Сурия"
 
-#: lang.pm:369
+#: lang.pm:383
 #, c-format
 msgid "Swaziland"
 msgstr "Свазиленд"
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Туркс ва Каикос Ороллари"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "Чад"
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "Франциянинг Жанубий Ерлари"
 
-#: lang.pm:373
+#: lang.pm:387
 #, c-format
 msgid "Togo"
 msgstr "Того"
 
-#: lang.pm:374
+#: lang.pm:388 network/adsl_consts.pm:585
 #, c-format
 msgid "Thailand"
 msgstr "Таиланд"
 
-#: lang.pm:375
+#: lang.pm:389
 #, c-format
 msgid "Tajikistan"
 msgstr "Тожикистон"
 
-#: lang.pm:376
+#: lang.pm:390
 #, c-format
 msgid "Tokelau"
 msgstr "Токелау"
 
-#: lang.pm:377
+#: lang.pm:391
 #, c-format
 msgid "East Timor"
 msgstr "Шарқий Тимур"
 
-#: lang.pm:378
+#: lang.pm:392
 #, c-format
 msgid "Turkmenistan"
 msgstr "Туркманистон"
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr "Тунис"
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr "Тонга"
 
-#: lang.pm:381
+#: lang.pm:395
 #, c-format
 msgid "Turkey"
 msgstr "Туркия"
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Тринидад ва Тобаго"
 
-#: lang.pm:383
+#: lang.pm:397
 #, c-format
 msgid "Tuvalu"
 msgstr "Тувалу"
 
-#: lang.pm:384
+#: lang.pm:398
 #, c-format
 msgid "Taiwan"
 msgstr "Тайван"
 
-#: lang.pm:385
+#: lang.pm:399
 #, c-format
 msgid "Tanzania"
 msgstr "Танзания"
 
-#: lang.pm:386
+#: lang.pm:400
 #, c-format
 msgid "Ukraine"
 msgstr "Украина"
 
-#: lang.pm:387
+#: lang.pm:401
 #, c-format
 msgid "Uganda"
 msgstr "Уганда"
 
-#: lang.pm:388
+#: lang.pm:402
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "Кичик Узоқлашган Ороллар Қўшма Штатлари"
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "Уругвай"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "Ўзбекистон"
 
-#: lang.pm:392
+#: lang.pm:406
 #, c-format
 msgid "Vatican"
 msgstr "Ватикан"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Сент-Винсент ва Гренадина"
 
-#: lang.pm:394
+#: lang.pm:408
 #, c-format
 msgid "Venezuela"
 msgstr "Венесуэла"
 
-#: lang.pm:395
+#: lang.pm:409
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Виргиния Ороллари (Англия)"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Виргиния Ороллари (АҚШ)"
 
-#: lang.pm:397
+#: lang.pm:411
 #, c-format
 msgid "Vietnam"
 msgstr "Ветнам"
 
-#: lang.pm:398
+#: lang.pm:412
 #, c-format
 msgid "Vanuatu"
 msgstr "Вануату"
 
-#: lang.pm:399
+#: lang.pm:413
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "Уоллис ва Футуна Ороллари"
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
 msgstr "Самоа"
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr "Яман"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "Маёт"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr "Сербия ва Монтенегро"
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "Жанубий Африка"
 
-#: lang.pm:405
+#: lang.pm:418
 #, c-format
 msgid "Zambia"
 msgstr "Замбия"
 
-#: lang.pm:406
+#: lang.pm:419
 #, c-format
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: lang.pm:1004
+#: lang.pm:1047
+#, c-format
+msgid "You should install the following packages: %s"
+msgstr "Қуйидаги пакетларни ўрнатиш керак: %s"
+
+#. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
+#: lang.pm:1050 standalone/scannerdrake:135
+#, c-format
+msgid ", "
+msgstr ", "
+
+#: lang.pm:1101
 #, c-format
 msgid "Welcome to %s"
 msgstr "%s'га марҳамат"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr ""
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr ""
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "Параметрлар"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr "ЙЎҚ"
@@ -7870,8 +8176,8 @@ msgstr "Модулнинг ҳамма параметрларини шу ерда
 
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "%s %s интерфейслар топилди"
+msgid "Found %s interfaces"
+msgstr "%s интерфейслар топилди"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -7924,12 +8230,12 @@ msgid "Module options:"
 msgstr "Модулнинг параметрлари:"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: modules/interactive.pm:118
+#: modules/interactive.pm:119
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Қайси %s драйверни синаб кўрай?"
 
-#: modules/interactive.pm:127
+#: modules/interactive.pm:128
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -7941,17 +8247,17 @@ msgid ""
 "not cause any damage."
 msgstr ""
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "Авто-аниқлаш"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
 msgstr "Параметрларни аниқлаш"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -8010,11 +8316,11 @@ msgstr "Ғилдиракли андоза PS2 сичқонча"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/modem.pm:58 network/modem.pm:72 network/modem.pm:77
-#: network/modem.pm:108 network/netconnect.pm:586 network/netconnect.pm:591
-#: network/netconnect.pm:603 network/netconnect.pm:608
-#: network/netconnect.pm:624 network/netconnect.pm:626
+#: mouse.pm:36 network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
+#: network/modem.pm:84 network/modem.pm:98 network/modem.pm:103
+#: network/modem.pm:136 network/netconnect.pm:607 network/netconnect.pm:612
+#: network/netconnect.pm:624 network/netconnect.pm:629
+#: network/netconnect.pm:645 network/netconnect.pm:647
 #, c-format
 msgid "Automatic"
 msgstr "Автоматик"
@@ -8159,50 +8465,55 @@ msgstr "Универсал"
 msgid "Any PS/2 & USB mice"
 msgstr "Истаган PS/2 ва USB сичқонча"
 
-#: mouse.pm:92 standalone/drakvpn:1140
+#: mouse.pm:89 mouse.pm:359 mouse.pm:368 mouse.pm:420
+#, c-format
+msgid "Synaptics Touchpad"
+msgstr ""
+
+#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "йўқ"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "Сичқонча йўқ"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "Илтимос сичқончани синаб кўринг"
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Сичқончани ишга тушириш учун,"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
-msgstr "ҒИЛДИРАКНИ АЙЛАНTИРИНГ!"
+msgstr "ҒИЛДИРАКНИ АЙЛАНТИРИНГ!"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
-msgstr "pppoe'дан фойдаланиш"
+msgid "use PPPoE"
+msgstr "PPPoE'дан фойдаланиш"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
-msgstr "pptp'дан фойдаланиш"
+msgid "use PPTP"
+msgstr "PPTP'дан фойдаланиш"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
+msgid "use DHCP"
 msgstr "dhcp'дан фойдаланиш"
 
 #: network/adsl.pm:22
 #, c-format
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel speedtouch usb"
+msgid "Alcatel Speedtouch USB"
+msgstr "Alcatel Speedtouch USB"
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
 #, c-format
@@ -8211,33 +8522,33 @@ msgstr " - топилди"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
-msgstr "Sagem (pppoa'ни ишлатиб) usb"
+msgid "Sagem (using PPPoA) USB"
+msgstr "Sagem (PPPoA'ни ишлатиб) USB"
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
-msgstr "Sagem (dhcp'ни ишлатиб) usb"
+msgid "Sagem (using DHCP) USB"
+msgstr "Sagem (DHCP'ни ишлатиб) USB"
 
-#: network/adsl.pm:35 network/netconnect.pm:761
+#: network/adsl.pm:35 network/netconnect.pm:799
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Интернетга уланиш"
 
-#: network/adsl.pm:36 network/netconnect.pm:762
+#: network/adsl.pm:36 network/netconnect.pm:800
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
+"Some connections use PPTP, a few use DHCP.\n"
+"If you don't know, choose 'use PPPoE'"
 msgstr ""
 
-#: network/adsl.pm:41 network/netconnect.pm:766
+#: network/adsl.pm:41 network/netconnect.pm:804
 #, c-format
-msgid "ADSL connection type :"
+msgid "ADSL connection type:"
 msgstr "ADSL уланишнинг тури:"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Веб сервери"
@@ -8290,7 +8601,7 @@ msgstr ""
 #: network/drakfirewall.pm:65
 #, c-format
 msgid "BitTorrent"
-msgstr ""
+msgstr "BitTorrent"
 
 #: network/drakfirewall.pm:131
 #, c-format
@@ -8361,269 +8672,275 @@ msgstr "Ҳаммаси (файервол йўқ)"
 msgid "Other ports"
 msgstr "Бошқа портлар"
 
-#: network/isdn.pm:109 network/netconnect.pm:436
+#: network/isdn.pm:125 network/netconnect.pm:456 network/netconnect.pm:564
+#: network/netconnect.pm:567
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr ""
 
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
 #, c-format
 msgid "I don't know"
 msgstr "Мен билмайман"
 
-#: network/isdn.pm:152 network/netconnect.pm:385
+#: network/isdn.pm:169 network/netconnect.pm:388
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:153 network/netconnect.pm:385
+#: network/isdn.pm:170 network/netconnect.pm:388
 #, c-format
 msgid "USB"
 msgstr "USB"
 
-#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/netconnect.pm:591 network/netconnect.pm:608
-#: network/netconnect.pm:624
+#: network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
+#: network/netconnect.pm:612 network/netconnect.pm:629
+#: network/netconnect.pm:645
 #, c-format
 msgid "Manual"
-msgstr ""
+msgstr "Қўлбола"
 
-#: network/netconnect.pm:88 network/netconnect.pm:465
-#: network/netconnect.pm:475
+#: network/netconnect.pm:89 network/netconnect.pm:485
+#: network/netconnect.pm:489
 #, c-format
 msgid "Manual choice"
-msgstr ""
+msgstr "Қўлбола танлаш"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Ички ISDN карта"
 
-#: network/netconnect.pm:97
+#: network/netconnect.pm:98
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:99
 #, c-format
 msgid "Managed"
 msgstr "Managed"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:101
 #, c-format
 msgid "Repeater"
 msgstr "Репитер"
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:102
 #, c-format
 msgid "Secondary"
 msgstr "Иккиламчи"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:103
 #, c-format
 msgid "Auto"
 msgstr "Авто"
 
-#: network/netconnect.pm:105 printer/printerdrake.pm:1133
-#: standalone/drakups:64
+#: network/netconnect.pm:106 printer/printerdrake.pm:1248
+#: standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
-msgstr ""
+msgstr "Қўлбола мослаш"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:107
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "Автоматик IP (BOOTP/DHCP)"
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "Автоматик IP (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr ""
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Ойропа протоколи (EDSS1)"
 
-#: network/netconnect.pm:114 standalone/drakconnect:542
+#: network/netconnect.pm:115 standalone/drakconnect:540
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
 "No D-Channel (leased lines)"
 msgstr ""
 
-#: network/netconnect.pm:147
+#: network/netconnect.pm:151
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB модеми"
 
-#: network/netconnect.pm:148
+#: network/netconnect.pm:152
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB модеми"
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan модеми"
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus модеми"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr ""
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
 #, c-format
 msgid "Manual TCP/IP configuration"
-msgstr ""
+msgstr "TCP/IP мосламарини қўлбола мослаш"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr ""
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr ""
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr ""
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:163
+#, c-format
+msgid "DSL over CAPI"
+msgstr ""
+
+#: network/netconnect.pm:167
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr ""
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:168
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr ""
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
 #, c-format
 msgid "Routed IP LLC"
 msgstr ""
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
 #, c-format
 msgid "Routed IP VC"
 msgstr ""
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:171
 #, c-format
-msgid "PPPOA LLC"
-msgstr "PPPOA LLC"
+msgid "PPPoA LLC"
+msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:172
 #, c-format
-msgid "PPPOA VC"
-msgstr "PPPOA VC"
+msgid "PPPoA VC"
+msgstr "PPPoA VC"
 
-#: network/netconnect.pm:171 standalone/drakconnect:477
+#: network/netconnect.pm:176 standalone/drakconnect:474
 #, c-format
 msgid "Script-based"
 msgstr "Скриптда асосланган"
 
-#: network/netconnect.pm:172 standalone/drakconnect:477
+#: network/netconnect.pm:177 standalone/drakconnect:474
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:173 standalone/drakconnect:477
+#: network/netconnect.pm:178 standalone/drakconnect:474
 #, c-format
 msgid "Terminal-based"
 msgstr "Терминалда асосланган"
 
-#: network/netconnect.pm:174 standalone/drakconnect:477
+#: network/netconnect.pm:179 standalone/drakconnect:474
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:175 standalone/drakconnect:477
+#: network/netconnect.pm:180 standalone/drakconnect:474
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:228 standalone/drakconnect:55
+#: network/netconnect.pm:236 standalone/drakconnect:59
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "Тармоқ ва Интернетни мослаш"
 
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(%s портида топилди)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected %s)"
 msgstr "(%s топилди)"
 
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected)"
 msgstr "(топилди)"
 
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
 #, c-format
 msgid "Modem connection"
 msgstr "Вин-модем орқали уланиш"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN орқали уланиш"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL орқали уланиш"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "Кабел орқали уланиш"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "LAN орқали уланиш"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
 #, c-format
 msgid "Wireless connection"
 msgstr "Симсиз уланиш"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Сиз мосламоқчи бўлган уланишни танланг"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -8636,131 +8953,130 @@ msgstr ""
 "\n"
 "Давом этиш учун \"%s\" тугмасини босинг."
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
 msgstr "Алоқани мослаш"
 
-#: network/netconnect.pm:279 network/netconnect.pm:789
+#: network/netconnect.pm:288 network/netconnect.pm:840
 #, c-format
 msgid "Please fill or check the field below"
 msgstr ""
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
 msgstr "Картанинг IRQ'си"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Картанинг хотираси (DMA)"
 
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
 #, c-format
 msgid "Card IO"
 msgstr "Картанинг IO'си"
 
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
 #, c-format
 msgid "Card IO_0"
 msgstr "Картанинг IO_0'си"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
 msgstr "Картанинг IO_1'си"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "Шахсий телефон рақамингиз"
 
-#: network/netconnect.pm:292 network/netconnect.pm:792
+#: network/netconnect.pm:301 network/netconnect.pm:843
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "Провайдернинг номи (м-н provider.net)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
 msgstr "Провайдернинг телефон рақами"
 
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "Провайдернинг DNS 1 (танласа бўлади)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "Провайдернинг DNS 2 (танласа бўлади)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr ""
 
-#: network/netconnect.pm:297 standalone/drakconnect:434
-#: standalone/drakconnect:495
+#: network/netconnect.pm:306 standalone/drakconnect:425
+#: standalone/drakconnect:493
 #, c-format
 msgid "Connection speed"
 msgstr "Алоқанинг тезлиги"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Алоқа таймаути (сонияда)"
 
-#: network/netconnect.pm:301 network/netconnect.pm:795
-#: standalone/drakconnect:471
+#: network/netconnect.pm:310 network/netconnect.pm:846
+#: standalone/drakconnect:467
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Фойдаланувчи"
 
-#: network/netconnect.pm:302 network/netconnect.pm:796
-#: standalone/drakconnect:472
+#: network/netconnect.pm:311 network/netconnect.pm:847
+#: standalone/drakconnect:468
 #, c-format
 msgid "Account Password"
 msgstr "Махфий сўз"
 
-#: network/netconnect.pm:332 network/netconnect.pm:649
-#: network/netconnect.pm:827
+#: network/netconnect.pm:328 network/netconnect.pm:677
+#: network/netconnect.pm:880
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "Мослаш учун тармоқ интерфейсини танланг:"
 
-#: network/netconnect.pm:334 network/netconnect.pm:375
-#: network/netconnect.pm:650 network/netconnect.pm:829 network/shorewall.pm:84
-#: standalone/drakconnect:656 standalone/drakgw:225 standalone/drakvpn:221
+#: network/netconnect.pm:330 network/netconnect.pm:378
+#: network/netconnect.pm:678 network/netconnect.pm:882 network/shorewall.pm:85
+#: standalone/drakconnect:683 standalone/drakgw:227 standalone/drakvpn:221
 #, c-format
 msgid "Net Device"
 msgstr "Тармоқ ускунаси"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "Ташқи ISDN модем"
 
-#. -PO: Do not alter the <span ..> and </span> tags
-#: network/netconnect.pm:374 standalone/harddrake2:121
+#: network/netconnect.pm:377 standalone/harddrake2:192
 #, c-format
-msgid "Select a device !"
+msgid "Select a device!"
 msgstr "Ускунани танланг!"
 
-#: network/netconnect.pm:383 network/netconnect.pm:393
-#: network/netconnect.pm:403 network/netconnect.pm:419
-#: network/netconnect.pm:433
+#: network/netconnect.pm:386 network/netconnect.pm:396
+#: network/netconnect.pm:406 network/netconnect.pm:439
+#: network/netconnect.pm:453
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN'ни мослаш"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Сизда қандай карта бор?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -8776,34 +9092,48 @@ msgstr ""
 "Агар сизда PCMCIA картаси бўлса, картангизнинг \"irq\" ва \"io\" "
 "қийматларини билишингиз керак.\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "Давом этиш"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "Тўхтатиш"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Қуйидагиларнинг қайи бири сизнинг ISDN картангиз?"
 
-#: network/netconnect.pm:419
+#: network/netconnect.pm:425
+#, c-format
+msgid ""
+"A CAPI driver is available for this modem. This CAPI driver can offer more "
+"capabilities than the free driver (like sending faxes). Which driver do you "
+"want to use?"
+msgstr ""
+
+#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:117
+#, c-format
+msgid "Driver"
+msgstr "Драйвер"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Қайси протоколдан фойдаланмоқчисиз?"
 
-#: network/netconnect.pm:421 standalone/drakconnect:116
-#: standalone/drakconnect:318 standalone/drakconnect:540
+#: network/netconnect.pm:441 standalone/drakconnect:116
+#: standalone/drakconnect:309 standalone/drakconnect:538
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "Протокол"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -8812,137 +9142,132 @@ msgstr ""
 "Провайдерингизни танланг.\n"
 "Агар рўйхатда йўқ бўлса, \"Рўйхатда йўқ\"ни танланг."
 
-#: network/netconnect.pm:435 network/netconnect.pm:541
-#: network/netconnect.pm:683
+#: network/netconnect.pm:455 network/netconnect.pm:563
+#: network/netconnect.pm:719
 #, c-format
 msgid "Provider:"
 msgstr "Провайдер:"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
 "Take a look at http://www.linmodems.org"
 msgstr ""
-"Модемингизни бу системада ишлатиб бўлмайди.\n"
+"Модемингизни бу тизимда ишлатиб бўлмайди.\n"
 "http://www.linmodem.org веб-сайтига қаранг."
 
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Мослаш учун модемни танланг:"
 
-#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr ""
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Илтимос, модем уланган кетма-кет портини танланг."
 
-#: network/netconnect.pm:539
+#: network/netconnect.pm:561
 #, c-format
 msgid "Select your provider:"
 msgstr "Провайдерингизни танланг:"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
 #, c-format
 msgid "Dialup: account options"
 msgstr ""
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
 msgstr "Уланишнинг номи"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "Телефон рақами"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
 msgstr "Фойдаланувчи"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr ""
 
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
 #, c-format
 msgid "IP parameters"
 msgstr "IP параметрлари"
 
-#: network/netconnect.pm:592 network/netconnect.pm:919
-#: printer/printerdrake.pm:431 standalone/drakconnect:116
-#: standalone/drakconnect:332 standalone/drakconnect:829
-#: standalone/drakups:266
+#: network/netconnect.pm:613 network/netconnect.pm:976
+#: printer/printerdrake.pm:454 standalone/drakconnect:116
+#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakups:282
 #, c-format
 msgid "IP address"
 msgstr "IP рақами"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
 #, c-format
 msgid "Subnet mask"
 msgstr ""
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr ""
 
-#: network/netconnect.pm:608
+#: network/netconnect.pm:629
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:609
+#: network/netconnect.pm:630
 #, c-format
 msgid "Domain name"
-msgstr ""
+msgstr "Доменнинг номи"
 
-#: network/netconnect.pm:610 network/netconnect.pm:793
-#: standalone/drakconnect:947
+#: network/netconnect.pm:631 network/netconnect.pm:844
+#: standalone/drakconnect:998
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "Биринчи DNS сервери (танлаб бўлади)"
 
-#: network/netconnect.pm:611 network/netconnect.pm:794
-#: standalone/drakconnect:948
+#: network/netconnect.pm:632 network/netconnect.pm:845
+#: standalone/drakconnect:999
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "Иккинчи DNS сервери (танлаб бўлади)"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
 #, c-format
 msgid "Set hostname from IP"
 msgstr ""
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "Гейтвэй"
 
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
 #, c-format
 msgid "Gateway IP address"
 msgstr "Гейтвэйнинг IP рақами"
 
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
 #, c-format
 msgid "ADSL configuration"
 msgstr "ADSL мосламаси"
 
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Илтимос ADSL провайдерингизни танланг"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -8950,32 +9275,32 @@ msgid ""
 "or skip and do it later."
 msgstr ""
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, c-format
 msgid "Use a floppy"
 msgstr "Дискетдан фойдаланиш"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Дискнинг Windows қисмини ишлатиш"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr "Кейинроқ бажариш"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr ""
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr ""
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -8989,22 +9314,22 @@ msgstr ""
 "дан ёзиб олинг ва mgmt.o файлини /usr/share/speedtouch директориясига "
 "кўчиринг."
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr ""
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
 #, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
 msgstr ""
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -9013,21 +9338,23 @@ msgid ""
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
-msgstr ""
+msgstr "Драйверни қўлбола юклаш"
 
-#: network/netconnect.pm:844
+#: network/netconnect.pm:898
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"Modifying the fields below will override this configuration.\n"
+"Do you really want to reconfigure this device?"
 msgstr ""
+"ДИҚҚАТ: Бу ускуна Интернетга уланиш учун аллақачон мосланган.\n"
+"Уни бошқадан мослашни истайсизми?"
 
-#: network/netconnect.pm:857 network/netconnect.pm:1228
+#: network/netconnect.pm:912 network/netconnect.pm:1340
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -9036,24 +9363,24 @@ msgstr ""
 "Табриклаймиз, тармоқни ва Интернетни мослаш тугади.\n"
 "\n"
 
-#: network/netconnect.pm:871
+#: network/netconnect.pm:929
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr ""
 
-#: network/netconnect.pm:872 network/netconnect.pm:906
+#: network/netconnect.pm:930 network/netconnect.pm:963
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "Тармоқ ускунаси %s (%s драйвери) мосланмоқда"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -9064,89 +9391,95 @@ msgstr ""
 "Ёзувнинг ҳар қайси нуқта билан ажратилган ўнлик сон шаклида\n"
 "IP рақам бўлиши керак (м-н 1.2.3.4)."
 
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr ""
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP хостнинг номи"
 
-#: network/netconnect.pm:920 standalone/drakconnect:337
-#: standalone/drakconnect:830 standalone/drakgw:321
+#: network/netconnect.pm:977 standalone/drakconnect:328
+#: standalone/drakconnect:881 standalone/drakgw:323
 #, c-format
 msgid "Netmask"
 msgstr "Тармоқ маскаси"
 
-#: network/netconnect.pm:922 standalone/drakconnect:422
+#: network/netconnect.pm:979 standalone/drakconnect:413
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr ""
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, c-format
 msgid "Network Hotplugging"
 msgstr ""
 
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, c-format
 msgid "Start at boot"
 msgstr "Тизим юкланаётганда ишга тушириш"
 
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP клиенти"
 
-#: network/netconnect.pm:936 printer/printerdrake.pm:1383
-#: standalone/drakconnect:621
+#: network/netconnect.pm:995 printer/printerdrake.pm:1498
+#: standalone/drakconnect:648
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP рақами қуйидаги форматда бўлиши шарт: 1.2.3.4"
 
-#: network/netconnect.pm:939
+#: network/netconnect.pm:999
 #, c-format
-msgid "Warning : IP address %s is usually reserved !"
+msgid "Warning: IP address %s is usually reserved!"
 msgstr ""
 
-#: network/netconnect.pm:969 network/netconnect.pm:998
+#: network/netconnect.pm:1004 standalone/drakTermServ:1690
+#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#, c-format
+msgid "%s already in use\n"
+msgstr "%s'дан аллақачон фойдаланилмоқда\n"
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr ""
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
 #, c-format
 msgid "Operating Mode"
 msgstr ""
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
 #, c-format
 msgid "Network ID"
 msgstr ""
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: network/netconnect.pm:977 standalone/drakconnect:393
+#: network/netconnect.pm:1038 standalone/drakconnect:384
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:978 standalone/drakconnect:394
+#: network/netconnect.pm:1039 standalone/drakconnect:385
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: network/netconnect.pm:984
+#: network/netconnect.pm:1045
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -9155,19 +9488,19 @@ msgstr ""
 "Частота \"M\" ёки \"G\" билан тугаши керак (масалан, 2.46 GHz учун\n"
 "\"2.46G\"), ёки етарлича \"0\" (нол) қўшинг."
 
-#: network/netconnect.pm:988
+#: network/netconnect.pm:1049
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: network/netconnect.pm:1001 standalone/drakconnect:405
+#: network/netconnect.pm:1062 standalone/drakconnect:396
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:1002
+#: network/netconnect.pm:1063
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -9181,33 +9514,33 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
+#: network/netconnect.pm:1070 standalone/drakconnect:397
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1011
+#: network/netconnect.pm:1072
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
 "ap, channel, commit, enc, power, retry, sens, txpower (nick is already set "
 "as the hostname).\n"
 "\n"
-"See iwpconfig(8) man page for further information."
+"See iwconfig(8) man page for further information."
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1018 standalone/drakconnect:408
+#: network/netconnect.pm:1079 standalone/drakconnect:399
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1019
+#: network/netconnect.pm:1080
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -9219,12 +9552,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1027 standalone/drakconnect:409
+#: network/netconnect.pm:1088 standalone/drakconnect:400
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -9242,29 +9575,7 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1055
-#, c-format
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Сизнинг системангизда ethernet тармоқ адаптери топилмади.\n"
-"Мен алоқанинг бундай турини ўрнатолмайман."
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "Тармоқ интерфейсини танлаш"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr ""
-"Илтимос, Интернетга уланиш учун қайси тармоқ адаптеридан фойдаланишни "
-"танланг."
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -9273,84 +9584,86 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one."
 msgstr ""
 
-#: network/netconnect.pm:1085
+#: network/netconnect.pm:1167
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr ""
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
 #, c-format
 msgid "Host name (optional)"
 msgstr "Хостнинг номи (танлаб бўлади)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "Компьютернинг номи"
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1171
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS сервери 1"
 
-#: network/netconnect.pm:1090
+#: network/netconnect.pm:1172
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS сервери 2"
 
-#: network/netconnect.pm:1091
+#: network/netconnect.pm:1173
 #, c-format
 msgid "DNS server 3"
 msgstr "DNS сервери 3"
 
-#: network/netconnect.pm:1092
+#: network/netconnect.pm:1174
 #, c-format
 msgid "Search domain"
 msgstr ""
 
-#: network/netconnect.pm:1093
+#: network/netconnect.pm:1175
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Гейтвэй (м-н %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
 msgstr "Гейтвэй ускунаси"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS сервернинг манзили қуйидаги форматда бўлиши шарт: 1.2.3.4"
 
-#: network/netconnect.pm:1110 standalone/drakconnect:624
+#: network/netconnect.pm:1192 standalone/drakconnect:651
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr ""
 
-#: network/netconnect.pm:1121
+#: network/netconnect.pm:1203
 #, c-format
 msgid ""
-"Enter a Zeroconf host name which will be the one that your machine will get "
-"back to other machines on the network:"
+"If desired, enter a Zeroconf hostname.\n"
+"This is the name your machine will use to advertise any of\n"
+"its shared resources that are not managed by the network.\n"
+"It is not necessary on most networks."
 msgstr ""
 
-#: network/netconnect.pm:1122
+#: network/netconnect.pm:1207
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf компьютернинг номи"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf компьютернинг номида \".\" белгиси бўлмаши керак"
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -9361,36 +9674,56 @@ msgstr ""
 "Фойдаланиш учун биттасини танланг.\n"
 "\n"
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr "Интернетга уланиш"
 
-#: network/netconnect.pm:1145
+#: network/netconnect.pm:1230
 #, c-format
-msgid "Configuration is complete, do you want to apply settings ?"
+msgid "Configuration is complete, do you want to apply settings?"
 msgstr "Мослаш бажарилди, мосламаларни қўллашни истайсизми?"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Тизим юкланаётганда уланишни истайсизми?"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1258
+#, c-format
+msgid "Automatically at boot"
+msgstr "Тизим юкланаётганда ишга тушириш"
+
+#: network/netconnect.pm:1260
+#, c-format
+msgid "By using Net Applet in the system tray"
+msgstr ""
+
+#: network/netconnect.pm:1262
+#, c-format
+msgid "Manually (the interface would still be activated at boot)"
+msgstr ""
+
+#: network/netconnect.pm:1271
+#, fuzzy, c-format
+msgid "How do you want to dial this connection?"
+msgstr "Тизим юкланаётганда уланишни истайсизми?"
+
+#: network/netconnect.pm:1284
 #, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr ""
 "Тармоқни бошқадан ишга тушириш керак. Уни бошқадан ишга туширишни истайсизми?"
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "Тармоқни мослаш"
 
-#: network/netconnect.pm:1180
+#: network/netconnect.pm:1292
 #, c-format
 msgid ""
-"A problem occured while restarting the network: \n"
+"A problem occurred while restarting the network: \n"
 "\n"
 "%s"
 msgstr ""
@@ -9398,27 +9731,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1188
+#: network/netconnect.pm:1300
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Интернетга уланишга уриниб кўришни истайсизми?"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
 msgstr "Алоқа синаб кўрилмоқда..."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Тизим Интернетга уланган."
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr ""
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -9427,7 +9760,7 @@ msgstr ""
 "Тизим Интернетга уланмаганга ўхшайди.\n"
 "Алоқани бошқадан мослашга уриниб кўринг."
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -9436,15 +9769,15 @@ msgstr ""
 "Бу тугаганидан сўнг, компьютернинг номи билан боғлиқ бўлган муаммоларни "
 "олдини олиш учун X муҳитингизни бошқадан ишга туширишни биз тавсия қиламиз."
 
-#: network/netconnect.pm:1232
+#: network/netconnect.pm:1344
 #, c-format
 msgid ""
-"Problems occured during configuration.\n"
+"Problems occurred during configuration.\n"
 "Test your connection via net_monitor or mcc. If your connection doesn't "
 "work, you might want to relaunch the configuration."
 msgstr ""
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -9456,7 +9789,7 @@ msgstr ""
 "Тармоқни мосламаларини сақлаб қолиш учун \"Ок\" тугмасини босинг, Интернетга "
 "ва тармоқга уланишни бошқадан мослаш учун \"Бекор қилиш\" тугмасини босинг.\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -9465,27 +9798,27 @@ msgstr ""
 "Кутилмаган хато рўй берди:\n"
 "%s"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "Проксиларни мослаш"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP прокси"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP прокси"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Прокси \"http://...\" бўлиши керак"
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL \"'ftp:\" ёки \"http:\" билан бошланиши шарт"
@@ -9502,7 +9835,7 @@ msgid ""
 "need some manual fixes after installation."
 msgstr ""
 
-#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:214
+#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -9519,34 +9852,34 @@ msgstr ""
 "\t\teth0 ёки eth1 кабел орқали уланиш учун,\n"
 "\t\tippp+ ISDN орқали уланиш учун.\n"
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
 msgstr "Дискетни қўйинг"
 
-#: network/tools.pm:166
+#: network/tools.pm:198
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
 "press %s"
 msgstr ""
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr ""
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
 msgstr "улаш муваффақиятсиз тугади: "
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: partition_table.pm:768
+#: partition_table.pm:516
 #, c-format
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
@@ -9554,22 +9887,22 @@ msgid ""
 "to the extended partitions."
 msgstr ""
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Файлдан (%s) қайта тиклаш муваффақиятсиз тугади: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
 msgstr ""
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Файлга (%s) ёзишда хато"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -9578,27 +9911,27 @@ msgid ""
 "data."
 msgstr ""
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "бўлиши шарт"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "муҳим"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "жуда яхши"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "яхши"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "балки"
@@ -9613,7 +9946,7 @@ msgstr "(%s'да)"
 msgid "(on this machine)"
 msgstr "(шу компьютерда)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
 msgstr "Бошқа компьютерларда мосланган"
@@ -9623,307 +9956,317 @@ msgstr "Бошқа компьютерларда мосланган"
 msgid "On CUPS server \"%s\""
 msgstr "CUPS серверида \"%s\""
 
-#: printer/cups.pm:117 printer/printerdrake.pm:3989
-#: printer/printerdrake.pm:3998 printer/printerdrake.pm:4139
-#: printer/printerdrake.pm:4150 printer/printerdrake.pm:4362
+#: printer/cups.pm:117 printer/printerdrake.pm:4290
+#: printer/printerdrake.pm:4300 printer/printerdrake.pm:4445
+#: printer/printerdrake.pm:4456 printer/printerdrake.pm:4651
 #, c-format
 msgid " (Default)"
 msgstr " (Андоза)"
 
-#: printer/data.pm:22
+#: printer/data.pm:40
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Навбатга қўймасдан босиб чиқариш"
 
-#: printer/data.pm:23
+#: printer/data.pm:41
 #, c-format
 msgid "PDQ"
 msgstr "PDQ"
 
-#: printer/data.pm:34
+#: printer/data.pm:53
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr ""
 
-#: printer/data.pm:35
+#: printer/data.pm:54
 #, c-format
 msgid "LPD"
 msgstr "LPD"
 
-#: printer/data.pm:56
+#: printer/data.pm:76
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr "LPRng - LPR'нинг янги авлоди"
 
-#: printer/data.pm:57
+#: printer/data.pm:77
 #, c-format
 msgid "LPRng"
 msgstr "LPRng"
 
-#: printer/data.pm:82
+#: printer/data.pm:103
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr "CUPS - Умумий Юникс Босиб чиқариш Тизими"
 
+#: printer/data.pm:132
+#, c-format
+msgid "CUPS - Common Unix Printing System (remote server)"
+msgstr "CUPS - Умумий Юникс Босиб чиқариш Тизими (масофадаги сервер)"
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "Масофадаги CUPS"
+
 #: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466 printer/printerdrake.pm:686
+#: printer/detect.pm:466
 #, c-format
 msgid "Unknown Model"
 msgstr "Номаълум модел"
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
 msgstr "Локал принтер"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "Масофадаги принтер"
 
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
 msgstr "Масофадаги CUPS серверидаги принтер"
 
-#: printer/main.pm:32 printer/printerdrake.pm:1406
+#: printer/main.pm:30 printer/printerdrake.pm:1521
 #, c-format
 msgid "Printer on remote lpd server"
 msgstr "Масофадаги LPD серверидаги принтер"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "Тармоқдаги принтер (TCP/Socket)"
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT серверидаги принтер"
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "NetWare серверидаги принтер"
 
-#: printer/main.pm:36 printer/printerdrake.pm:1410
+#: printer/main.pm:34 printer/printerdrake.pm:1525
 #, c-format
 msgid "Enter a printer device URI"
 msgstr "Босиб чиқариш ускунасининг URI'ни киритинг"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
 msgstr "Вазифанинг натижасини буйруғга улаш (pipe)"
 
-#: printer/main.pm:307 printer/main.pm:575 printer/main.pm:1545
-#: printer/main.pm:2229 printer/main.pm:2240 printer/printerdrake.pm:1866
-#: printer/printerdrake.pm:4396
+#: printer/main.pm:321 printer/main.pm:604 printer/main.pm:1635
+#: printer/main.pm:2331 printer/main.pm:2340 printer/printerdrake.pm:874
+#: printer/printerdrake.pm:1981 printer/printerdrake.pm:4688
 #, c-format
 msgid "Unknown model"
 msgstr "Номаълум модел"
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, c-format
 msgid "Configured on this machine"
 msgstr "Шу компьютерда мосланган"
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
 #, c-format
 msgid " on parallel port #%s"
 msgstr " #%s параллел портида"
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", USB принтер \\#%s"
 
-#: printer/main.pm:343
+#: printer/main.pm:357
 #, c-format
 msgid ", USB printer"
 msgstr ", USB принтер"
 
-#: printer/main.pm:348
+#: printer/main.pm:362
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", \\#%s параллел портидаги кўп амалли ускуна"
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", параллел портидаги кўп амалли ускуна"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", USB портидаги кўп амалли ускуна"
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", HP JetDirect'даги кўп амалли ускуна"
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ", кўп амалли ускуна"
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
 msgstr ", %s ёрдамида босиб чиқарилмоқда"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " LPD серверида \"%s\", принтер \"%s\""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", TCP/IP хост \"%s\", порт %s"
 
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr ""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " Novell серверида \"%s\", принтер \"%s\""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
 msgstr ", %s буйруғи ёрдамида"
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, c-format
 msgid "Parallel port #%s"
 msgstr "Параллел порти #%s"
 
-#: printer/main.pm:392 printer/printerdrake.pm:979
-#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
+#: printer/main.pm:412 printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1117 printer/printerdrake.pm:1135
 #, c-format
 msgid "USB printer #%s"
 msgstr "USB принтер \\#%s"
 
-#: printer/main.pm:394
+#: printer/main.pm:414
 #, c-format
 msgid "USB printer"
 msgstr "USB принтер"
 
-#: printer/main.pm:399
+#: printer/main.pm:419
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "Параллел портидаги (#%s) кўп амалли ускуна"
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "Параллел портидаги кўп амалли ускуна"
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "USB портидаги кўп амалли ускуна"
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "HP JetDirect'даги кўп амалли ускуна"
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr "Кўп амалли ускуна"
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, c-format
 msgid "Prints into %s"
 msgstr "%s ёрдамида босиб чиқарилмоқда"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "LPD сервер \"%s\", принтер \"%s\""
 
-#: printer/main.pm:415
+#: printer/main.pm:438
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "TCP/IP хост \"%s\", порт %s"
 
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "SMB/Windows сервери \"%s\", принтер \"%s\""
 
-#: printer/main.pm:423
+#: printer/main.pm:448
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Novell сервери \"%s\", принтер \"%s\""
 
-#: printer/main.pm:425
+#: printer/main.pm:451
 #, c-format
 msgid "Uses command %s"
 msgstr "%s буйруғи ёрдамида"
 
-#: printer/main.pm:427
+#: printer/main.pm:453
 #, c-format
 msgid "URI: %s"
 msgstr "URI: %s"
 
-#: printer/main.pm:572 printer/printerdrake.pm:732
-#: printer/printerdrake.pm:2463
+#: printer/main.pm:601 printer/printerdrake.pm:820
+#: printer/printerdrake.pm:2584
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr ""
 
-#: printer/main.pm:1086 printer/printerdrake.pm:179
-#: printer/printerdrake.pm:191
+#: printer/main.pm:1147 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:217
 #, c-format
 msgid "Local network(s)"
 msgstr "Локал тармоқ(лар)"
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "Интерфейс \"%s\""
 
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, c-format
 msgid "Network %s"
 msgstr "Тармоқ %s"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
 msgstr "Хостнинг номи %s"
 
-#: printer/main.pm:1121
+#: printer/main.pm:1182
 #, c-format
 msgid "%s (Port %s)"
 msgstr "%s (Порт %s)"
 
-#: printer/printerdrake.pm:22
+#: printer/printerdrake.pm:19
 #, c-format
 msgid ""
 "The HP LaserJet 1000 needs its firmware to be uploaded after being turned "
 "on. Download the Windows driver package from the HP web site (the firmware "
 "on the printer's CD does not work) and extract the firmware file from it by "
-"uncompresing the self-extracting '.exe' file with the 'unzip' utility and "
+"decompressing the self-extracting '.exe' file with the 'unzip' utility and "
 "searching for the 'sihp1000.img' file. Copy this file into the '/etc/"
 "printer' directory. There it will be found by the automatic uploader script "
 "and uploaded whenever the printer is connected and turned on.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "CUPS принтерини мослаш"
 
-#: printer/printerdrake.pm:63
+#: printer/printerdrake.pm:62
 #, c-format
 msgid ""
 "Here you can choose whether the printers connected to this machine should be "
@@ -9932,51 +10275,46 @@ msgstr ""
 "Бу ерда, бу компьютерга уланган принтердан бошқа компьютер ва қайси "
 "компьютер фойдаланса бўладими-йўқми танлашингиз мумкин."
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
 "automatically made available on this machine."
 msgstr ""
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
 msgstr "Бошқа компьютерлар шу компьютердаги принтерлардан фойдаланиши мумкин"
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr ""
 "Масофадаги компьютерда мавжуд бўлган принтерларни автоматик равишда аниқлаш"
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr ""
 
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr "Бошқача мослаш"
 
-#: printer/printerdrake.pm:78 standalone/scannerdrake:566
-#: standalone/scannerdrake:583
+#: printer/printerdrake.pm:83 standalone/scannerdrake:562
+#: standalone/scannerdrake:579
 #, c-format
 msgid "No remote machines"
 msgstr "Масофадаги компьютер йўқ"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr "Қўшимча CUPS серверлар: "
 
-#: printer/printerdrake.pm:93
-#, c-format
-msgid "None"
-msgstr "Йўқ"
-
-#: printer/printerdrake.pm:95
+#: printer/printerdrake.pm:101
 #, c-format
 msgid ""
 "To get access to printers on remote CUPS servers in your local network you "
@@ -9989,29 +10327,29 @@ msgid ""
 "information from the server(s)."
 msgstr ""
 
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
 msgstr "Япон матнларини босиб чиқариш усули"
 
-#: printer/printerdrake.pm:101
+#: printer/printerdrake.pm:110
 #, c-format
 msgid ""
-"Turning on this allows to print plain text files in japanese language. Only "
-"use this function if you really want to print text in japanese, if it is "
+"Turning on this allows to print plain text files in Japanese language. Only "
+"use this function if you really want to print text in Japanese, if it is "
 "activated you cannot print accentuated characters in latin fonts any more "
 "and you will not be able to adjust the margins, the character size, etc. "
 "This setting only affects printers defined on this machine. If you want to "
-"print japanese text on a printer set up on a remote machine, you have to "
+"print Japanese text on a printer set up on a remote machine, you have to "
 "activate this function on that remote machine."
 msgstr ""
 
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "CUPS'нинг мосламасини автоматик равишда тўғрилаш"
 
-#: printer/printerdrake.pm:107
+#: printer/printerdrake.pm:119
 #, c-format
 msgid ""
 "When this option is turned on, on every startup of CUPS it is automatically "
@@ -10028,12 +10366,38 @@ msgid ""
 "but then you have to take care of these points."
 msgstr ""
 
-#: printer/printerdrake.pm:129 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:132 printer/printerdrake.pm:500
+#: printer/printerdrake.pm:3933
+#, c-format
+msgid "Remote CUPS server and no local CUPS daemon"
+msgstr ""
+
+#: printer/printerdrake.pm:135
+#, fuzzy, c-format
+msgid "On"
+msgstr "Уммон"
+
+#: printer/printerdrake.pm:137 printer/printerdrake.pm:492
+#: printer/printerdrake.pm:519
+#, c-format
+msgid "Off"
+msgstr ""
+
+#: printer/printerdrake.pm:138 printer/printerdrake.pm:501
+#, c-format
+msgid ""
+"In this mode the local CUPS daemon will be stopped and all printing requests "
+"go directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
 #, c-format
 msgid "Sharing of local printers"
 msgstr ""
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
@@ -10042,61 +10406,61 @@ msgstr ""
 "Қуйидаги компьютерлар ва тармоқлар шу компьютерга уланган принтер(лар)дан "
 "фойдаланиши мумкин:"
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr "Хостни/тармоқни қўшиш"
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr "Танланган хостни/тармоқни тузатиш"
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, c-format
 msgid "Remove selected host/network"
 msgstr "Танланган хостни/тармоқни олиб ташлаш"
 
-#: printer/printerdrake.pm:187 printer/printerdrake.pm:197
-#: printer/printerdrake.pm:210 printer/printerdrake.pm:217
-#: printer/printerdrake.pm:248 printer/printerdrake.pm:266
+#: printer/printerdrake.pm:213 printer/printerdrake.pm:223
+#: printer/printerdrake.pm:235 printer/printerdrake.pm:242
+#: printer/printerdrake.pm:273 printer/printerdrake.pm:291
 #, c-format
 msgid "IP address of host/network:"
 msgstr "Хостнинг/тармоқнинг IP рақами:"
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
 "available:"
 msgstr ""
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr "Хостнинг/тармоқнинг IP рақами аниқланмаган."
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr "Кўрсатилган хост/тармоқ нўтўғри.\n"
 
-#: printer/printerdrake.pm:222 printer/printerdrake.pm:400
+#: printer/printerdrake.pm:247 printer/printerdrake.pm:423
 #, c-format
 msgid "Examples for correct IPs:\n"
 msgstr "Тўғри IP рақамларнинг мисоли:\n"
 
-#: printer/printerdrake.pm:246
+#: printer/printerdrake.pm:271
 #, c-format
 msgid "This host/network is already in the list, it cannot be added again.\n"
 msgstr "Бу хост/тармоқ аллақачон рўйхатда, уни яна қўшиб бўлмайди.\n"
 
-#: printer/printerdrake.pm:316 printer/printerdrake.pm:387
+#: printer/printerdrake.pm:340 printer/printerdrake.pm:410
 #, c-format
 msgid "Accessing printers on remote CUPS servers"
 msgstr ""
 
-#: printer/printerdrake.pm:317
+#: printer/printerdrake.pm:341
 #, c-format
 msgid ""
 "Add here the CUPS servers whose printers you want to use. You only need to "
@@ -10104,104 +10468,120 @@ msgid ""
 "local network."
 msgstr ""
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, c-format
 msgid "Add server"
 msgstr "Серверни қўшиш"
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Edit selected server"
 msgstr "Танланган серверни тузатиш"
 
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, c-format
 msgid "Remove selected server"
 msgstr "Танланган серверни олиб ташлаш"
 
-#: printer/printerdrake.pm:388
+#: printer/printerdrake.pm:411
 #, c-format
 msgid "Enter IP address and port of the host whose printers you want to use."
 msgstr ""
 "Принтерларидан фойдаланмоқчи бўлган компьютернинг IP рақамини ва портини "
 "киритинг."
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
 msgstr "Агар ҳеч қандай порт кўрсатилмаса, андоза сифатида 631 қабул қилинади."
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, c-format
 msgid "Server IP missing!"
 msgstr "Сервернинг IP рақами аниқланмаган!"
 
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "Киритилган IP нотўғри.\n"
 
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:1629
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:1744
 #, c-format
 msgid "The port number should be an integer!"
 msgstr "Портнинг рақами бутун сон бўлиши шарт!"
 
-#: printer/printerdrake.pm:422
+#: printer/printerdrake.pm:445
 #, c-format
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr "Сервер аллақачон рўйхатда, уни яна қўшиб бўлмайди.\n"
 
-#: printer/printerdrake.pm:433 printer/printerdrake.pm:1650
-#: standalone/drakups:233 standalone/harddrake2:68
+#: printer/printerdrake.pm:456 printer/printerdrake.pm:1765
+#: standalone/drakups:247 standalone/harddrake2:47
 #, c-format
 msgid "Port"
 msgstr "Порт"
 
-#: printer/printerdrake.pm:478 printer/printerdrake.pm:545
-#: printer/printerdrake.pm:610 printer/printerdrake.pm:628
-#: printer/printerdrake.pm:711 printer/printerdrake.pm:768
-#: printer/printerdrake.pm:794 printer/printerdrake.pm:1703
-#: printer/printerdrake.pm:1886 printer/printerdrake.pm:1902
-#: printer/printerdrake.pm:1945 printer/printerdrake.pm:1982
-#: printer/printerdrake.pm:2024 printer/printerdrake.pm:2061
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2314
-#: printer/printerdrake.pm:2319 printer/printerdrake.pm:2458
-#: printer/printerdrake.pm:2568 printer/printerdrake.pm:3069
-#: printer/printerdrake.pm:3134 printer/printerdrake.pm:3177
-#: printer/printerdrake.pm:3180 printer/printerdrake.pm:3299
-#: printer/printerdrake.pm:3364 printer/printerdrake.pm:3436
-#: printer/printerdrake.pm:3457 printer/printerdrake.pm:3466
-#: printer/printerdrake.pm:3557 printer/printerdrake.pm:3655
-#: printer/printerdrake.pm:3661 printer/printerdrake.pm:3674
-#: printer/printerdrake.pm:3726 printer/printerdrake.pm:3766
-#: printer/printerdrake.pm:3778 printer/printerdrake.pm:3789
-#: printer/printerdrake.pm:3798 printer/printerdrake.pm:3811
-#: printer/printerdrake.pm:3888 printer/printerdrake.pm:3945
-#: printer/printerdrake.pm:4010 printer/printerdrake.pm:4270
-#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4459
-#: printer/printerdrake.pm:4517 printer/printerdrake.pm:4546
-#: standalone/printerdrake:65 standalone/printerdrake:85
-#: standalone/printerdrake:522
+#: printer/printerdrake.pm:489 printer/printerdrake.pm:505
+#: printer/printerdrake.pm:520 printer/printerdrake.pm:524
+#: printer/printerdrake.pm:530
+#, fuzzy, c-format
+msgid "On, Name or IP of remote server:"
+msgstr "Масофадаги LPD серверидаги принтер"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "CUPS сервернинг номи ёки IP рақами кўрсатилмаган."
+
+#: printer/printerdrake.pm:560 printer/printerdrake.pm:580
+#: printer/printerdrake.pm:649 printer/printerdrake.pm:714
+#: printer/printerdrake.pm:741 printer/printerdrake.pm:796
+#: printer/printerdrake.pm:838 printer/printerdrake.pm:848
+#: printer/printerdrake.pm:1818 printer/printerdrake.pm:2004
+#: printer/printerdrake.pm:2021 printer/printerdrake.pm:2064
+#: printer/printerdrake.pm:2104 printer/printerdrake.pm:2147
+#: printer/printerdrake.pm:2184 printer/printerdrake.pm:2194
+#: printer/printerdrake.pm:2437 printer/printerdrake.pm:2442
+#: printer/printerdrake.pm:2579 printer/printerdrake.pm:2689
+#: printer/printerdrake.pm:3247 printer/printerdrake.pm:3312
+#: printer/printerdrake.pm:3361 printer/printerdrake.pm:3364
+#: printer/printerdrake.pm:3484 printer/printerdrake.pm:3549
+#: printer/printerdrake.pm:3621 printer/printerdrake.pm:3642
+#: printer/printerdrake.pm:3651 printer/printerdrake.pm:3745
+#: printer/printerdrake.pm:3837 printer/printerdrake.pm:3843
+#: printer/printerdrake.pm:3863 printer/printerdrake.pm:3969
+#: printer/printerdrake.pm:4076 printer/printerdrake.pm:4095
+#: printer/printerdrake.pm:4104 printer/printerdrake.pm:4117
+#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4749
+#: printer/printerdrake.pm:4826 standalone/printerdrake:64
+#: standalone/printerdrake:84 standalone/printerdrake:566
 #, c-format
 msgid "Printerdrake"
 msgstr "Printerdrake"
 
-#: printer/printerdrake.pm:479
+#: printer/printerdrake.pm:561 printer/printerdrake.pm:3550
+#: printer/printerdrake.pm:4077
+#, c-format
+msgid "Reading printer data..."
+msgstr "Принтер ҳақида маълумот ўқилмоқда..."
+
+#: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
 msgstr "CUPS бошқадан ишга туширилмоқда..."
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr "Принтерга уланишни танланг"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr "Принтер қадай уланган?"
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, c-format
 msgid ""
 "\n"
@@ -10212,7 +10592,7 @@ msgstr ""
 "Масофадаги CUPS серверидаги принтерларни мослашингиз шарт эмас, улар "
 "автоматик равишда аниқланади."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -10220,28 +10600,28 @@ msgid ""
 "detected nor tested!"
 msgstr ""
 
-#: printer/printerdrake.pm:515
+#: printer/printerdrake.pm:619
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr ""
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
 msgstr "Тизим текширилмоқда..."
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
 msgstr "ва битта номаълум принтер"
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, c-format
 msgid "and %d unknown printers"
 msgstr "ва %d номаълум принтер"
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, c-format
 msgid ""
 "The following printers\n"
@@ -10252,9 +10632,9 @@ msgstr ""
 "Қуйидаги принтерлар\n"
 "\n"
 "%s%s\n"
-"системангизга тўғридан-тўғри уланган."
+"компьютерга тўғридан-тўғри уланган"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -10262,12 +10642,12 @@ msgid ""
 "%s%s\n"
 "are directly connected to your system"
 msgstr ""
-"Қуйидаги принтерлар\n"
+"Қуйидаги принтер\n"
 "\n"
 "%s%s\n"
-"системангизга тўғридан-тўғри уланган."
+"компьютерга тўғридан-тўғри уланган"
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, c-format
 msgid ""
 "The following printer\n"
@@ -10278,9 +10658,9 @@ msgstr ""
 "Қуйидаги принтер\n"
 "\n"
 "%s%s\n"
-"системангизга тўғридан-тўғри уланган."
+"компьютерга тўғридан-тўғри уланган"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
@@ -10289,7 +10669,7 @@ msgstr ""
 "\n"
 "Тизимга битта номаълум принтер тўғридан-тўғри уланган"
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
@@ -10298,42 +10678,42 @@ msgstr ""
 "\n"
 "Тизимга %d номаълум принтер тўғридан-тўғри уланган"
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "Сизнинг компьютерингизга тўғридан-тўғри уланган принтер топилмади"
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr ""
 " (Ҳамма принтерлар уланганлигига ва ёқилганлигига ишонч ҳосил қилинг).\n"
 
-#: printer/printerdrake.pm:594
+#: printer/printerdrake.pm:698
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
 "printers in the local network?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:595
+#: printer/printerdrake.pm:699
 #, c-format
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:597
+#: printer/printerdrake.pm:701
 #, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:598
+#: printer/printerdrake.pm:702
 #, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr ""
 "Бу компьютерга босиб чиқариш имкониятини ўрнатишга ишончингиз комилми?\n"
 
-#: printer/printerdrake.pm:599
+#: printer/printerdrake.pm:703
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -10342,48 +10722,42 @@ msgstr ""
 "ИЗОҲ: Принтернинг моделига ва босиб чиқариш тизимига боғлиқ равишда ҳажми то "
 "%d Мб бўлган қўшимча дастурлар ўрнатилади."
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Янги принтерлар қидирилмоқда..."
 
-#: printer/printerdrake.pm:713
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer ..."
-msgstr "Принтер мосланмоқда..."
+msgid "Found printer on %s..."
+msgstr "Принтер \"%s\"да топилди..."
 
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
-#, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "Принтер (\"%s\") мосланмоқда..."
-
-#: printer/printerdrake.pm:734
+#: printer/printerdrake.pm:822
 #, c-format
 msgid "("
 msgstr "("
 
-#: printer/printerdrake.pm:735
+#: printer/printerdrake.pm:823
 #, c-format
 msgid " on "
 msgstr " да "
 
-#: printer/printerdrake.pm:736 standalone/scannerdrake:136
+#: printer/printerdrake.pm:824 standalone/scannerdrake:137
 #, c-format
 msgid ")"
 msgstr ")"
 
-#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470
+#: printer/printerdrake.pm:829 printer/printerdrake.pm:2591
 #, c-format
 msgid "Printer model selection"
 msgstr "Принтернинг моделини танлаш"
 
-#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471
+#: printer/printerdrake.pm:830 printer/printerdrake.pm:2592
 #, c-format
 msgid "Which printer model do you have?"
 msgstr "Сизнинг принтерингизнинг модели?"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -10396,7 +10770,7 @@ msgstr ""
 "Printerdrake %s принтерингизнинг моделини аниқлолмади. Илтимос, қуйидаги "
 "рўйхатдан тўғри келадиган моделни танланг."
 
-#: printer/printerdrake.pm:746 printer/printerdrake.pm:2476
+#: printer/printerdrake.pm:834 printer/printerdrake.pm:2597
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
@@ -10405,21 +10779,24 @@ msgstr ""
 "Агар сизниг принтерингиз рўйхатда бўлмаса, унга мос келадиган (принтернинг "
 "кўлланмасига қаранг) ёки унга ўхшаш принтерни танланг."
 
-#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779
-#: printer/printerdrake.pm:3946 printer/printerdrake.pm:4271
-#: printer/printerdrake.pm:4314 printer/printerdrake.pm:4518
+#: printer/printerdrake.pm:839
+#, fuzzy, c-format
+msgid "Configuring printer on %s..."
+msgstr "Принтер (\"%s\") мосланмоқда..."
+
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
 #, c-format
-msgid "Configuring applications..."
-msgstr "Дастурлар мосланмоқда..."
+msgid "Configuring printer \"%s\"..."
+msgstr "Принтер (\"%s\") мосланмоқда..."
 
-#: printer/printerdrake.pm:831 printer/printerdrake.pm:843
-#: printer/printerdrake.pm:901 printer/printerdrake.pm:1872
-#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4211
+#: printer/printerdrake.pm:932 printer/printerdrake.pm:944
+#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1987
+#: printer/printerdrake.pm:4332 printer/printerdrake.pm:4501
 #, c-format
 msgid "Add a new printer"
 msgstr "Янги принтерни қўшиш"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -10433,7 +10810,7 @@ msgid ""
 "connection types."
 msgstr ""
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -10471,10 +10848,10 @@ msgstr ""
 "Windows компьютерига уланган принтерларни автоматик равишда аниқлашни "
 "ўчиринг.\n"
 "\n"
-" Тайёр бўлганингиздан сўнг \"Кейингиси\"ни ёки принтер(лар)ингизни ўрнатишни "
+" Тайёр бўлганингиздан сўнг \"Кейинги\"ни ёки принтер(лар)ингизни ўрнатишни "
 "истамасангиз \"Бекор қилиш\"ни босинг."
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -10498,10 +10875,10 @@ msgstr ""
 "Шу компьютерга уланган принтер(лар)ингизни автоматик равишда аниқлаш учун "
 "уни/уларни ёқилган ҳолатга келтиринг.\n"
 "\n"
-" Тайёр бўлганингиздан сўнг \"Кейингиси\"ни ёки принтер(лар)ингизни ўрнатишни "
+" Тайёр бўлганингиздан сўнг \"Кейинги\"ни ёки принтер(лар)ингизни ўрнатишни "
 "истамасангиз \"Бекор қилиш\"ни босинг."
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -10536,10 +10913,10 @@ msgstr ""
 "учун, агар бу сизга керак бўлмаса, тармоққа уланган принтерларни автоматик "
 "равишда аниқлашни ўчиринг.\n"
 "\n"
-" Тайёр бўлганингиздан сўнг \"Кейингиси\"ни ёки принтер(лар)ингизни ўрнатишни "
+" Тайёр бўлганингиздан сўнг \"Кейинги\"ни ёки принтер(лар)ингизни ўрнатишни "
 "истамасангиз \"Бекор қилиш\"ни босинг."
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -10563,27 +10940,27 @@ msgstr ""
 "Агар шу компьютерга уланган принтер(лар)ингиз бўлса, уни/уларни автоматик "
 "равишда аниқлаш учун уни/уларни ёқилган ҳолатга келтиринг.\n"
 "\n"
-" Тайёр бўлганингиздан сўнг \"Кейингиси\"ни ёки принтер(лар)ингизни ўрнатишни "
+" Тайёр бўлганингиздан сўнг \"Кейинги\"ни ёки принтер(лар)ингизни ўрнатишни "
 "истамасангиз \"Бекор қилиш\"ни босинг."
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Бу компьютерга уланган принтерларни автоматик равишда аниқлаш"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Локал тармоққа уланган принтерларни автоматик равишда аниқлаш"
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 "Microsoft Windows бошқараётган компьютерларга уланган авто-аниқланган "
 "принтерлар"
 
-#: printer/printerdrake.pm:902
+#: printer/printerdrake.pm:1003
 #, c-format
 msgid ""
 "\n"
@@ -10597,70 +10974,70 @@ msgid ""
 "select \"Printer\" in the \"Hardware\" section of the %s Control Center."
 msgstr ""
 
-#: printer/printerdrake.pm:937 printer/printerdrake.pm:1152
-#: printer/printerdrake.pm:1214 printer/printerdrake.pm:1304
-#: printer/printerdrake.pm:1441 printer/printerdrake.pm:1516
-#: printer/printerdrake.pm:1667 printer/printerdrake.pm:1750
-#: printer/printerdrake.pm:1759 printer/printerdrake.pm:1768
-#: printer/printerdrake.pm:1779 printer/printerdrake.pm:1892
-#: printer/printerdrake.pm:1954 printer/printerdrake.pm:1988
+#: printer/printerdrake.pm:1038 printer/printerdrake.pm:1267
+#: printer/printerdrake.pm:1329 printer/printerdrake.pm:1419
+#: printer/printerdrake.pm:1556 printer/printerdrake.pm:1631
+#: printer/printerdrake.pm:1782 printer/printerdrake.pm:1865
+#: printer/printerdrake.pm:1874 printer/printerdrake.pm:1883
+#: printer/printerdrake.pm:1894 printer/printerdrake.pm:2010
+#: printer/printerdrake.pm:2076 printer/printerdrake.pm:2111
 #, c-format
 msgid "Could not install the %s packages!"
 msgstr "%s пакетларини ўрнатиб бўлмади!"
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr ""
 
-#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Printer auto-detection"
 msgstr "Принтерни авто-аниқлаш"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "Ускуналар аниқланилмоқда..."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", тармоқдаги принтер \"%s\", порт %s"
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", \"%s\" принтер \"%s\" SMB/Windows серверида"
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr "%s аниқланди"
 
-#: printer/printerdrake.pm:977 printer/printerdrake.pm:1000
-#: printer/printerdrake.pm:1017
+#: printer/printerdrake.pm:1087 printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1132
 #, c-format
 msgid "Printer on parallel port #%s"
 msgstr "\\#%s параллел портидаги принтер"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Тармоқдаги принтер \"%s\", порт %s"
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "\"%s\" принтер \"%s\" SMB/Windows серверида"
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, c-format
 msgid "Local Printer"
 msgstr "Локал принтер"
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -10669,32 +11046,32 @@ msgid ""
 "printer: /dev/usb/lp1, ...)."
 msgstr ""
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Ускунанинг ёки файлнинг номини киритишингиз шарт!"
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr "Ҳеч қандай принтер топилмади!"
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr "Локал принтерлар"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr "Мавжуд бўлган принтерлар"
 
-#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098
+#: printer/printerdrake.pm:1204 printer/printerdrake.pm:1213
 #, c-format
 msgid "The following printer was auto-detected. "
 msgstr "Қуйидаги принтер автоматик равишда аниқланди. "
 
-#: printer/printerdrake.pm:1091
+#: printer/printerdrake.pm:1206
 #, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
@@ -10703,18 +11080,18 @@ msgstr ""
 "Агар бу сиз мосламоқчи бўлган принтер бўлмаса, ускунанинг/файлнинг номини "
 "киритинг."
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr "Истасангиз, ускунанинг/файлнинг номини кўрсатишингиз мумкин."
 
-#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102
+#: printer/printerdrake.pm:1208 printer/printerdrake.pm:1217
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr "Авто-аниқланган принтерларнинг рўйхати. "
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1210
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
@@ -10722,7 +11099,7 @@ msgid ""
 msgstr ""
 "Сиз ўрнатмоқчи бўлган принтернинг ёки ускунанинг/файлнинг номини киритинг."
 
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1211
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
@@ -10731,7 +11108,7 @@ msgstr ""
 "Илтимос босиб чиқариш вазифалари жўнатиладиган принтерни танланг ёки "
 "ускунанинг/файлнинг номини киритинг."
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -10739,12 +11116,12 @@ msgid ""
 "configuration, turn on \"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr ""
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -10753,12 +11130,12 @@ msgid ""
 "\"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "Илтимос босиб чиқариш вазифалари жўнатиладиган принтерни танланг."
 
-#: printer/printerdrake.pm:1107
+#: printer/printerdrake.pm:1222
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
@@ -10767,12 +11144,12 @@ msgstr ""
 "Илтимос принтерингиз уланган портни танланг ёки ускунаниг/файлнинг номини "
 "киритинг."
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Илтимос принтерингиз уланган портни танланг."
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -10781,26 +11158,26 @@ msgstr ""
 " (Параллел портлар: /dev/lp0, /dev/lp1, ..., LPT1:, LPT2:, ... га тенг, 1-чи "
 "USB принтер: /dev/usb/lp0, 2-чи USB принтер: /dev/usb/lp1, ...)."
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Принтер ёки ускунани танлашингиз ёки киритишингиз шарт!"
 
-#: printer/printerdrake.pm:1154 printer/printerdrake.pm:1216
-#: printer/printerdrake.pm:1306 printer/printerdrake.pm:1443
-#: printer/printerdrake.pm:1518 printer/printerdrake.pm:1669
-#: printer/printerdrake.pm:1752 printer/printerdrake.pm:1761
-#: printer/printerdrake.pm:1770 printer/printerdrake.pm:1781
+#: printer/printerdrake.pm:1269 printer/printerdrake.pm:1331
+#: printer/printerdrake.pm:1421 printer/printerdrake.pm:1558
+#: printer/printerdrake.pm:1633 printer/printerdrake.pm:1784
+#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1876
+#: printer/printerdrake.pm:1885 printer/printerdrake.pm:1896
 #, c-format
 msgid "Aborting"
 msgstr "Тўхтатилмоқда"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Масофадаги LPD принтернинг параметрлари"
 
-#: printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1305
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -10809,63 +11186,63 @@ msgstr ""
 "Масофадаги LPD принтеридан фойдаланиш учун принтер ўрнатилган компьютернинг "
 "номини ва принтернинг номини кўрсатишингиз керак."
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr "Масофадаги хостнинг номи"
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr "Масофадаги принтернинг номи"
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Масофадаги хостнинг номи аниқланмаган!"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Масофадаги принтернинг номи аниқланмаган!"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769 standalone/drakTermServ:1432
-#: standalone/drakTermServ:1440 standalone/drakTermServ:1451
-#: standalone/drakbackup:512 standalone/drakbackup:618
-#: standalone/drakbackup:653 standalone/drakbackup:771
-#: standalone/harddrake2:166
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742 standalone/drakTermServ:1405
+#: standalone/drakTermServ:1413 standalone/drakTermServ:1424
+#: standalone/drakbackup:513 standalone/drakbackup:619
+#: standalone/drakbackup:654 standalone/drakbackup:774
+#: standalone/harddrake2:237
 #, c-format
 msgid "Information"
 msgstr "Маълумот"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Аниқланган модел: %s %s"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr "Тармоқ қидирилмоқда..."
 
-#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342
+#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1457
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", \"%s\" принтер \"%s\" серверда"
 
-#: printer/printerdrake.pm:1324 printer/printerdrake.pm:1345
+#: printer/printerdrake.pm:1439 printer/printerdrake.pm:1460
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "\"%s\" принтер \"%s\" серверда"
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) принтернинг параметрлари"
 
-#: printer/printerdrake.pm:1367
+#: printer/printerdrake.pm:1482
 #, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -10874,7 +11251,7 @@ msgid ""
 "access and any applicable user name, password, and workgroup information."
 msgstr ""
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -10884,47 +11261,47 @@ msgstr ""
 "танланг ва фойдаланувчини, махфий сўзни ва керак бўлса ишчи гуруҳни "
 "кўрсатинг."
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "SMB сервернинг хости"
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr "SMB сервернинг IP рақами"
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr ""
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "Ишчи гуруҳ"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Auto-detected"
 msgstr "Авто-аниқланди"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Сервернинг номи ёки сервернинг IP рақами киритилиши шарт!"
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "ХАВФСИЗЛИК ОГОҲНОМАСИ!"
 
-#: printer/printerdrake.pm:1398
+#: printer/printerdrake.pm:1513
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -10948,7 +11325,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1408
+#: printer/printerdrake.pm:1523
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -10957,7 +11334,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1411
+#: printer/printerdrake.pm:1526
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -10966,12 +11343,12 @@ msgid ""
 "Do you really want to continue setting up this printer as you are doing now?"
 msgstr ""
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "NetWare принтернинг параметрлари"
 
-#: printer/printerdrake.pm:1490
+#: printer/printerdrake.pm:1605
 #, c-format
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -10980,42 +11357,42 @@ msgid ""
 "name and password."
 msgstr ""
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "Босиб чиқариш сервери"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "Босиб чиқариш навбатининг номи"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr "NCP серверининг номи аниқланмаган!"
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "NCP навбатнинг номи аниқланмаган!"
 
-#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
+#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", хост \"%s\", порт %s"
 
-#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597
+#: printer/printerdrake.pm:1692 printer/printerdrake.pm:1712
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr "Хост \"%s\", порт %s"
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "TCP/Socket принтернинг параметрлари"
 
-#: printer/printerdrake.pm:1620
+#: printer/printerdrake.pm:1735
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
@@ -11025,7 +11402,7 @@ msgstr ""
 "принтернинг хост номини ёки IP рақамини ва истасангиз порт рақамини (андоза "
 "- 9100) киритинг."
 
-#: printer/printerdrake.pm:1621
+#: printer/printerdrake.pm:1736
 #, c-format
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -11038,27 +11415,27 @@ msgstr ""
 "киритишингиз керак. HP JetDirect серверларда одатда портнинг рақами 9100, "
 "бошқа серверларда бошқача бўлиши мумкин. Асбобингизнинг қўлланмасига қаранг."
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Компьютернинг номи ёки IP рақами аниқланмаган!"
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Компьютернинг номи ёки IP рақами"
 
-#: printer/printerdrake.pm:1704
+#: printer/printerdrake.pm:1819
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr ""
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "Принтер ускунасининг URI'и"
 
-#: printer/printerdrake.pm:1708
+#: printer/printerdrake.pm:1823
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -11066,17 +11443,17 @@ msgid ""
 "are supported by all the spoolers."
 msgstr ""
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Ҳақиқий URI киритилиши керак!"
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
 msgstr "Буйруғга улаш"
 
-#: printer/printerdrake.pm:1835
+#: printer/printerdrake.pm:1950
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
@@ -11085,17 +11462,17 @@ msgstr ""
 "Вазифани принтерга тўғридан-тўғри жўнатишни ўрнига уни истаган буйруғга улаш "
 "(pipe) мумкин. Бу ерда ўша буйруғни киритишингиз мумкин."
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, c-format
 msgid "Command line"
 msgstr "Буйруқ"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Буйруқ киритиши керак!"
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -11106,75 +11483,75 @@ msgstr ""
 "1100/1200/1220/3200/3300 сканнер билан, DeskJet 450, Sony IJP-V100), HP "
 "PhotoSmart ёки HP LaserJet 2200 кўп амалли ускунами?"
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "HPOJ пакетлари ўрнатилмоқда..."
 
-#: printer/printerdrake.pm:1894
+#: printer/printerdrake.pm:2012
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr ""
 
-#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
+#: printer/printerdrake.pm:2022 printer/printerdrake.pm:2148
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr "Ускуна текширилмоқда ва HPOJ мосланмоқда..."
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "SANE пакетлари ўрнатилмоқда..."
 
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr ""
 
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "mtools пакетлари ўрнатилмоқда..."
 
-#: printer/printerdrake.pm:1990
+#: printer/printerdrake.pm:2113
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr ""
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "Принтернинг порти CUPS билан ишлайдиган қилинмоқда..."
 
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2580
 #, c-format
 msgid "Reading printer database..."
 msgstr "Принтер маълумот базаси ўқилмоқда..."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Принтернинг номини ва изоҳни киритинг"
 
-#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
+#: printer/printerdrake.pm:2408 printer/printerdrake.pm:3606
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr ""
 "Принтернинг номи фақат ҳарф, сон ва тагидан чизиш белгисидан иборат бўлиши "
 "керак"
 
-#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426
+#: printer/printerdrake.pm:2414 printer/printerdrake.pm:3611
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -11183,7 +11560,7 @@ msgstr ""
 "Принтер \"%s\" аллақачон мавжуд.\n"
 "Унинг мосламаларини алмаштиришни ростдан истайсизми?"
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -11193,35 +11570,35 @@ msgstr ""
 "\"Манзили\" майдонларни тўлдириш шарт эмас. Улар фойдаланувчилар учун изоҳ "
 "сифатида ишлатилади."
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "Принтернинг номи"
 
-#: printer/printerdrake.pm:2302 standalone/drakconnect:570
-#: standalone/harddrake2:41 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2425 standalone/drakconnect:568
+#: standalone/harddrake2:34 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "Description"
 msgstr "Таърифи"
 
-#: printer/printerdrake.pm:2303 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2426 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "Location"
 msgstr "Манзили"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Принтер маълумот базаси тайёрланмоқда..."
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr "Сизнинг принтерингизнинг модели"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -11236,18 +11613,18 @@ msgid ""
 "%s"
 msgstr ""
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, c-format
 msgid "The model is correct"
 msgstr "Тўғри модел"
 
-#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
-#: printer/printerdrake.pm:2449
+#: printer/printerdrake.pm:2566 printer/printerdrake.pm:2567
+#: printer/printerdrake.pm:2570
 #, c-format
 msgid "Select model manually"
 msgstr "Моделни ўзингиз танланг"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -11257,38 +11634,38 @@ msgid ""
 "\"Raw printer\" is highlighted."
 msgstr ""
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr ""
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
 
-#: printer/printerdrake.pm:2523
+#: printer/printerdrake.pm:2644
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
 "delivered with the printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2524
+#: printer/printerdrake.pm:2645
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr ""
 
-#: printer/printerdrake.pm:2525
+#: printer/printerdrake.pm:2646
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
 "your Windows partition, too."
 msgstr ""
 
-#: printer/printerdrake.pm:2526
+#: printer/printerdrake.pm:2647
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -11296,65 +11673,58 @@ msgid ""
 "printer's hardware"
 msgstr ""
 
-#: printer/printerdrake.pm:2527
+#: printer/printerdrake.pm:2648
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
 "then be used for the setup of your printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
 #, c-format
 msgid "Install PPD file from"
 msgstr ""
 
-#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538
-#: standalone/scannerdrake:180 standalone/scannerdrake:188
-#: standalone/scannerdrake:239 standalone/scannerdrake:246
-#, c-format
-msgid "CD-ROM"
-msgstr "Компакт-диск"
-
-#: printer/printerdrake.pm:2532 printer/printerdrake.pm:2540
-#: standalone/scannerdrake:181 standalone/scannerdrake:190
-#: standalone/scannerdrake:240 standalone/scannerdrake:248
+#: printer/printerdrake.pm:2653 printer/printerdrake.pm:2661
+#: standalone/scannerdrake:177 standalone/scannerdrake:186
+#: standalone/scannerdrake:236 standalone/scannerdrake:244
 #, c-format
 msgid "Floppy Disk"
 msgstr "Дискет"
 
-#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542
-#: standalone/scannerdrake:182 standalone/scannerdrake:192
-#: standalone/scannerdrake:241 standalone/scannerdrake:250
+#: printer/printerdrake.pm:2654 printer/printerdrake.pm:2663
+#: standalone/scannerdrake:178 standalone/scannerdrake:188
+#: standalone/scannerdrake:237 standalone/scannerdrake:246
 #, c-format
 msgid "Other place"
 msgstr "Бошқа жой"
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, c-format
 msgid "Select PPD file"
 msgstr "PPD-файлини танлаш"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr ""
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr ""
 
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
 #, c-format
 msgid "Installing PPD file..."
 msgstr "PPD-файли ўрнатилмоқда..."
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI вин-принтерни мослаш"
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -11365,12 +11735,12 @@ msgid ""
 "not work. Your connection type setting will be ignored by the driver."
 msgstr ""
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Lexmark inkjet принтерини мослаш"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -11379,7 +11749,7 @@ msgid ""
 "to."
 msgstr ""
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -11392,12 +11762,12 @@ msgid ""
 "adjust the head alignment settings with this program."
 msgstr ""
 
-#: printer/printerdrake.pm:2746
+#: printer/printerdrake.pm:2874
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Lexmark X125 принтерини мослаш"
 
-#: printer/printerdrake.pm:2747
+#: printer/printerdrake.pm:2875
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -11406,12 +11776,31 @@ msgid ""
 "connected to."
 msgstr ""
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2897
+#, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Samsung ML/QL-85G мосламаси"
+
+#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected on the "
+"first parallel port, no printers on remote machines or print server boxes or "
+"on other parallel ports. Please connect your printer to the first parallel "
+"port or configure it on the machine where it is connected to."
+msgstr ""
+
+#: printer/printerdrake.pm:2924
+#, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Canon LBP-460/660 мосламаси"
+
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr ""
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -11422,27 +11811,27 @@ msgid ""
 "printout quality/resolution printing can get substantially slower."
 msgstr ""
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
 msgstr "Принтернинг андоза мосламалари"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Параметр %s бутун сон бўлиши керак!"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Параметр %s сон бўлиши керак!"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Параметр %s чегарадан ташқарида!"
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -11451,12 +11840,12 @@ msgstr ""
 "Бу принтерни (\"%s\") андоза деб\n"
 "белгилашни истайсизми?"
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr "Синов бетлари"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -11469,57 +11858,57 @@ msgstr ""
 "жуда кичик ҳотирали лазер принтерларда умуман чиқмаши мумкин. Кўп ҳолларда, "
 "андоза синов бетини босиб чиқариш кифоя."
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
 msgstr "Синов бети йўқ"
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Print"
 msgstr "Босиб чиқариш"
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, c-format
 msgid "Standard test page"
 msgstr "Андоза синов бети"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Бошқа синов бети (Хат)"
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Бошқа синов бети (A4)"
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr "Сурат синов бети"
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr "Синов бетини босиб чиқармаш"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Синов бет(лар) босиб чиқарилмоқда..."
 
-#: printer/printerdrake.pm:3150
+#: printer/printerdrake.pm:3331
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "%s пакетини ўрнатиб бўлмади!"
 
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3333
 #, c-format
 msgid "Skipping photo test page."
 msgstr ""
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -11534,7 +11923,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -11543,17 +11932,17 @@ msgstr ""
 "Синов бет(лар) принтерга жўнатилди.\n"
 "Принтер ишини бошлагунча бироз вақт ўтиши мумкин.\n"
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr "Тўғри ишладими?"
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr ""
 
-#: printer/printerdrake.pm:3231
+#: printer/printerdrake.pm:3416
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -11562,7 +11951,7 @@ msgid ""
 "to modify the option settings easily.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3418
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -11570,8 +11959,8 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253
-#: printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3421 printer/printerdrake.pm:3438
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "\n"
@@ -11580,7 +11969,7 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 
-#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279
+#: printer/printerdrake.pm:3424 printer/printerdrake.pm:3464
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -11591,7 +11980,7 @@ msgstr ""
 "ўқинг ёки \"Параметрлар рўйхатини кўрсатиш\" тугмасини босинг. %s%s%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3243
+#: printer/printerdrake.pm:3428
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
@@ -11600,15 +11989,15 @@ msgstr ""
 "Жорий принтер учун мавжуд бўлган параметрларнинг рўйхати:\n"
 "\n"
 
-#: printer/printerdrake.pm:3248 printer/printerdrake.pm:3258
+#: printer/printerdrake.pm:3433 printer/printerdrake.pm:3443
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3250 printer/printerdrake.pm:3260
-#: printer/printerdrake.pm:3270
+#: printer/printerdrake.pm:3435 printer/printerdrake.pm:3445
+#: printer/printerdrake.pm:3455
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -11616,7 +12005,7 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3255 printer/printerdrake.pm:3265
+#: printer/printerdrake.pm:3440 printer/printerdrake.pm:3450
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
@@ -11625,14 +12014,14 @@ msgstr ""
 "Жорий принтер учун мавжуд бўлган параметрларни билиш учун \"Параметрлар "
 "рўйхатини кўрсатиш\" тугмасини босинг."
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3453
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\" or \"%s <file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -11643,7 +12032,7 @@ msgid ""
 "jams.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -11652,42 +12041,32 @@ msgid ""
 "line, e. g. \"%s <file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "\"%s\" ёрдамида босиб чиқарилмоқда/скан қилинмоқда"
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Принтер (%s) ёрдамида босиб чиқарилмоқда..."
 
-#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296
-#: printer/printerdrake.pm:3297 printer/printerdrake.pm:3298
-#: printer/printerdrake.pm:4384 standalone/drakTermServ:313
-#: standalone/drakbackup:4063 standalone/drakbug:177 standalone/drakfont:500
-#: standalone/drakfont:591 standalone/net_monitor:107
-#: standalone/printerdrake:515
-#, c-format
-msgid "Close"
-msgstr "Ёпиш"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, c-format
 msgid "Print option list"
 msgstr "Параметрлар рўйхатини кўрсатиш"
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -11698,10 +12077,12 @@ msgid ""
 "\" menu. Call also \"man scanimage\" on the command line to get more "
 "information.\n"
 "\n"
-"Do not use \"scannerdrake\" for this device!"
+"You do not need to run \"scannerdrake\" for setting up scanning on this "
+"device, you only need to use \"scannerdrake\" if you want to share the "
+"scanner on the network."
 msgstr ""
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -11715,18 +12096,13 @@ msgid ""
 "of the file lists."
 msgstr ""
 
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "Принтер ҳақида маълумот ўқилмоқда..."
-
-#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412
-#: printer/printerdrake.pm:3447
+#: printer/printerdrake.pm:3570 printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3632
 #, c-format
 msgid "Transfer printer configuration"
 msgstr "Принтернинг мосламаларини узатиш"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -11736,14 +12112,14 @@ msgid ""
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -11752,19 +12128,19 @@ msgstr ""
 "PDQ билан фақат локал принтерларни, масофадаги LPD принтерларни ва Socket/"
 "TCP принтерларни ишлатиб бўлади.\n"
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD ва LPRng билан IPP принтерларни ишлатиб бўлмайди.\n"
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -11775,7 +12151,7 @@ msgstr ""
 "Ишлаб чиқарувчининг PPD-файллари ёки CUPS'нинг асл драйверлари билан "
 "мосланган принтерларни ҳам узатиб бўлмайди."
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -11786,17 +12162,17 @@ msgstr ""
 "Сиз узатмоқчи бўлган принтерни белгиланг ва\n"
 "\"Узатиш\" тугмасини босинг."
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Принтерларни узатмаш"
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr "Узатиш"
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -11808,17 +12184,17 @@ msgstr ""
 "Принтернинг бошқа номини киритишингиз ёки уни ўтказиб жўнатишингиз ҳам "
 "мумкин."
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
 msgstr "Янги принтернинг номи"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr "%s узатилмоқда..."
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -11827,28 +12203,28 @@ msgstr ""
 "Сиз олдинги андоза принтерни (\"%s\") узатдингиз. У янги босиб чиқариш "
 "тизими (\"%s\") учун ҳам андоза принтер бўлсинми?"
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Принтер маълумоти янгиланмоқда..."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
 msgstr "Тармоқ ишга туширилмоқда..."
 
-#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512
-#: printer/printerdrake.pm:3514
+#: printer/printerdrake.pm:3695 printer/printerdrake.pm:3699
+#: printer/printerdrake.pm:3701
 #, c-format
 msgid "Configure the network now"
 msgstr "Тармоқни мослаш"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Тармоқ мосланмаган"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -11857,12 +12233,12 @@ msgid ""
 "configuring now. How do you want to proceed?"
 msgstr ""
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Тармоқни мосламай давом этиш"
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3735
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -11872,7 +12248,7 @@ msgid ""
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -11880,27 +12256,27 @@ msgid ""
 "printer again."
 msgstr ""
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Босиб чиқариш сисемаси бошқадан ишга туширилмоқда..."
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "юқори"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "paranoid"
 msgstr "параноид"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr ""
 
-#: printer/printerdrake.pm:3599
+#: printer/printerdrake.pm:3779
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -11915,12 +12291,12 @@ msgid ""
 "Do you really want to configure printing on this machine?"
 msgstr ""
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr ""
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -11934,67 +12310,150 @@ msgid ""
 "again?"
 msgstr ""
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr "Ўрнатилган дастурлар текширилмоқда..."
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
-msgstr "\"%s\" олиб ташланмоқда..."
+msgid "Removing %s..."
+msgstr "%s олиб ташланмоқда..."
 
-#: printer/printerdrake.pm:3665
+#: printer/printerdrake.pm:3847
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "%s босиб чиқариш тизимини олиб ташлаб бўлмади!"
 
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, c-format
-msgid "Installing %s ..."
-msgstr "\"%s\" ўрнатилмоқда..."
+msgid "Installing %s..."
+msgstr "%s ўрнатилмоқда..."
 
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3867
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "%s босиб чиқариш тизимини ўрнатиб бўлмади!"
 
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3934
+#, c-format
+msgid ""
+"In this mode there is no local printing system, all printing requests go "
+"directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:3936
+#, c-format
+msgid ""
+"Enter the host name or IP of your CUPS server and click OK if you want to "
+"use this mode, click \"Quit\" otherwise."
+msgstr ""
+
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "Масофадаги сервернинг номи ёки IP рақами:"
+
+#: printer/printerdrake.pm:3970
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Андоза принтер ўрнатилмоқда..."
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "Локал CUPS босиб чиқариш тизими ёки масофадаги CUPS сервери?"
+
+#: printer/printerdrake.pm:3990
+#, c-format
+msgid "The CUPS printing system can be used in two ways: "
+msgstr ""
+
+#: printer/printerdrake.pm:3992
+#, c-format
+msgid "1. The CUPS printing system can run locally. "
+msgstr ""
+
+#: printer/printerdrake.pm:3993
+#, c-format
+msgid ""
+"Then locally connected printers can be used and remote printers on other "
+"CUPS servers in the same network are automatically discovered. "
+msgstr ""
+
+#: printer/printerdrake.pm:3994
+#, c-format
+msgid ""
+"Disadvantage of this approach is, that more resources on the local machine "
+"are needed: Additional software packages need to be installed, the CUPS "
+"daemon has to run in the background and needs some memory, and the IPP port "
+"(port 631) is opened. "
+msgstr ""
+
+#: printer/printerdrake.pm:3996
+#, c-format
+msgid "2. All printing requests are immediately sent to a remote CUPS server. "
+msgstr ""
+
+#: printer/printerdrake.pm:3997
+#, c-format
+msgid ""
+"Here local resource occupation is reduced to a minimum. No CUPS daemon is "
+"started or port opened, no software infrastructure for setting up local "
+"print queues is installed, so less memory and disk space is used. "
+msgstr ""
+
+#: printer/printerdrake.pm:3998
+#, c-format
+msgid ""
+"Disadvantage is that it is not possible to define local printers then and if "
+"the specified server is down it cannot be printed at all from this machine. "
+msgstr ""
+
+#: printer/printerdrake.pm:4000
+#, c-format
+msgid "How should CUPS be set up on your machine?"
+msgstr ""
+
+#: printer/printerdrake.pm:4004 printer/printerdrake.pm:4019
+#: printer/printerdrake.pm:4023 printer/printerdrake.pm:4029
+#, c-format
+msgid "Remote server, specify Name or IP here:"
+msgstr ""
+
+#: printer/printerdrake.pm:4018
+#, c-format
+msgid "Local CUPS printing system"
+msgstr "Локал CUPS босиб чиқариш тизими"
+
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Принтер спулерини танлаш"
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Қайси босиб чиқариш тизимини (спулер) ишлатмоқчисиз?"
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Принтерни (\"%s\") мослаш муваффақиятсиз тугади!"
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Foomatic дастури ўрнатилмоқда..."
 
-#: printer/printerdrake.pm:3818
+#: printer/printerdrake.pm:4124
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr ""
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr "Керак бўлган пакетни ўрнатиб бўлмади. %s'ни ишга тушириб бўлмайди!"
-
-#: printer/printerdrake.pm:4011
+#: printer/printerdrake.pm:4314
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -12005,197 +12464,161 @@ msgstr ""
 "андоза деб белгилаш, ёки у ҳақида маълумотни кўриш учун уни икки марта "
 "босинг."
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Мавжуд бўлган масофадаги ҳамма CUPS принтерларни кўрсатиш"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 "Принтерлар рўйхатини янгилаш (масофадаги ҳамма CUPS принтерларни кўрсатиш "
 "учун)"
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPS'ни мослаш"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr "Босиб чиқариш тизимини ўзгартириш"
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr "Оддий усул"
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
 #, c-format
 msgid "Expert Mode"
 msgstr "Эксперт усули"
 
-#: printer/printerdrake.pm:4343 printer/printerdrake.pm:4398
-#: printer/printerdrake.pm:4479 printer/printerdrake.pm:4489
+#: printer/printerdrake.pm:4632 printer/printerdrake.pm:4690
+#: printer/printerdrake.pm:4768 printer/printerdrake.pm:4777
 #, c-format
 msgid "Printer options"
 msgstr "Принтернинг параметрлари"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Принтернинг мосламаларини ўзгартириш"
 
-#: printer/printerdrake.pm:4381
+#: printer/printerdrake.pm:4670
 #, c-format
 msgid ""
-"Printer %s\n"
+"Printer %s%s\n"
 "What do you want to modify on this printer?"
 msgstr ""
-"Принтер %s\n"
+"Принтер %s%s\n"
 "Бу принтернинг нимасини ўзгартиришни истайсиз?"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, c-format
+msgid "This printer is disabled"
+msgstr "Принтер ўчирилган"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr "Бажариш!"
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
 msgstr "Принтерга уланишнинг тури"
 
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Принтернинг номи, таърифи, манзили"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Принтернинг ишлаб чиқарувчиси, модели, драйвери"
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Принтернинг ишлаб чиқарувчиси, модели"
 
-#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
+#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4772
 #, c-format
 msgid "Set this printer as the default"
 msgstr "Бу принтерни андоза деб белгилаш"
 
-#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490
+#: printer/printerdrake.pm:4697 printer/printerdrake.pm:4778
+#: printer/printerdrake.pm:4780
 #, c-format
-msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
-msgstr "Бу принтерни Star Office/OpenOffice.org/GIMP дастурларига қўшиш"
+msgid "Enable Printer"
+msgstr "Принтерни ёқиш"
 
-#: printer/printerdrake.pm:4403 printer/printerdrake.pm:4495
+#: printer/printerdrake.pm:4700 printer/printerdrake.pm:4783
+#: printer/printerdrake.pm:4785
 #, c-format
-msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
-msgstr "Бу принтерни Star Office/OpenOffice.org/GIMP дастурларидан олиб ташлаш"
+msgid "Disable Printer"
+msgstr "Принтерни ўчириш"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "Синов бетини босиб чиқариш"
 
-#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
+#: printer/printerdrake.pm:4702 printer/printerdrake.pm:4790
 #, c-format
 msgid "Learn how to use this printer"
 msgstr "Принтердан фойдаланишни ўрганиш"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
 msgstr "Принтерни олиб ташлаш"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Эски принтер (\"%s\") олиб ташланмоқда"
 
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "Star Office/OpenOffice.org/GIMP дастурларига принтер қўшилмоқда"
-
-#: printer/printerdrake.pm:4493
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Star Office/OpenOffice.org/GIMP дастурларига \"%s\" принтерни қўшиш "
-"муваффақиятли тугади."
-
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Star Office/OpenOffice.org/GIMP дастурларига \"%s\" принтерни қўшиш "
-"муваффақиятсиз тугади."
-
-#: printer/printerdrake.pm:4496
+#: printer/printerdrake.pm:4781
 #, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "Star Office/OpenOffice.org/GIMP дастурларидан принтер олиб ташланмоқда"
+msgid "Printer \"%s\" is now enabled."
+msgstr "Принтер \"%s\" ёқилди."
 
-#: printer/printerdrake.pm:4498
+#: printer/printerdrake.pm:4786
 #, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr ""
-"Star Office/OpenOffice.org/GIMP дастурларидан \"%s\" принтерни олиб ташлаш "
-"муваффақиятли тугади."
-
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Star Office/OpenOffice.org/GIMP дастурларидан \"%s\" принтерни олиб ташлаш "
-"муваффақиятсиз тугади."
+msgid "Printer \"%s\" is now disabled."
+msgstr "Принтер \"%s\" ўчирилди."
 
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Ростдан принтерни (\"%s\") олиб ташлашни истайсизми?"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Принтер (\"%s\") олиб ташланмоқда"
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
 msgstr "Андоза принтер"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "Принтер (\"%s\") андоза деб белгиланди."
 
-#: raid.pm:37
+#: raid.pm:36
 #, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
+msgid "Can't add a partition to _formatted_ RAID %s"
 msgstr ""
 
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr ""
-"mkraid буйруғи муваффақиятсиз тугади (балки raidtools дастури етишмаяпти?)."
-
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "mkraid буйруғи муваффақиятсиз тугади."
-
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "RAID'ни %d чи даражаси учун дискнинг етарли қисмлари мавжуд эмас\n"
@@ -12220,16 +12643,16 @@ msgstr ""
 msgid "Could not set permissions of firmware file %s!"
 msgstr ""
 
-#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69
-#: standalone/scannerdrake:77 standalone/scannerdrake:344
-#: standalone/scannerdrake:419 standalone/scannerdrake:463
-#: standalone/scannerdrake:467 standalone/scannerdrake:489
-#: standalone/scannerdrake:554
+#: scanner.pm:200 standalone/scannerdrake:66 standalone/scannerdrake:70
+#: standalone/scannerdrake:78 standalone/scannerdrake:340
+#: standalone/scannerdrake:415 standalone/scannerdrake:459
+#: standalone/scannerdrake:463 standalone/scannerdrake:485
+#: standalone/scannerdrake:550
 #, c-format
 msgid "Scannerdrake"
 msgstr "Scannerdrake"
 
-#: scanner.pm:201 standalone/scannerdrake:920
+#: scanner.pm:201 standalone/scannerdrake:916
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
 msgstr ""
@@ -12259,7 +12682,8 @@ msgstr ""
 msgid "Allow/Forbid autologin."
 msgstr "Авто-киришга рухсат этиш/этмаш."
 
-#: security/help.pm:19
+#. -PO: here "ALL" is a value in a pull-down menu; translate it the same as "ALL" is
+#: security/help.pm:21
 #, c-format
 msgid ""
 "If set to \"ALL\", /etc/issue and /etc/issue.net are allowed to exist.\n"
@@ -12269,22 +12693,22 @@ msgid ""
 "Else only /etc/issue is allowed."
 msgstr ""
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr "Консол орқали компьютерни ўчириб-ёқишга рухсат этиш/этмаш."
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, c-format
 msgid "Allow/Forbid remote root login."
 msgstr "Root масофадан киришига рухсат этиш/этмаш."
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, c-format
 msgid "Allow/Forbid direct root login."
 msgstr "Root тўғридан-тўғри киришига рухсат этиш/этмаш."
 
-#: security/help.pm:31
+#: security/help.pm:33
 #, c-format
 msgid ""
 "Allow/Forbid the list of users on the system on display managers (kdm and "
@@ -12293,7 +12717,16 @@ msgstr ""
 "Тизимнинг фойдаланувчилар рўйхатини дисплей бошқарувчилар (KDM ва GDM) "
 "кўрсатишга рухсат этиш/этмас."
 
-#: security/help.pm:33
+#: security/help.pm:35
+#, c-format
+msgid ""
+"Allow/forbid to export display when\n"
+"passing from the root account to the other users.\n"
+"\n"
+"See pam_xauth(8) for more details.'"
+msgstr ""
+
+#: security/help.pm:40
 #, c-format
 msgid ""
 "Allow/Forbid X connections:\n"
@@ -12305,14 +12738,15 @@ msgid ""
 "- NONE (no connection)."
 msgstr ""
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
 "to the X server from the network on the tcp port 6000 or not."
 msgstr ""
 
-#: security/help.pm:44
+#. -PO: here "ALL", "LOCAL" and "NONE" are values in a pull-down menu; translate them the same as they're
+#: security/help.pm:53
 #, c-format
 msgid ""
 "Authorize:\n"
@@ -12328,7 +12762,7 @@ msgid ""
 "(5))."
 msgstr ""
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -12341,7 +12775,7 @@ msgid ""
 "packages."
 msgstr ""
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -12350,80 +12784,85 @@ msgid ""
 "and crontab(1))."
 msgstr ""
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr ""
 
-#: security/help.pm:70
+#: security/help.pm:79
 #, c-format
 msgid ""
 "Enable/Disable name resolution spoofing protection.  If\n"
-"\"alert\" is true, also reports to syslog."
+"\"%s\" is true, also reports to syslog."
 msgstr ""
 
-#: security/help.pm:73
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "Хавфсизлик хабарномаси:"
+
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr ""
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr ""
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr ""
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr ""
 
-#: security/help.pm:81
+#: security/help.pm:90
 #, c-format
 msgid ""
 " Enabling su only from members of the wheel group or allow su from any user."
 msgstr ""
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr "Фойдаланувчиларни тасдиқлаш учун махфий сўздан фойдаланиш."
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
 msgstr ""
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr " Кундалик хавфсизлик текширувини ёқиш/ўчириш."
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr ""
 
-#: security/help.pm:91
+#: security/help.pm:100
 #, c-format
 msgid "Add the name as an exception to the handling of password aging by msec."
 msgstr ""
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr ""
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
@@ -12432,20 +12871,20 @@ msgstr ""
 "Махфий сўзнинг энг қисқа узунлигини, ундаги сонларнинг ва бош ҳарфларнинг "
 "энг кичик сонини аниқлаш."
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, c-format
 msgid "Set the root umask."
 msgstr ""
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr "агар \"ҳа\" бўлса, очиқ портларни текшириш"
 
-#: security/help.pm:101
+#: security/help.pm:110
 #, c-format
 msgid ""
-"if set to yes, check for :\n"
+"if set to yes, check for:\n"
 "\n"
 "- empty passwords,\n"
 "\n"
@@ -12454,104 +12893,104 @@ msgid ""
 "- for users with the 0 id other than root."
 msgstr ""
 
-#: security/help.pm:108
+#: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
 msgstr ""
 
-#: security/help.pm:109
+#: security/help.pm:118
 #, c-format
 msgid "if set to yes, check if the network devices are in promiscuous mode."
 msgstr ""
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr "агар \"ҳа\" бўлса, кундалик хавфсизлик текширишларини бажариш"
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr ""
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
 msgstr "агар \"ҳа\" бўлса, /etc/shadow файлидаги бўш махфий сўзларни текшириш"
 
-#: security/help.pm:113
+#: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
 msgstr ""
 
-#: security/help.pm:114
+#: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
 msgstr ""
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr ""
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr ""
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr "агар \"ҳа\" бўлса, chkrootkit текширувини бажариш"
 
-#: security/help.pm:118
+#: security/help.pm:127
 #, c-format
 msgid ""
 "if set, send the mail report to this email address else send it to root."
 msgstr ""
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr "агар \"ҳа\" бўлса, текширув натижасини хат орқали жўнатиш"
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
 msgstr ""
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
 msgstr ""
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr ""
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr ""
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr ""
 "Консолдан киритилган буйруқлар тарихининг ҳажмини аниқлаш. -1 чексизга тенг."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr ""
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
 msgstr ""
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, c-format
 msgid "Set the user umask."
 msgstr ""
@@ -12599,211 +13038,216 @@ msgstr ""
 
 #: security/l10n.pm:20
 #, c-format
+msgid "Export display when passing from root to the other users"
+msgstr ""
+
+#: security/l10n.pm:21
+#, c-format
 msgid "Allow X Window connections"
 msgstr "X Windows уланишларга рухсат этиш"
 
-#: security/l10n.pm:21
+#: security/l10n.pm:22
 #, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr ""
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr ""
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, c-format
 msgid "Chkconfig obey msec rules"
 msgstr ""
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
 msgstr ""
 
-#: security/l10n.pm:25
+#: security/l10n.pm:26
 #, c-format
 msgid "Syslog reports to console 12"
 msgstr ""
 
-#: security/l10n.pm:26
+#: security/l10n.pm:27
 #, c-format
 msgid "Name resolution spoofing protection"
 msgstr ""
 
-#: security/l10n.pm:27
+#: security/l10n.pm:28
 #, c-format
 msgid "Enable IP spoofing protection"
 msgstr ""
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
 msgstr ""
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
 msgstr ""
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
 msgstr ""
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
 msgstr ""
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
 msgstr "Фойдаланувчиларни тасдиқлаш учун махфий сўздан фойдаланиш"
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
 msgstr ""
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
 msgstr "Кундалик хавфсизлик текшируви"
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
 msgstr ""
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, c-format
 msgid "No password aging for"
 msgstr ""
 
-#: security/l10n.pm:37
+#: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
 msgstr ""
 
-#: security/l10n.pm:38
+#: security/l10n.pm:39
 #, c-format
 msgid "Password history length"
 msgstr "Махфий сўз тарихининг узунлиги"
 
-#: security/l10n.pm:39
+#: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
 msgstr ""
 "Махфий сўзнинг энг қисқа узунлиги, ундаги сонларнинг ва бош ҳарфларнинг сони"
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, c-format
 msgid "Root umask"
 msgstr ""
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
 msgstr "Консолда бажарилган буйруқлар тарихининг ҳажми"
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, c-format
 msgid "Shell timeout"
 msgstr "Консол учун таймаут"
 
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, c-format
 msgid "User umask"
 msgstr ""
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, c-format
 msgid "Check open ports"
 msgstr "Очиқ портларни текшириш"
 
-#: security/l10n.pm:45
+#: security/l10n.pm:46
 #, c-format
 msgid "Check for unsecured accounts"
 msgstr ""
 
-#: security/l10n.pm:46
+#: security/l10n.pm:47
 #, c-format
 msgid "Check permissions of files in the users' home"
 msgstr ""
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr ""
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr "Кундалик хавфсизлик текширишларини бажариш"
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr ""
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr "Бўш махфий сўзни /etc/shadow файлида текшириш"
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr "suid/sgid файлларнинг checksum'ини текшириш"
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr ""
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr ""
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr ""
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr "chkrootkit текширувларини бажариш"
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr ""
 
-#: security/l10n.pm:57
+#: security/l10n.pm:58
 #, c-format
 msgid "If set, send the mail report to this email address else send it to root"
 msgstr ""
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr "Текширув натижасини электрон хат орқали жўнатиш"
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr ""
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr ""
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr ""
@@ -12876,11 +13320,11 @@ msgid ""
 "connections from many clients. Note: if your machine is only a client on the "
 "Internet, you should choose a lower level."
 msgstr ""
-"Хавфсизликнинг бу даражасида системани сервер сифатида ишлатиш мумкин.\n"
+"Хавфсизликнинг бу даражасида тизимни сервер сифатида ишлатиш мумкин.\n"
 "Тизимни бир қанча клиентлар билан алоқа ўрната оладиган сервер сифатида "
-"ишлатиш учун хавфсизлик даражаси етарлича ёқори.\n"
+"ишлатиш учун хавфсизлик даражаси етарлича юқори.\n"
 "Изоҳ: агар компьютерингизни Интернет тармоғида клиент сифатида ишлатсангиз, "
-"пастроғ даражани танланг."
+"пастроқ даражани танланг."
 
 #: security/level.pm:50
 #, c-format
@@ -12888,7 +13332,7 @@ msgid ""
 "This is similar to the previous level, but the system is entirely closed and "
 "security features are at their maximum."
 msgstr ""
-"Бу даража олдинги даражага ўхшайди, аммо система умуман ёпиқ ва хавфсизлик\n"
+"Бу даража олдинги даражага ўхшайди, аммо тизим умуман ёпиқ ва хавфсизлик\n"
 "параметрлари энг юқори қийматларга эга."
 
 #: security/level.pm:55
@@ -13084,7 +13528,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
 
 #: services.pm:66
@@ -13157,7 +13601,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The rwho protocol lets remote users get a list of all of the users\n"
-"logged into a machine running the rwho daemon (similiar to finger)."
+"logged into a machine running the rwho daemon (similar to finger)."
 msgstr ""
 
 #: services.pm:87
@@ -13179,8 +13623,8 @@ msgstr "USB ускуналарингиз учун драйверларни юк�
 
 #: services.pm:91
 #, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "X шрифт серверини (XFree'ни ишга тушириш учун керак) ишга туширади."
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
+msgstr "X шрифт серверини (Xorg'ни ишга тушириш учун керак) ишга туширади."
 
 #: services.pm:117 services.pm:159
 #, c-format
@@ -13224,8 +13668,8 @@ msgstr "тўхтатилган"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
-msgstr "Хизматлар ва демонлар"
+msgid "Services and daemons"
+msgstr "Хизмат ва демонлар"
 
 #: services.pm:221
 #, c-format
@@ -13236,7 +13680,7 @@ msgstr ""
 "Узр, бу хизмат ҳақида\n"
 "қўшимча маълумот йўқ."
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "Маълумот"
@@ -13251,752 +13695,1207 @@ msgstr "Талаб қилинганда ишга тушириш"
 msgid "On boot"
 msgstr "Тизим юкланаётганда"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Start"
 msgstr "Ишга тушириш"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Stop"
 msgstr "Тўхтатиш"
 
-#: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
-#: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
+#: share/advertising/01.pl:13
 #, c-format
-msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-msgstr "<b>Mandrakelinux тизимини танлаганингиз билан табриклаймиз!</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>Mandrakelinux нима?</b>"
 
-#: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15
-#: share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
+#: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to the Open Source world!"
-msgstr "Open Source оламига марҳамат!"
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "<b>Mandrakelinux</b> тизимига марҳамат!"
 
-#: share/advertising/dis-01.pl:17
+#: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Your new Mandrakelinux operating system and its many applications is the "
-"result of collaborative efforts between MandrakeSoft developers and "
-"Mandrakelinux contributors throughout the world."
+"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"system, called the <b>operating system</b> (based on the Linux kernel) "
+"together with <b>a lot of applications</b> meeting every need you could even "
+"think of."
 msgstr ""
-"Mandrakelinux операцион тизими ва унинг кўплаб дастурлари MandrakeSoft "
+
+#: share/advertising/01.pl:19
+#, c-format
+msgid ""
+"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"is also one of the <b>most widely used</b> Linux distributions worldwide!"
+msgstr ""
+
+#: share/advertising/02.pl:13
+#, c-format
+msgid "<b>Open Source</b>"
+msgstr "<b>Open Source</b>"
+
+#: share/advertising/02.pl:15
+#, c-format
+msgid "Welcome to the <b>world of open source</b>!"
+msgstr "<b>Open Source</b> оламига марҳамат!"
+
+#: share/advertising/02.pl:17
+#, fuzzy, c-format
+msgid ""
+"Mandrakelinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"contributors."
+msgstr ""
+"Mandrakelinux операцион тизими ва унинг кўплаб дастурлари Mandrakesoft "
 "тузувчилари ва бутун олам бўйлаб ҳисса қўшувчилар ҳамкорликда бажарган иш "
 "натижасидир."
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/02.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
 msgstr ""
 "Ушбу маҳсулотни ишлаб чиқаришда ўз ҳиссасини қўшган барчага биз ўз "
-"миннатдорчилигимизни билдирамиз."
+"<b>миннатдорчилигимизни</b> билдирамиз."
 
-#: share/advertising/dis-02.pl:13
+#: share/advertising/03.pl:13
 #, c-format
-msgid "<b>Discovery</b>"
-msgstr "<b>Discovery</b>"
+msgid "<b>The GPL</b>"
+msgstr "<b>GPL</b>"
 
-#: share/advertising/dis-02.pl:15
+#: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Discovery is the easiest and most user-friendly Linux distribution. It "
-"includes a hand-picked selection of premium software for Office, Multimedia "
-"and Internet activities."
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
-#: share/advertising/dis-02.pl:17
+#: share/advertising/03.pl:17
 #, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
+msgid ""
+"The GPL is at the heart of the open source model; it grants everyone the "
+"<b>freedom</b> to use, study, distribute and improve the software any way "
+"they want, provided they make the results available."
 msgstr ""
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:19
 #, c-format
-msgid "<b>The KDE Choice</b>"
+msgid ""
+"The main benefit of this is that the number of developers is virtually "
+"<b>unlimited</b>, resulting in <b>very high quality</b> software."
 msgstr ""
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/04.pl:13
+#, c-format
+msgid "<b>Join the Community</b>"
+msgstr "<b>Бирлашмага қўшилинг</b>"
+
+#: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
+"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"developers. The role of such a community is very wide, ranging from bug "
+"reporting to the development of new applications. The community plays a "
+"<b>key role</b> in the Mandrakelinux world."
 msgstr ""
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/04.pl:17
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+msgid ""
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr "<b>Download</b> версия"
+
+#: share/advertising/05.pl:15
 #, c-format
 msgid ""
-"<b>WRITER</b> is a powerful word processor for creating all types of text "
-"documents. Documents may include images, diagrams and tables."
+"You are now installing <b>Mandrakelinux Download</b>. This is the free "
+"version that Mandrakesoft wants to keep <b>available to everyone</b>."
 msgstr ""
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
 msgstr ""
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/05.pl:18
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
 msgstr ""
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/05.pl:19
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 msgstr ""
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
+#: share/advertising/05.pl:21
 #, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "<b>Интернетда сайр қилинг</b>"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
+msgstr ""
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/06.pl:13
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
+msgid "<b>Discovery, Your First Linux Desktop</b>"
 msgstr ""
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/06.pl:15
+#, c-format
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgstr ""
+
+#: share/advertising/06.pl:17
 #, c-format
 msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
+"distribution. It includes a hand-picked selection of <b>premium software</b> "
+"for office, multimedia and Internet activities. Its menu is task-oriented, "
+"with a single application per task."
+msgstr ""
+
+#: share/advertising/07.pl:13
+#, c-format
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
 msgstr ""
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/07.pl:15
 #, c-format
-msgid "You can also:"
-msgstr "Ҳамда:"
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgstr ""
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/07.pl:17
 #, c-format
-msgid "\t- browse the Web"
-msgstr "\t- Интернетда сайр қилишингиз мумкин"
+msgid ""
+"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"includes <b>thousands of applications</b> - everything from the most popular "
+"to the most advanced."
+msgstr ""
 
-#: share/advertising/dis-06.pl:17
+#: share/advertising/08.pl:13
 #, c-format
-msgid "\t- chat"
-msgstr "\t- Интернет орқали суҳбат қилишингиз мумкин"
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
+msgstr ""
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/08.pl:15
 #, c-format
-msgid "\t- organize a video-conference"
-msgstr "\t- видео конференция ташкил қилишингиз мумкин"
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgstr ""
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/08.pl:17
 #, c-format
-msgid "\t- create your own Web site"
-msgstr "\t- ўзингизни веб-сайтингизни яратишингиз мумкин"
+msgid ""
+"PowerPack+ is a <b>full-featured Linux solution</b> for small to medium-"
+"sized <b>networks</b>. PowerPack+ includes thousands of <b>desktop "
+"applications</b> and a comprehensive selection of world-class <b>server "
+"applications</b>."
+msgstr ""
 
-#: share/advertising/dis-06.pl:20
+#: share/advertising/09.pl:13
 #, c-format
-msgid "\t- ..."
-msgstr "\t- ва ҳоказо"
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "<b>Mandrakesoft маҳсулотлари</b>"
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/09.pl:15
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
+msgid ""
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
 msgstr ""
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/09.pl:17
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr "Аудио компакт-дискларни <b>KsCD</b> билан тингланг."
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr ""
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/09.pl:18
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr "<b>Totem</b> билан мусиқа тингланг ва видео томоша қилинг."
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr ""
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/09.pl:19
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
 msgstr ""
-"Расм ва суратларни <b>GIMP</b> ва <b>GQview</b> билан томоша қилинг ва "
-"таҳрирланг!"
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/09.pl:20
 #, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "<b>Mandrake бошқарув маркази</b>"
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
+msgstr ""
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
+"making the most of your 64-bit processor."
 msgstr ""
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/10.pl:13
 #, c-format
-msgid ""
-"You will immediately appreciate this collection of handy utilities for "
-"easily configuring hardware devices, defining mount points, setting up "
-"Network and Internet, adjusting the security level of your computer, and "
-"just about everything related to the system."
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
 msgstr ""
 
-#: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
-#: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
+#: share/advertising/10.pl:15
 #, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "<b>MandrakeStore</b>"
+msgid ""
+"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"<b>on any computer</b> and without any need to actually install it:"
+msgstr ""
 
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/10.pl:16
 #, c-format
 msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
 msgstr ""
 
-#: share/advertising/dis-09.pl:17 share/advertising/dwd-06.pl:19
-#: share/advertising/ppp-09.pl:17 share/advertising/pwp-08.pl:17
+#: share/advertising/10.pl:17
 #, c-format
-msgid "Stop by today at <b>www.mandrakestore.com</b>"
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
-#: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
-#: share/advertising/pwp-09.pl:13
+#: share/advertising/11.pl:13
 #, c-format
-msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "<b>MandrakeClub</b> аъзоси бўлинг!"
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr ""
 
-#: share/advertising/dis-10.pl:15 share/advertising/dwd-07.pl:15
-#: share/advertising/ppp-10.pl:15 share/advertising/pwp-09.pl:15
+#: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Take advantage of valuable benefits, products and services by joining "
-"MandrakeClub, such as:"
+"Below are the Mandrakesoft products designed to meet the <b>professional "
+"needs</b>:"
 msgstr ""
 
-#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
-#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
+#: share/advertising/11.pl:16
 #, c-format
-msgid "\t- Full access to commercial applications"
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
 msgstr ""
 
-#: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
-#: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
+#: share/advertising/11.pl:17
 #, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
 msgstr ""
 
-#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
-#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
+#: share/advertising/11.pl:18
 #, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
-msgstr "\t- Mandrakelinux тизимига қайси дастурларни қўшиш учун овоз бериш"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgstr ""
 
-#: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
-#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
+#: share/advertising/12.pl:13
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
+msgid "<b>The KDE Choice</b>"
 msgstr ""
 
-#: share/advertising/dis-10.pl:20 share/advertising/dwd-07.pl:20
-#: share/advertising/ppp-04.pl:21 share/advertising/ppp-06.pl:19
-#: share/advertising/ppp-10.pl:21 share/advertising/pwp-04.pl:21
-#: share/advertising/pwp-09.pl:20
+#: share/advertising/12.pl:15
 #, c-format
-msgid "\t- Plus much more"
+msgid ""
+"With your Discovery, you will be introduced to <b>KDE</b>, the most advanced "
+"and user-friendly <b>graphical desktop environment</b> available."
 msgstr ""
 
-#: share/advertising/dis-10.pl:22 share/advertising/dwd-07.pl:22
-#: share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
+#: share/advertising/12.pl:17
 #, c-format
-msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
-msgstr "Кўпроқ маълумот учун <b>www.mandrakeclub.com</b> сайтига қаранг."
+msgid ""
+"KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you "
+"won't ever think of running another operating system!"
+msgstr ""
 
-#: share/advertising/dis-11.pl:13
+#: share/advertising/12.pl:19
 #, c-format
-msgid "Do you require assistance?"
-msgstr "Сизга ёрдам керакми?"
+msgid ""
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
+msgstr ""
 
-#: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
-#: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
+#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr "<b>MandrakeExpert</b> - техник ёрдам учун асосий манба."
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "<b>Сизга мос келган график иш столини танланг</b>"
 
-#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
-#: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#: share/advertising/13-a.pl:15
 #, c-format
 msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.com</b>"
+"With PowerPack, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
-"Агар Linux'га доир саволларингиз бўлса, <b>www.mandrakeexpert.com</b> сайти "
-"орқали MandrakeExpert'га ёзилинг."
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the Open Source Model and fully respects the "
-"General Public License. This new release is the result of collaboration "
-"between MandrakeSoft's team of developers and the worldwide community of "
-"Mandrakelinux contributors."
+"KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical "
+"desktop environment available. It includes a lot of integrated applications."
 msgstr ""
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
-msgstr "<b>Mandrakelinux бирлашмасига қўшилинг!</b>"
+msgid ""
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
+msgstr ""
 
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/13-b.pl:15
 #, c-format
 msgid ""
-"If you would like to get involved, please subscribe to the \"Cooker\" "
-"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+"With PowerPack+, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+msgstr ""
+
+#: share/advertising/14.pl:13
+#, c-format
+msgid "<b>OpenOffice.org</b>"
+msgstr "<b>OpenOffice.org</b>"
+
+#: share/advertising/14.pl:15
+#, c-format
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
 msgstr ""
-"Агар сиз ҳам ўз ҳиссангизни қўшмоқчи бўлсангиз, илтимос электрон мактуб "
-"орқали \"Cooker\" муҳокамаларга <b>mandrake-linux.com/cooker</b> сайти "
-"орқали қўшилинг"
 
-#: share/advertising/dwd-02.pl:17
+#: share/advertising/14.pl:17
 #, c-format
 msgid ""
-"To learn more about our dynamic community, please visit <b>www.mandrake-"
-"linux.com</b>!"
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
-"Бизнинг бирлашма ҳақида кўпроқ маълумот учун <b>www.mandrake-linux.com</b> "
-"сайтига қаранг!"
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/14.pl:19
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mandrakelinux нима?</b>"
+msgid ""
+"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
+"documents such as Word, Excel and PowerPoint® files."
+msgstr ""
 
-#: share/advertising/dwd-03.pl:15
+#: share/advertising/15.pl:13
+#, c-format
+msgid "<b>Kontact</b>"
+msgstr "<b>Kontact</b>"
+
+#: share/advertising/15.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrakelinux is one of "
-"the most widely used Linux distributions worldwide!"
+"Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
 msgstr ""
 
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/15.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
-"latest versions of the most popular Open Source applications."
+"More than just a full-featured <b>e-mail client</b>, Kontact also includes "
+"an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
+"b>!"
 msgstr ""
 
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/15.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is widely known as the most user-friendly and the easiest to "
-"install and easy to use Linux distribution."
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
+msgstr ""
+
+#: share/advertising/16.pl:13
+#, c-format
+msgid "<b>Surf the Internet</b>"
+msgstr "<b>Интернетда сайр қилинг</b>"
+
+#: share/advertising/16.pl:15
+#, c-format
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
+msgstr ""
+
+#: share/advertising/16.pl:16
+#, c-format
+msgid "\t* Browse the <b>Web</b> with Konqueror."
+msgstr "\t* <b>Konqueror</b> ёрдамида Интернетда сайр қилинг"
+
+#: share/advertising/16.pl:17
+#, c-format
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
+msgstr ""
+"\t* <b>Kopete</b> ёрдамида ўртоқларингиз билан Интернет орқали гаплашинг"
+
+#: share/advertising/16.pl:18
+#, c-format
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "\t* <b>KBear</b> ёрдамида Интернетдан файлларни ёзиб олинг"
+
+#: share/advertising/16.pl:19 share/advertising/17.pl:19
+#: share/advertising/18.pl:22
+#, c-format
+msgid "\t* ..."
+msgstr "\t* ва ҳоказо"
+
+#: share/advertising/17.pl:13
+#, c-format
+msgid "<b>Enjoy our Multimedia Features</b>"
+msgstr ""
+
+#: share/advertising/17.pl:15
+#, c-format
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
 msgstr ""
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/17.pl:16
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/17.pl:17
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t* Listen to your <b>music files</b> with amaroK."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr "\t* Расм ва суратларни <b>GIMP</b> билан таҳрирланг"
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr ""
+
+#: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
+msgstr ""
+"Mandrakelinux менюсидан <b>барча вазифалар</b> учун <b>қулай дастурларни</b> "
+"топса бўлади:"
+
+#: share/advertising/18.pl:16
+#, c-format
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
 msgstr ""
+"\t* Ҳужжатларингизни <b>OpenOffice.org</b> ёрдамида яратинг ва таҳрирланг"
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/18.pl:17
 #, c-format
 msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/18.pl:18
+#, c-format
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
+msgstr "\t* <b>Mozilla</b> ва <b>Konqueror</b> ёрдамида интернетда сайр қилинг"
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
+msgstr "\t* Онлайн сухбатда <b>Kopete</b> ёрдамида қатнашинг"
+
+#: share/advertising/18.pl:20
 #, c-format
 msgid ""
-"\t- If you require a full-featured Linux solution customized for small to "
-"medium-sized networks, choose <b>PowerPack+</b>"
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
 msgstr ""
+"\t* <b>Аудио компакт-диск</b> ва <b>аудио файлларни</b> тингланг, "
+"<b>видеони</b> томоша қилинг"
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/18.pl:21
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr "\t* <b>GIMP</b> ёрдамида расм яратинг ва таҳрирланг"
+
+#: share/advertising/19.pl:13
+#, c-format
+msgid "<b>Development Environments</b>"
+msgstr "<b>Тузиш воситалари</b>"
+
+#: share/advertising/19.pl:15 share/advertising/22.pl:15
+#, c-format
+msgid ""
+"PowerPack gives you the best tools to <b>develop</b> your own applications."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/19.pl:17
 #, c-format
 msgid ""
-"<b>Corporate Server</b>: the ideal solution for entreprises. It is a "
-"complete \"all-in-one\" solution that includes everything needed to rapidly "
-"deploy world-class Linux server applications."
+"You will enjoy the powerful, integrated development environment from KDE, "
+"<b>KDevelop</b>, which will let you program in a lot of languages."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/19.pl:19
 #, c-format
 msgid ""
-"<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to "
-"provide multi-VPN as well as multi-DMZ functionalities. It is the perfect "
-"high performance security solution."
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/20.pl:13
+#, c-format
+msgid "<b>Development Editors</b>"
+msgstr "<b>Тузиш учун таҳрирчилар</b>"
+
+#: share/advertising/20.pl:15
+#, c-format
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
+msgstr ""
+
+#: share/advertising/20.pl:16
+#, c-format
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
+msgstr ""
+
+#: share/advertising/20.pl:17
 #, c-format
 msgid ""
-"<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined "
-"with the stability and easy-of-use of the world-famous Mandrakelinux "
-"distribution. A unique blend for incomparable HPC performance."
+"\t* <b>XEmacs</b>: another open source text editor and application "
+"development system."
 msgstr ""
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/20.pl:18
 #, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"\t* <b>Vim</b>: an advanced text editor with more features than standard Vi."
 msgstr ""
+"\t* <b>Vim</b>: Андоза Vi таҳрирчига қараганда кўпроқ имкониятларга эга "
+"кенгайтирилган матн таҳрирчи"
 
-#: share/advertising/dwd-06.pl:17
+#: share/advertising/21.pl:13
+#, c-format
+msgid "<b>Development Languages</b>"
+msgstr "<b>Дастурлаш тиллари</b>"
+
+#: share/advertising/21.pl:15
 #, c-format
 msgid ""
-"Find out also support incidents if you have any problems, from standard to "
-"professional support, from 1 to 50 incidents, take the one which meets "
-"perfectly your needs!"
+"With all these <b>powerful tools</b>, you will be able to write applications "
+"in <b>dozens of programming languages</b>:"
+msgstr ""
+
+#: share/advertising/21.pl:16
+#, c-format
+msgid "\t* The famous <b>C language</b>."
+msgstr ""
+
+#: share/advertising/21.pl:17
+#, c-format
+msgid "\t* Object oriented languages:"
 msgstr ""
 
-#: share/advertising/dwd-07.pl:13
+#: share/advertising/21.pl:18
 #, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>MandrakeClub аъзоси бўлинг!</b>"
+msgid "\t\t* <b>C++</b>"
+msgstr "\t\t* <b>C++</b>"
 
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
+#: share/advertising/21.pl:19
 #, c-format
-msgid "<b>Do you require assistance?</b>"
-msgstr "<b>Сизга ёрдам керакми?</b>"
+msgid "\t\t* <b>Java™</b>"
+msgstr "\t\t* <b>Java™</b>"
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/21.pl:20
+#, fuzzy, c-format
+msgid "\t* Scripting languages:"
+msgstr "Босиб чиқариш бошқарувчиси"
+
+#: share/advertising/21.pl:21
+#, c-format
+msgid "\t\t* <b>Perl</b>"
+msgstr "\t\t* <b>Perl</b>"
+
+#: share/advertising/21.pl:22
 #, c-format
-msgid "<b>Note</b>"
-msgstr "<b>Изоҳ</b>"
+msgid "\t\t* <b>Python</b>"
+msgstr "\t\t* <b>Python</b>"
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/21.pl:23 share/advertising/28.pl:22
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
-msgstr "Бу Mandrakelinux <b>Download</b> версияси."
+msgid "\t* And many more."
+msgstr "\t* Ва бошқалар"
+
+#: share/advertising/22.pl:13
+#, c-format
+msgid "<b>Development Tools</b>"
+msgstr "<b>Тузиш воситалари</b>"
 
-#: share/advertising/dwd-09.pl:20
+#: share/advertising/22.pl:17
 #, c-format
 msgid ""
-"The free download version does not include commercial software, and "
-"therefore may not work with certain modems (such as some ADSL and RTC) and "
-"video cards (such as ATI® and NVIDIA®)."
+"With the powerful integrated development environment <b>KDevelop</b> and the "
+"leading Linux compiler <b>GCC</b>, you will be able to create applications "
+"in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
 msgstr ""
 
-#: share/advertising/ppp-01.pl:17
+#: share/advertising/23.pl:13
+#, fuzzy, c-format
+msgid "<b>Groupware Server</b>"
+msgstr "<b>Серверлар</b>"
+
+#: share/advertising/23.pl:15
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution and its many applications are the result "
-"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
-"contributors throughout the world."
+"PowerPack+ will give you access to <b>Kolab</b>, a full-featured "
+"<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
+"allow you to:"
+msgstr ""
+
+#: share/advertising/23.pl:16
+#, c-format
+msgid "\t* Send and receive your <b>e-mails</b>."
+msgstr "\t* Электрон мактубларни жўнатиш ва қабул қилиш"
+
+#: share/advertising/23.pl:17
+#, c-format
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
+msgstr ""
+
+#: share/advertising/23.pl:18
+#, c-format
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
 msgstr ""
-"Mandrakelinux операцион тизими ва унинг кўплаб дастурлари MandrakeSoft "
-"тузувчилари ва бутун олам бўйлаб ҳисса қўшувчилар ҳамкорликда бажарган иш "
-"натижасидир."
 
-#: share/advertising/ppp-02.pl:13
+#: share/advertising/24.pl:13
 #, c-format
-msgid "<b>PowerPack+</b>"
-msgstr "<b>PowerPack+</b>"
+msgid "<b>Servers</b>"
+msgstr "<b>Серверлар</b>"
 
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/24.pl:15
 #, c-format
 msgid ""
-"PowerPack+ is a full-featured Linux solution for small to medium-sized "
-"networks. PowerPack+ increases the value of the standard PowerPack by adding "
-"a comprehensive selection of world-class server applications."
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/24.pl:16
 #, c-format
 msgid ""
-"It is the only Mandrakelinux product that includes the groupware solution."
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
 msgstr ""
+"\t* <b>Samba</b>: Microsoft® Windows® клиентлари учун файл ва босиб чиқариш "
+"хизматлари"
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/24.pl:17
 #, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "<b>График иш столингизни танланг!</b>"
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "\t* <b>Apache</b>: Энг кенг ишлатиладиган веб-сервер"
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/24.pl:18
 #, c-format
 msgid ""
-"When you log into your Mandrakelinux system for the first time, you can "
-"choose between several popular graphical desktops environments, including: "
-"KDE, GNOME, WindowMaker, IceWM, and others."
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
 msgstr ""
+"\t* <b>MySQL</b> ва <b>PostgreSQL</b>: Дунёдаги энг оммабоп Open Source "
+"маълумот базаси"
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/24.pl:19
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
 msgstr ""
-"Mandrakelinux менюсида барча вазифалар учун қулай дастурларни топса бўлади:"
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/24.pl:20
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
+msgid ""
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
 msgstr ""
-"\t- Ҳужжатларингизни <b>OpenOffice.org</b> ёрдамида яратинг ва таҳрирланг"
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/24.pl:21
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/25.pl:13
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr "\t- <b>Mozilla</b> ва <b>Konqueror</b> ёрдамида интернетда сайр қилинг"
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "<b>Mandrakelinux бошқарув маркази</b>"
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/25.pl:15
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
-msgstr "\t- Онлайн сухбатда <b>Kopete</b> ёрдамида қатнашинг"
+msgid ""
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
+msgstr ""
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/25.pl:17
 #, c-format
 msgid ""
-"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
+"You will immediately appreciate this collection of <b>more than 60</b> handy "
+"utilities for <b>easily configuring your system</b>: hardware devices, mount "
+"points, network and Internet, security level of your computer, etc."
 msgstr ""
-"\t- Аудио компакт-диск ва аудио файлларни <b>KsCD</b> ва <b>Totem</b> билан "
-"тингланг"
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/26.pl:13
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr "\t- Расм ва суратларни <b>GIMP</b> билан таҳрирланг"
+msgid "<b>The Open Source Model</b>"
+msgstr ""
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/26.pl:15
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"Like all computer programming, open source software <b>requires time and "
+"people</b> for development. In order to respect the open source philosophy, "
+"Mandrakesoft sells added value products and services to <b>keep improving "
+"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"our products or services!"
 msgstr ""
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/27.pl:13
+#, c-format
+msgid "<b>Online Store</b>"
+msgstr "<b>Интернет дўкон</b>"
+
+#: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/27.pl:17
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
+msgid "There you can find all our products, services and third-party products."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/27.pl:19
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
+msgid ""
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/27.pl:21
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
 msgstr ""
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/28.pl:13
+#, c-format
+msgid "<b>Mandrakeclub</b>"
+msgstr "<b>Mandrakeclub</b>"
+
+#: share/advertising/28.pl:15
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: open source text editor and application development system"
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
 msgstr ""
-"\t- <b>Vim</b>: Андоза Vi таҳрирчига қараганда кўпроқ имкониятларга эга "
-"кенгайтирилган матн таҳрирчи"
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/28.pl:18
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
+msgid ""
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/28.pl:19
 #, c-format
-msgid "It includes both server and client features for:"
+msgid ""
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:16
-#, c-format
-msgid "\t- Sending and receiving emails"
-msgstr "\t- Электрон мактубларни жўнатиш ва қабул қилиш"
+#: share/advertising/28.pl:20
+#, fuzzy, c-format
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr "\t* Онлайн сухбатда <b>Kopete</b> ёрдамида қатнашинг"
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:21
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/29.pl:13
 #, c-format
-msgid "\t- Address Book (server and client)"
-msgstr "\t- Манзиллар дафтари (сервер ва клиент)"
+msgid "<b>Mandrakeonline</b>"
+msgstr "<b>Mandrakeonline</b>"
 
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"Empower your business network with <b>premier server solutions</b> including:"
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
 msgstr ""
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/29.pl:17
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
+msgid ""
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
 msgstr ""
-"\t- <b>Samba</b>: MS-Windows клиентлари учун файл ва босиб чиқариш хизматлари"
 
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "\t- <b>Apache</b>: Энг кенг ишлатиладиган веб-сервери"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
+msgstr ""
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/29.pl:19
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr "\t- <b>MySQL</b>: Дунёдаги енг оммабоп Open Source маълумот базаси"
+msgid ""
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
+msgstr ""
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:20
 #, c-format
-msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
+msgid "\t* Flexible <b>scheduled</b> updates."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/30.pl:13
 #, c-format
-msgid "\t- And others"
-msgstr "\t- Ва бошқалар"
+msgid "<b>Mandrakeexpert</b>"
+msgstr "<b>Mandrakeexpert</b>"
 
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Mandrakelinux операцион тизими ва унинг кўплаб дастурлари MandrakeSoft "
-"тузувчилари ва бутун олам бўйлаб ҳисса қўшувчилар ҳамкорликда бажарган иш "
-"натижасидир."
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
 msgstr ""
-"Охирги версияни ишлаб чиқишда қатнашган барчага ўз миннатдорчилигимизни "
-"билдирамиз"
 
-#: share/advertising/pwp-02.pl:13
+#: share/advertising/30.pl:19
 #, c-format
-msgid "<b>PowerPack</b>"
-msgstr "<b>PowerPack</b>"
+msgid ""
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
+msgstr ""
 
-#: share/advertising/pwp-02.pl:15
+#: share/compssUsers.pl:25
+#, c-format
+msgid "Office Workstation"
+msgstr "Идора станцияси"
+
+#: share/compssUsers.pl:27
 #, c-format
 msgid ""
-"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
-"being the easiest and the most user-friendly Linux distribution, PowerPack "
-"includes thousands of applications - everything from the most popular to the "
-"most technical."
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
+"Идора учун дастурлар: матн процессорлари (OpenOffice.org Writer, Kword), "
+"электрон жадваллар (OpenOffice.org Calc, Kspread), PDF кўрувчилар ва ҳоказо"
 
-#: share/advertising/pwp-04.pl:13
+#: share/compssUsers.pl:28
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
-"Mandrakelinux менюсида барча вазифалар учун қулай дастурларни топса бўлади:"
+"Идора учун дастурлар: матн процессорлари (kword, abiword), электрон "
+"жадваллар (kspread, gnumeric), PDF кўрувчилар ва ҳоказо"
+
+#: share/compssUsers.pl:33
+#, c-format
+msgid "Game station"
+msgstr "Ўйин станцияси"
+
+#: share/compssUsers.pl:34
+#, c-format
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Овунчоқ дастурлар: аркада, стол ўйинлари, стратегия ва ҳоказо"
+
+#: share/compssUsers.pl:37
+#, c-format
+msgid "Multimedia station"
+msgstr "Мултимедиа станцияси"
+
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr "Аудио ва видеони ўйнаш/таҳрирлаш учун дастурлар"
 
-#: share/advertising/pwp-04.pl:16
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "Интернет станцияси"
+
+#: share/compssUsers.pl:44
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
 msgstr ""
+"Хат-хабар, янгиликларни ўқиш ва жўнатиш (mutt, tin..) ва Интернетда сайр "
+"қилиш учун воситалар тўплами"
+
+#: share/compssUsers.pl:49
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Тармоқдаги компьютер (клиент)"
+
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "Турли протоколлар, шу жумлада SSH, учун клиентлар"
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:54
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
-msgstr "\t- <b>Mozilla</b> ва <b>Konqueror</b> ёрдамида интернетда сайр қилинг"
+msgid "Configuration"
+msgstr "Мослаш"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "Компьютерни мослашни енгилаштириш учун воситалар"
+
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Консол воситалари"
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "Таҳрирчилар, консоллар, файл воситалари, терминаллар"
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
+msgid "C and C++ development libraries, programs and include files"
 msgstr ""
-"\t- Аудио компакт-диск ва аудио файлларни <b>KsCD</b> ва <b>Totem</b> билан "
-"тингланг"
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
 #, c-format
-msgid "<b>Development tools</b>"
-msgstr "<b>Тузиш воситалари</b>"
+msgid "Documentation"
+msgstr "Қўлланмалар"
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
 #, c-format
-msgid ""
-"PowerPack includes everything needed for developing and creating your own "
-"software, including:"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux ва эркин дастурлар ҳақида китоблар ва Howto'лар"
+
+#: share/compssUsers.pl:74 share/compssUsers.pl:173
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+#: share/compssUsers.pl:75 share/compssUsers.pl:174
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:85
+#, c-format
+msgid "Apache"
+msgstr "Apache"
+
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "Гуруҳ"
+
+#: share/compssUsers.pl:89
+#, c-format
+msgid "Kolab Server"
+msgstr "Kolab сервери"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "Файервол/Рутер"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "Интернет гейтвэйи"
+
+#: share/compssUsers.pl:96
+#, c-format
+msgid "Mail/News"
+msgstr "Хат-хабар/Янгиликлар"
+
+#: share/compssUsers.pl:97
+#, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix хат-хабар сервери, Inn янгиликлар сервери"
+
+#: share/compssUsers.pl:100
+#, c-format
+msgid "Directory Server"
+msgstr "Директория сервери"
+
+#: share/compssUsers.pl:104
+#, c-format
+msgid "FTP Server"
+msgstr "FTP сервери"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
+msgstr "ProFTPd"
+
+#: share/compssUsers.pl:108
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: share/compssUsers.pl:109
+#, fuzzy, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "DNS сервери"
+
+#: share/compssUsers.pl:112
+#, fuzzy, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Босиб чиқариш сервери"
+
+#: share/compssUsers.pl:113
+#, c-format
+msgid "NFS Server, Samba server"
+msgstr "NFS сервери, Samba сервери"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
 #, c-format
-msgid "And of course the editors!"
-msgstr "Ва албатта таҳрирчилар!"
+msgid "Database"
+msgstr "Маълумот базаси"
+
+#: share/compssUsers.pl:117
+#, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "PostgreSQL ва MySQL маълумот базаси"
+
+#: share/compssUsers.pl:121
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: share/compssUsers.pl:122
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+#: share/compssUsers.pl:125
+#, c-format
+msgid "Mail"
+msgstr "Хат-хабар"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix хат-хабар сервери"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL ёки MySQL маълумот базаси"
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Тармоқдаги компьютер (сервер)"
+
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS сервери, SMB сервери, Proxy сервери, SSH сервери"
+
+#: share/compssUsers.pl:146
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE станцияси"
+
+#: share/compssUsers.pl:147
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: another open source text editor and application "
-"development system"
-msgstr ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE - воситалар тўплами билан бирга асосий график муҳит"
 
-#: share/advertising/pwp-06.pl:18
+#: share/compssUsers.pl:151
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME станцияси"
+
+#: share/compssUsers.pl:152
 #, c-format
 msgid ""
-"\t- <b>Vim</b>: an advanced text editor with more features than standard Vi"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
 msgstr ""
-"\t- <b>Vim</b>: Андоза Vi таҳрирчига қараганда кўпроқ имкониятларга эга "
-"кенгайтирилган матн таҳрирчи"
+"Фойдаланувчилар учун қулай дастурлар ва иш столи воситаларидан иборат график "
+"муҳит"
+
+#: share/compssUsers.pl:155
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Бошқа график иш столлари"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ва ҳоказо"
+
+#: share/compssUsers.pl:179
+#, c-format
+msgid "Utilities"
+msgstr "Воситалар"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "SSH сервери"
+
+#: share/compssUsers.pl:186
+#, c-format
+msgid "Webmin"
+msgstr "Webmin"
+
+#: share/compssUsers.pl:187
+#, fuzzy, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Терминал серверини мослаш"
+
+#: share/compssUsers.pl:191
+#, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Тармоқ воситалари/Назорат қилиш"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
+msgstr ""
+
+#: share/compssUsers.pl:196
+#, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "Mandrakesoft ёрдамчилари"
+
+#: share/compssUsers.pl:197
+#, c-format
+msgid "Wizards to configure server"
+msgstr "Серверни мослаш учун ёрдамчилар"
 
 #: standalone.pm:21
 #, c-format
@@ -14049,8 +14948,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
+"  --report          - program should be one of mandrakelinux tools\n"
+"  --incident        - program should be one of mandrakelinux tools"
 msgstr ""
 
 #: standalone.pm:63
@@ -14073,7 +14972,7 @@ msgid ""
 "OPTIONS:\n"
 "--windows_import : import from all available windows partitions.\n"
 "--xls_fonts      : show all fonts that already exist from xls\n"
-"--install        : accept any font file and any directry.\n"
+"--install        : accept any font file and any directory.\n"
 "--uninstall      : uninstall any font or any directory of font.\n"
 "--replace        : replace all font if already exist\n"
 "--application    : 0 none application.\n"
@@ -14086,7 +14985,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
+"Mandrakelinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -14156,7 +15055,7 @@ msgid ""
 "       XFdrake resolution"
 msgstr ""
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -14167,106 +15066,100 @@ msgstr ""
 "Фойдаланиш: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
 "testing] [-v|--version] "
 
-#: standalone/XFdrake:87
+#: standalone/XFdrake:85
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Илтимос бу ердан чиқинг ва Ctrl-Alt-BackSpace тугмаларни босинг"
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
-msgstr "Ўзгаришлар тўлиқ қўлланилиши учун системага бошқадан киришингиз керак"
+msgstr "Ўзгаришлар тўлиқ қўлланилиши учун тизимга бошқадан киришингиз керак"
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Терминал серверисиз фойдасиз"
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s фойдаланувчини талаб қилади...\n"
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
 "0/1 for Local Config...\n"
 msgstr ""
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s компьютернинг номини талаб қилади...\n"
 
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "Ок"
-
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "Терминал серверини мослаш"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
 msgstr "Серверни ёқиш"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
 msgstr "Серверни ўчириш"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
 msgstr "Серверни ишга тушириш"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
 msgstr "Серверни тўхтатиш"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr ""
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr ""
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
 msgstr "Фойдаланувчиларни қўшиш/ўчириш"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Клиентларни қўшиш/ўчириш"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "Дастлабки кириш ёрдамчиси"
 
-#: standalone/drakTermServ:340 standalone/drakTermServ:341
+#: standalone/drakTermServ:315 standalone/drakTermServ:316
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr ""
 
-#: standalone/drakTermServ:347
+#: standalone/drakTermServ:322
 #, c-format
 msgid ""
 "\n"
 " This wizard routine will:\n"
 " \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-"\t2) Setup dhcp.\n"
+"\t2) Setup DHCP.\n"
 "\t\n"
 "After doing these steps, the wizard will:\n"
 "\t\n"
@@ -14283,22 +15176,22 @@ msgid ""
 "    f) If it's thin clients, ask if you want to restart KDM.\n"
 msgstr ""
 
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:367
 #, c-format
 msgid "Cancel Wizard"
 msgstr "Ёрдамчини бекор қилиш"
 
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr ""
 
-#: standalone/drakTermServ:432
+#: standalone/drakTermServ:407
 #, c-format
 msgid "Use thin clients."
 msgstr ""
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -14307,45 +15200,45 @@ msgid ""
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr ""
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr ""
 
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742
 #, c-format
 msgid "This will take a few minutes."
 msgstr "Бу бир неча минут давом этади."
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
 #, c-format
 msgid "Done!"
 msgstr "Тайёр!"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 
-#: standalone/drakTermServ:484
+#: standalone/drakTermServ:458
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
 
-#: standalone/drakTermServ:519
+#: standalone/drakTermServ:493
 #, c-format
 msgid "Terminal Server Overview"
 msgstr ""
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -14361,7 +15254,7 @@ msgid ""
 "one full kernel."
 msgstr ""
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -14381,7 +15274,7 @@ msgid ""
 "like:"
 msgstr ""
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -14392,14 +15285,14 @@ msgid ""
 "\t\t\t\n"
 "        Note: The '#type' entry is only used by drakTermServ.  Clients can "
 "either be 'thin'\n"
-"        or 'fat'.  Thin clients run most software on the server via xdmcp, "
+"        or 'fat'.  Thin clients run most software on the server via XDMCP, "
 "while fat clients run \n"
 "        most software on the client machine. A special inittab, %s is\n"
 "        written for thin clients. System config files xdm-config, kdmrc, and "
 "gdm.conf are \n"
-"        modified if thin clients are used, to enable xdmcp. Since there are "
+"        modified if thin clients are used, to enable XDMCP. Since there are "
 "security issues in \n"
-"        using xdmcp, hosts.deny and hosts.allow are modified to limit access "
+"        using XDMCP, hosts.deny and hosts.allow are modified to limit access "
 "to the local\n"
 "        subnet.\n"
 "\t\t\t\n"
@@ -14420,7 +15313,7 @@ msgid ""
 "clients."
 msgstr ""
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -14438,7 +15331,7 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -14449,7 +15342,7 @@ msgid ""
 "file."
 msgstr ""
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -14460,7 +15353,7 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -14480,7 +15373,7 @@ msgid ""
 "machine is configured."
 msgstr ""
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -14490,7 +15383,7 @@ msgid ""
 "the boot image to \n"
 "        \teach diskless client.\n"
 "\n"
-"        \tA typical tftp configuration file looks like:\n"
+"        \tA typical TFTP configuration file looks like:\n"
 "        \t\t\n"
 "        \tservice tftp\n"
 "\t\t\t{\n"
@@ -14510,13 +15403,13 @@ msgid ""
 "        \tputs its images."
 msgstr ""
 
-#: standalone/drakTermServ:615
+#: standalone/drakTermServ:589
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
 "        \tThe diskless client machines need either ROM images on the NIC, or "
 "a boot floppy\n"
-"        \tor CD to initate the boot sequence.  drakTermServ will help "
+"        \tor CD to initiate the boot sequence.  drakTermServ will help "
 "generate these\n"
 "        \timages, based on the NIC in the client machine.\n"
 "        \t\t\n"
@@ -14528,62 +15421,62 @@ msgid ""
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr "Тизимни юклаш дискети"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr ""
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, c-format
 msgid "PXE Image"
-msgstr "PXE тасвир"
+msgstr "PXE расм"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:696
 #, c-format
 msgid "Default kernel version"
 msgstr "Андоза кернелнинг версияси"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr ""
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr "Ҳеч қандай кернел танланмаган!"
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr ""
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
 msgstr "Ҳеч қандай NIC танлангани йўқ!"
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr ""
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Ўчириш"
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Ҳамма NBI'ларни ўчириш"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -14591,94 +15484,94 @@ msgid ""
 "Delete/re-add the user to the Terminal Server to enable login."
 msgstr ""
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr "Фойдаланувчини қўшиш -->"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Фойдаланувчини ўчириш"
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, c-format
 msgid "type: %s"
 msgstr "тури: %s"
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
 msgstr ""
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, c-format
 msgid ""
 "Allow local hardware\n"
 "configuration."
 msgstr ""
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr ""
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, c-format
 msgid "Thin Client"
 msgstr ""
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, c-format
 msgid "Allow Thin Clients"
 msgstr ""
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr "Клиентни қўшиш -->"
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, c-format
 msgid "type: fat"
 msgstr "тури: fat"
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, c-format
 msgid "type: thin"
 msgstr ""
 
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, c-format
 msgid "local config: false"
 msgstr ""
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, c-format
 msgid "local config: true"
 msgstr ""
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Клиентни тузатиш"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr ""
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, c-format
 msgid "Delete Client"
 msgstr "Клиентни ўчириш"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, c-format
 msgid "dhcpd Config..."
 msgstr "dhcpd'ни мослаш"
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -14688,77 +15581,77 @@ msgstr ""
 "керак.\n"
 "(service dm restart - консолда)"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
 #, c-format
 msgid "Thin clients won't work with autologin. Disable autologin?"
 msgstr ""
 
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
 #, c-format
 msgid "All clients will use %s"
 msgstr ""
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr ""
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "Тармоқ маскаси:"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr "Рутерлар:"
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr ""
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr ""
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Domain Name:"
 msgstr ""
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Name Servers:"
 msgstr "Ном серверлари:"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr "IP чегарасининг боши:"
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr "IP чегарасининг охири:"
 
-#: standalone/drakTermServ:1257
+#: standalone/drakTermServ:1230
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr ""
 
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Write Config"
 msgstr "Мосламани ёзиш"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "dhcpd серверини мослаш"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -14766,105 +15659,99 @@ msgid ""
 "You can modify as needed."
 msgstr ""
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr ""
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Илтимос дискетни қўйинг:"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr ""
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Дискетни энди олишингиз мумкин"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Дискет ускунаси мавжуд эмас!"
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, c-format
 msgid "PXE image is %s/%s"
-msgstr "PXE тасвири: %s/%s"
+msgstr "PXE расми: %s/%s"
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "%s/%s ёзишда хато"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Etherboot ISO тасвири: %s"
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr ""
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Аввало /etc/dhcpd.conf файлини яратиш керак!"
 
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1602
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr ""
 
-#: standalone/drakTermServ:1647
+#: standalone/drakTermServ:1615
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s фойдаланувчи эмас\n"
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s аллақачон терминал сервер фойдаланувчиси\n"
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr ""
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s терминал серверига қўшилди\n"
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "%s ўчирилди\n"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s топилмади...\n"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr "%s'дан аллақачон фойдаланилмоқда\n"
-
-#: standalone/drakTermServ:1801
+#: standalone/drakTermServ:1769
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr ""
 "/etc/hosts.allow ва /etc/hosts.deny файллари аллақачон мосланган - "
 "ўзгартирилмади"
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "Мослама ўзгарди. clusternfs/dhcpd хизмати бошқадан ишга туширилсинми?"
@@ -14951,8 +15838,8 @@ msgstr ""
 "\n"
 "Автоматик равишда ўрнатишнинг параметрлари чап тарафдаги бўлимларда мавжуд"
 
-#: standalone/drakautoinst:252 standalone/drakgw:598 standalone/drakvpn:902
-#: standalone/scannerdrake:379
+#: standalone/drakautoinst:252 standalone/drakgw:600 standalone/drakvpn:902
+#: standalone/scannerdrake:375
 #, c-format
 msgid "Congratulations!"
 msgstr "Табриклаймиз!"
@@ -14991,66 +15878,61 @@ msgstr "қаттиқ диск"
 msgid "tape"
 msgstr "магнит тасма"
 
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "Ҳеч қандай ускуна топилмади"
-
-#: standalone/drakbackup:152
+#: standalone/drakbackup:153
 #, c-format
 msgid ""
-"Expect is an extension to the Tcl scripting language that allows interactive "
+"Expect is an extension to the TCL scripting language that allows interactive "
 "sessions without user intervention."
 msgstr ""
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
-msgstr "Бу система учун махфий сўзни DrakBackup мосламасида сақлаш."
+msgstr "Бу тизим учун махфий сўзни DrakBackup мосламасида сақлаш."
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:155
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
 "the cdrw is erased before each backup."
 msgstr ""
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
 "whether incremental or differential mode is used."
 msgstr ""
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
 "last backup."
 msgstr ""
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
 "original 'base' backup."
 msgstr ""
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
-"This should be a local user or email addresse that you want the backup "
+"This should be a local user or email address that you want the backup "
 "results sent to. You will need to define a functioning mail server."
 msgstr ""
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
 "tree will not be backed up."
 msgstr ""
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -15058,7 +15940,7 @@ msgid ""
 "tar files after the backup."
 msgstr ""
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -15066,56 +15948,56 @@ msgid ""
 "path."
 msgstr ""
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
 "run-parts in /etc/crontab."
 msgstr ""
 
-#: standalone/drakbackup:326
+#: standalone/drakbackup:327
 #, c-format
 msgid "No media selected for cron operation."
 msgstr ""
 
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr ""
 
-#: standalone/drakbackup:377
+#: standalone/drakbackup:378
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr ""
 
-#: standalone/drakbackup:462 standalone/logdrake:467
+#: standalone/drakbackup:463 standalone/logdrake:437
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr "\"%s\" на ҳақиқий электрон почта на мавжуд локал фойдаланувчи!"
 
-#: standalone/drakbackup:466 standalone/logdrake:472
+#: standalone/drakbackup:467 standalone/logdrake:442
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
 "a complete email address!"
 msgstr ""
 
-#: standalone/drakbackup:475
+#: standalone/drakbackup:476
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
 #, c-format
 msgid "Old user list:\n"
 msgstr "Фойдаланувчиларнинг эски рўйхати:\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
 msgstr "Фойдаланувчиларнинг эски рўйхати\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -15124,14 +16006,14 @@ msgstr ""
 "\n"
 "                      DrakBackup ҳисоботи \n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
 "                      DrakBackup Daemon Report\n"
 msgstr ""
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -15144,13 +16026,13 @@ msgstr ""
 "\n"
 "\n"
 
-#: standalone/drakbackup:556 standalone/drakbackup:627
-#: standalone/drakbackup:683
+#: standalone/drakbackup:557 standalone/drakbackup:628
+#: standalone/drakbackup:684
 #, c-format
 msgid "Total progress"
 msgstr ""
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -15159,42 +16041,42 @@ msgid ""
 " need to purge the entry from authorized_keys on the server."
 msgstr ""
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "Калитларни яратиш бир оз вақтни олиши мумкин."
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, c-format
 msgid "Cannot spawn %s."
 msgstr ""
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr ""
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Bad password on %s"
 msgstr ""
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr ""
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "%s'ни %s'да топиб бўлмади."
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "%s жавоб бермаяпти"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -15205,84 +16087,84 @@ msgid ""
 "without being prompted for a password."
 msgstr ""
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr ""
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr ""
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "Ускунада CDR/DVDR йўқ!"
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "Ёзиш мумкин бўлган маълумот ташувчига ўхшамайди!"
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr "Ўчириб бўлмайдиган маълумот ташувчи!"
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr ""
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr ""
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "%s'да магнит тасма йўқ!"
 
-#: standalone/drakbackup:956
+#: standalone/drakbackup:966
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
 "%d MB used vs %d MB allocated."
 msgstr ""
 
-#: standalone/drakbackup:975 standalone/drakbackup:1008
+#: standalone/drakbackup:985 standalone/drakbackup:1018
 #, c-format
 msgid "Backup system files..."
 msgstr ""
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr ""
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr ""
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
 msgstr ""
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr ""
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
 msgstr ""
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -15290,7 +16172,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -15298,7 +16180,7 @@ msgid ""
 "FTP.\n"
 msgstr ""
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
@@ -15306,12 +16188,12 @@ msgstr ""
 "Файлни FTP орқали жўнатишда хато рўй берди. Илтимос FTP мосламаларингизни "
 "тўғриланг."
 
-#: standalone/drakbackup:1120
+#: standalone/drakbackup:1130
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "FTP орқали жўнатилган файлларнинг рўйхати: %s\n"
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -15319,7 +16201,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -15327,22 +16209,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Хатни жўнатишда хато рўй берди. \n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Каталогни яратиб бўлмади!"
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
@@ -15351,41 +16233,41 @@ msgstr ""
 "\n"
 "Сизга керак бўлган параметрларни текширинг.\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr ""
 
-#: standalone/drakbackup:1396 standalone/drakbackup:1460
-#: standalone/drakbackup:1526
+#: standalone/drakbackup:1417 standalone/drakbackup:1481
+#: standalone/drakbackup:1547
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr ""
 
-#: standalone/drakbackup:1398 standalone/drakbackup:1462
-#: standalone/drakbackup:1528
+#: standalone/drakbackup:1419 standalone/drakbackup:1483
+#: standalone/drakbackup:1549
 #, c-format
 msgid "Use Incremental Backups"
 msgstr ""
 
-#: standalone/drakbackup:1398 standalone/drakbackup:1462
-#: standalone/drakbackup:1528
+#: standalone/drakbackup:1419 standalone/drakbackup:1483
+#: standalone/drakbackup:1549
 #, c-format
 msgid "Use Differential Backups"
 msgstr ""
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr ""
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -15394,177 +16276,177 @@ msgstr ""
 "Бу параметр орқали /etc директориянгизнинг истаган версиясини\n"
 "тиклашингиз мумкин."
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Баузернинг кэшини киритмаш"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Файлларни ёки директорияларни танланг ва \"Ок\" тугмасини босинг"
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
 msgstr "Танланганни олиб ташлаш"
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "Фойдаланувчилар"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
 msgstr ""
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
 msgstr "Тармоқ усули:"
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr "Узатиш"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr ""
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Host name or IP."
 msgstr "Компьютернинг номи  ёки IP рақами"
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 
-#: standalone/drakbackup:1621
-#, c-format
-msgid "Login name"
-msgstr "Фойдаланувчи"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
 msgstr "Бу махфий сўзни эслаб қолиш"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Компьютернинг номи, фойдаланувчи ва махфий сўз керак!"
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr ""
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Компакт-диск/DVD ускунасини танланг (Мб)"
 
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Компакт-диск/DVD'нинг ҳажмини танланг"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "Кўп сеансли компакт-диск"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr ""
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr ""
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr " Дарҳол ўчириш "
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
 msgstr ""
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, c-format
 msgid "DVD-R media"
 msgstr ""
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, c-format
 msgid "DVDRAM device"
 msgstr "DVDRAM ускуна"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
 msgstr "Компакт-диск ускунаси аниқланмаган!"
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
 msgstr ""
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
 msgstr ""
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr ""
+
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr ""
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
 msgstr ""
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Eject tape after the backup"
 msgstr ""
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Сақлаш учун директорияни киритинг:"
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Directory to save to"
 msgstr "Сақлаш учун директория"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -15573,314 +16455,314 @@ msgstr ""
 "Drakbackup учун ажратилган\n"
 " юқори чегарани киритинг (Мб)"
 
-#: standalone/drakbackup:2015
+#: standalone/drakbackup:2035
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "Компакт-диск / DVDROM"
 
-#: standalone/drakbackup:2020
+#: standalone/drakbackup:2040
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Қатиқ диск / NFS"
 
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
 #, c-format
 msgid "hourly"
 msgstr "ҳар соат"
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
 msgstr "ҳар кун"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr "ҳар ҳафта"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr "ҳар ой"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, c-format
 msgid "custom"
 msgstr "бошқа"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "Январь"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "Февраль"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "Март"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "Апрель"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "Май"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "Июнь"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "Июль"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "Август"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "Сентябрь"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "Октябрь"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "Ноябрь"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "Декабрь"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "Якшанба"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
 msgstr "Душанба"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "Сешанба"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "Чоршанба"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "Пайшанба"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "Жума"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "Шанба"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
 msgstr "Демондан фойдаланиш"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr ""
 
-#: standalone/drakbackup:2105
+#: standalone/drakbackup:2118
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr ""
 
-#: standalone/drakbackup:2110
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Minute"
 msgstr "Минут"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Hour"
 msgstr "Соат"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Day"
 msgstr "Кун"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Month"
 msgstr "Ой"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Weekday"
 msgstr "Ҳавта куни"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, c-format
 msgid "Please choose the media for backup."
 msgstr ""
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr ""
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Please choose the compression type"
 msgstr ""
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Use .backupignore files"
 msgstr ""
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr ""
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "Хат-хабар учун SMTP сервери:"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "Нима"
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "Қаерда"
 
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, c-format
 msgid "When"
 msgstr "Қачон"
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, c-format
 msgid "More Options"
 msgstr "Қўшимча параметрлар"
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, c-format
 msgid "Backup destination not configured..."
 msgstr ""
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Drakbackup мосламаси"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr ""
 
-#: standalone/drakbackup:2311
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr ""
 
-#: standalone/drakbackup:2319
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Across Network"
 msgstr "Тармоқ орқали"
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On CD-R"
 msgstr "Компакт-дискга"
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
 msgstr "Магнит тасма ускунасига"
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr ""
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, c-format
 msgid " (Default is all users)"
 msgstr " (андоза: ҳамма фойдаланувчилар)"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr ""
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
 msgstr ""
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr ""
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
 msgstr ""
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
 "Backup Sources: \n"
 msgstr ""
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
@@ -15889,7 +16771,7 @@ msgstr ""
 "\n"
 "- Тизимнинг файллари:\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -15898,7 +16780,7 @@ msgstr ""
 "\n"
 "- Фойдаланувчининг файллари:\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -15907,36 +16789,26 @@ msgstr ""
 "\n"
 "- Бошқа файллар:\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
 "- Save on Hard drive on path: %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr ""
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
 "- Delete hard drive tar files after backup.\n"
 msgstr ""
 
-#: standalone/drakbackup:2506
-#, c-format
-msgid "NO"
-msgstr "Йўқ"
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr "ҲА"
-
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -15945,22 +16817,22 @@ msgstr ""
 "\n"
 "- Компакт-дискга ёзиш"
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2505
 #, c-format
 msgid "RW"
 msgstr ""
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2506
 #, c-format
 msgid " on device: %s"
 msgstr " Ускунага: %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr " (кўп сеансли)"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -15969,12 +16841,17 @@ msgstr ""
 "\n"
 "- %s ускунадаги магнит тасмага сақлаш"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tЎчириш=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr ""
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -15983,7 +16860,7 @@ msgstr ""
 "\n"
 "- %s орқали %s хостида сақлаш\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -15992,7 +16869,7 @@ msgstr ""
 "\t\t фойдаланувчи: %s\n"
 "\t\t директория: %s\n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -16001,89 +16878,89 @@ msgstr ""
 "\n"
 "- Параметрлар:\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tТизимнинг файлларини киритмаш\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr ""
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr ""
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2520
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr ""
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr ""
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\t%s'га хат жўнатиш\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\t %s SMTP сервери ёрдамида\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
 "- Daemon, %s via:\n"
 msgstr ""
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-Қаттиқ диск.\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-Компакт-диск.\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-Магнит тасма \n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Тармоқ FTP орқали.\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Тармоқ SSH орқали.\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Тармоқ rsync орқали.\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Тармоқ webdav орқали.\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr ""
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -16092,27 +16969,27 @@ msgstr ""
 "Тиклаш учун маълумотлар рўйхати:\n"
 "\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- Тизимнинг файлларини тиклаш:\n"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Фойдаланувчининг файлларини тиклаш:\n"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Бошқа файлларни тиклаш:\n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -16121,141 +16998,141 @@ msgstr ""
 "Бузуқ маълумотнинг рўйхати:\n"
 "\n"
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr ""
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr ""
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr ""
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr "          %s да муваффақиятли тикланди          "
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Мосламани тиклаш         "
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr "Ок - бошқа файлларни тиклаш учун"
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "Илтимос тиклаш учун санани танланг:"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Қаттиқ дискдан тиклаш."
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr ""
 
-#: standalone/drakbackup:3043
+#: standalone/drakbackup:3037
 #, c-format
 msgid "Directory with backups"
 msgstr ""
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Тиклаш учун бошқа маълумот ташувчини танланг"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
 msgstr "Бошқа маълумот ташувчиси"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
 msgstr "Тизимни тиклаш"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
 msgstr "Фойдаланувчиларни тиклаш"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
 msgstr "Бошқани тиклаш"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "Тиклаш учун йўлни танланг (/ ўрнига)"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
 #, c-format
 msgid "Path To Restore To"
 msgstr ""
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Тиклашдан олдин фойдаланувчиларнинг директорияларини ўчириш."
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr ""
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
 msgstr ""
 
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
 #, c-format
 msgid "No matches found..."
 msgstr ""
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, c-format
 msgid "Restore Selected"
 msgstr "Танланганни тиклаш"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr ""
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -16264,320 +17141,325 @@ msgstr ""
 "Танланган файлларни\n"
 "тиклаш"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr ""
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
 msgstr "Компакт-дискдан тиклаш"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
 " in the CD drive under mount point /mnt/cdrom"
 msgstr ""
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
 msgstr "Магнит тасмасидан тиклаш"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
 " in the tape drive device %s"
 msgstr ""
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network"
 msgstr "Тармоқ орқали тиклаш"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Қуйидаги тармоқ протоколи орқали тиклаш: %s"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "Компьютернинг номи"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr "Хостга йўл ёки модул"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
 msgstr "Махфий сўз керак"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
 msgstr "Фойдаланувчининг номи керак"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
 msgstr "Хостнинг ҳоми керак"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr "Йўл ёки модул керак"
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "Файллар тикланди"
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
 msgstr "Тиклаш муваффақиятсиз тугади"
 
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
 #, c-format
 msgid "%s not retrieved..."
 msgstr ""
 
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, c-format
 msgid "Search for files to restore"
 msgstr "Тиклаш учун файлларни қидириш"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr ""
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr ""
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Каталогдан тиклаш"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr ""
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "%s тўғри йўллигини текширинг"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr ""
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr "Компакт-дискни жойига қўйинг - давом этинг."
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr ""
 
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3828
 #, c-format
 msgid "Directory To Restore From"
 msgstr ""
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr ""
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "Сақлаш"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
 msgstr ""
 
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, c-format
 msgid "Restore"
 msgstr "Тиклаш"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Қуйидаги пакетларни ўрнатиш керак:\n"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Илтимос тиклаш учун маълумотни танланг..."
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
 msgstr ""
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
 msgstr ""
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
 msgstr ""
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr ""
 
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Файллар FTP орқали жўнатилмоқда"
 
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Sending files..."
 msgstr "Файллар жўнатилмоқда..."
 
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr ""
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
 msgstr ""
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Мослаш ёрдамчиси"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Қўшимча мосламалар"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, c-format
 msgid "View Configuration"
 msgstr "Мосламани кўриш"
 
-#: standalone/drakbackup:4295
+#: standalone/drakbackup:4316
 #, c-format
 msgid "View Last Log"
 msgstr ""
 
-#: standalone/drakbackup:4300
+#: standalone/drakbackup:4321
 #, c-format
 msgid "Backup Now"
 msgstr ""
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
 msgstr ""
 
-#: standalone/drakbackup:4324 standalone/drakbackup:4327
+#: standalone/drakbackup:4345 standalone/drakbackup:4348
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "Graphical boot theme selection"
 msgstr ""
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "Тизимнинг усули"
 
-#: standalone/drakboot:68 standalone/drakfloppy:46 standalone/harddrake2:103
-#: standalone/harddrake2:104 standalone/logdrake:71
-#: standalone/printerdrake:150 standalone/printerdrake:151
-#: standalone/printerdrake:152
+#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:171
+#: standalone/harddrake2:172 standalone/logdrake:70
+#: standalone/printerdrake:156 standalone/printerdrake:157
+#: standalone/printerdrake:158
 #, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Файл/Чи_қиш"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/harddrake2:104
-#: standalone/logdrake:77 standalone/printerdrake:152
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:172
+#: standalone/logdrake:76 standalone/printerdrake:158
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Ч"
 
-#: standalone/drakboot:139
+#: standalone/drakboot:148
 #, c-format
 msgid "Install themes"
 msgstr "Мавзуларни ўрнатиш"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "Янги мавзуни яратиш"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
 msgstr ""
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
 "boot, select a graphic video mode from the bootloader configuration tool."
 msgstr ""
 
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, c-format
+msgid "Do you want to configure it now?"
+msgstr "Уни мослашни истайсизми?"
+
+#: standalone/drakboot:177
 #, c-format
 msgid "Theme"
 msgstr "Мавзу"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
@@ -16586,147 +17468,131 @@ msgstr ""
 "Мавзуларни\n"
 "консолда кўрсатиш"
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "Тизим юкланаётганда график муҳитини ишга тушириш"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
-msgstr "Йўқ, автоматик равишда системага киришни истамайман"
+msgstr "Йўқ, тизимга автоматик равишда киришни истамайман"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "Ҳа, автоматик равишда системага киришни истайман"
+msgstr "Ҳа, тизимга автоматик равишда киришни истайман"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
 msgstr "Андоза фойдаланувчи"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
 msgstr "Андоза иш столи"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "%s'ни ўрнатиш муваффақиятсиз тугади. Қуйидаги хато рўй берди:"
-
-#: standalone/drakbug:40
+#: standalone/drakboot:310
 #, c-format
 msgid ""
-"To submit a bug report, click on the button report.\n"
-"This will open  a web browser window on %s\n"
-" where you'll find a form to fill in.  The information displayed above will "
-"be \n"
-"transferred to that server."
+"Please choose a video mode, it will be applied to each of the boot entries "
+"selected below.\n"
+"Be sure your video card supports the mode you choose."
 msgstr ""
 
-#: standalone/drakbug:48
+#: standalone/drakbug:41
 #, c-format
-msgid "Mandrake Bug Report Tool"
-msgstr "Mandrake учун хато ҳақида хабар қилувчи восита"
+msgid "Mandrakelinux Bug Report Tool"
+msgstr "Mandrakelinux учун хато ҳақида хабар қилувчи восита"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
-msgstr "Mandrake бошқарув маркази"
+msgid "Mandrakelinux Control Center"
+msgstr "Mandrakelinux бошқарув маркази"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr "Тенглаштириш асбоби"
 
-#: standalone/drakbug:56 standalone/drakbug:70 standalone/drakbug:204
-#: standalone/drakbug:206 standalone/drakbug:210
+#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:176
+#: standalone/drakbug:178 standalone/drakbug:182
 #, c-format
 msgid "Standalone Tools"
 msgstr ""
 
-#: standalone/drakbug:57
+#: standalone/drakbug:50
 #, c-format
 msgid "HardDrake"
 msgstr "HardDrake"
 
-#: standalone/drakbug:58
+#: standalone/drakbug:51
 #, c-format
-msgid "Mandrake Online"
-msgstr "Mandrake Online"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: standalone/drakbug:59
+#: standalone/drakbug:52
 #, c-format
 msgid "Menudrake"
 msgstr "Menudrake"
 
-#: standalone/drakbug:60
+#: standalone/drakbug:53
 #, c-format
 msgid "Msec"
 msgstr "Msec"
 
-#: standalone/drakbug:61
+#: standalone/drakbug:54
 #, c-format
 msgid "Remote Control"
 msgstr "Масофадан бошқариш"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, c-format
 msgid "Software Manager"
 msgstr "Дастурлар бошқарувчиси"
 
-#: standalone/drakbug:63
+#: standalone/drakbug:56
 #, c-format
 msgid "Urpmi"
 msgstr "Urpmi"
 
-#: standalone/drakbug:64
+#: standalone/drakbug:57
 #, c-format
 msgid "Windows Migration tool"
 msgstr ""
 
-#: standalone/drakbug:65
+#: standalone/drakbug:58
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: standalone/drakbug:66
+#: standalone/drakbug:59
 #, c-format
 msgid "Configuration Wizards"
 msgstr "Мослаш ёрдамчилари"
 
-#: standalone/drakbug:84
-#, c-format
-msgid ""
-"To submit a bug report, click the report button, which will open your "
-"default browser\n"
-"to Anthill where you will be able to upload the above information as a bug "
-"report."
-msgstr ""
-
-#: standalone/drakbug:102
+#: standalone/drakbug:83
 #, c-format
 msgid "Application:"
 msgstr "Дастур:"
 
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, c-format
 msgid "Package: "
 msgstr "Пакет: "
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
 msgstr "Кернел:"
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, c-format
 msgid "Release: "
 msgstr ""
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
@@ -16735,163 +17601,182 @@ msgstr ""
 "Дастурнинг номи\n"
 "ёки тўлиқ йўл:"
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, c-format
 msgid "Find Package"
 msgstr "Пакетни қидириш"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, c-format
 msgid "Summary: "
 msgstr "Ҳисобот: "
 
-#: standalone/drakbug:129
+#: standalone/drakbug:104
 #, c-format
-msgid "YOUR TEXT HERE"
+msgid "Bug Description/System Information"
 msgstr ""
 
-#: standalone/drakbug:132
+#: standalone/drakbug:105
 #, c-format
-msgid "Bug Description/System Information"
+msgid "YOUR TEXT HERE"
 msgstr ""
 
-#: standalone/drakbug:136
+#: standalone/drakbug:108
 #, c-format
 msgid "Submit kernel version"
 msgstr ""
 
-#: standalone/drakbug:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
 msgstr ""
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr ""
 
-#: standalone/drakbug:159
+#: standalone/drakbug:124
+#, c-format
+msgid ""
+"To submit a bug report, click on the report button.\n"
+"This will open  a web browser window on %s\n"
+" where you'll find a form to fill in.  The information displayed above will "
+"be \n"
+"transferred to that server."
+msgstr ""
+
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
 msgstr "Хабар бериш"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "Ўрнатилмаган"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, c-format
 msgid "Package not installed"
 msgstr "Пакет ўрнатилмаган"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr "ТОПИЛМАДИ"
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "%s билан алоқа ўрнатилмоқда..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
 msgstr "Ҳеч қандай браузер мавжуд эмас! Илтимос бирортасини ўрнатинг"
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, c-format
 msgid "Please enter a package name."
 msgstr "Илтимос пакетнинг номини киритинг."
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr "Илтимос ҳисоботни киритинг."
 
-#: standalone/drakclock:29
+#: standalone/drakclock:30
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:39
+#: standalone/drakclock:40
 #, c-format
 msgid "not defined"
 msgstr "аниқланмаган"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, c-format
 msgid "Change Time Zone"
 msgstr "Вақт зонасини ўзгартириш"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "Вақт зонаси - DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "GMT - DrakClock"
 msgstr "GMT - DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "Is your hardware clock set to GMT?"
 msgstr ""
 
-#: standalone/drakclock:79
+#: standalone/drakclock:76
 #, c-format
 msgid "Network Time Protocol"
 msgstr ""
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
 " with a remote time server using NTP"
 msgstr ""
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr ""
 
-#: standalone/drakclock:90
+#: standalone/drakclock:87
 #, c-format
 msgid "Server:"
 msgstr "Сервер:"
 
-#: standalone/drakclock:137 standalone/drakclock:149
+#: standalone/drakclock:125
+#, c-format
+msgid "Could not synchronize with %s."
+msgstr ""
+
+#: standalone/drakclock:147 standalone/drakclock:157
 #, c-format
 msgid "Reset"
 msgstr "Тиклаш"
 
-#: standalone/drakclock:214
+#: standalone/drakclock:225
 #, c-format
 msgid ""
 "We need to install ntp package\n"
 " to enable Network Time Protocol\n"
 "\n"
-"Do you want to install ntp ?"
+"Do you want to install ntp?"
 msgstr ""
+"Тармоқ Вақт Протоколини ёқиш\n"
+"учун ntp пакетини ўрнатиш керак\n"
+"\n"
+"Уни ўрнатишни истайсизми?"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Тармоқнинг мосламаси (%d адаптер)"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "Гейтвэй:"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "Интерфейс:"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "Илтимос кутиб туринг"
@@ -16901,12 +17786,8 @@ msgstr "Илтимос кутиб туринг"
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "Драйвер"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "State"
 msgstr "Ҳолати"
@@ -16921,7 +17802,7 @@ msgstr "Компьютернинг номи: "
 msgid "Configure hostname..."
 msgstr "Компьютернинг номини мослаш"
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "Локал тармоқни мослаш"
@@ -16931,8 +17812,8 @@ msgstr "Локал тармоқни мослаш"
 msgid "Configure Local Area Network..."
 msgstr "Локал тармоқни мослаш"
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "Қўллаш"
@@ -16942,107 +17823,113 @@ msgstr "Қўллаш"
 msgid "Manage connections"
 msgstr "Алоқаларни бошқариш"
 
-#: standalone/drakconnect:218
+#: standalone/drakconnect:224
 #, c-format
 msgid "Device selected"
 msgstr "Ускуна танланган"
 
-#: standalone/drakconnect:314
+#: standalone/drakconnect:305
 #, c-format
 msgid "IP configuration"
 msgstr "IP мосламаси"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, c-format
 msgid "DNS servers"
 msgstr "DNS серверлари"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, c-format
 msgid "Search Domain"
 msgstr ""
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "static"
 msgstr "статик"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
 
-#: standalone/drakconnect:493
+#: standalone/drakconnect:436
+#, c-format
+msgid "Metric"
+msgstr "Метрик"
+
+#: standalone/drakconnect:491
 #, c-format
 msgid "Flow control"
 msgstr ""
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:492
 #, c-format
 msgid "Line termination"
 msgstr ""
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, c-format
 msgid "Modem timeout"
 msgstr "Модем учун таймаут"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, c-format
 msgid "Use lock file"
 msgstr ""
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr ""
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, c-format
 msgid "Busy wait"
 msgstr ""
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
 #, c-format
 msgid "Modem sound"
 msgstr "Модем товуши"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Enable"
 msgstr "Ёқиш"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Disable"
 msgstr "Ўчириш"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "Маълумот ташувчининг синфи"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Модулнинг номи"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, c-format
 msgid "Mac Address"
 msgstr "Mac рақами"
 
-#: standalone/drakconnect:574 standalone/harddrake2:21
+#: standalone/drakconnect:572 standalone/harddrake2:23
+#: standalone/harddrake2:104
 #, c-format
 msgid "Bus"
 msgstr ""
 
-#: standalone/drakconnect:575 standalone/harddrake2:29
+#: standalone/drakconnect:573 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr ""
 
-#: standalone/drakconnect:645 standalone/drakgw:248 standalone/drakpxe:138
+#: standalone/drakconnect:670 standalone/drakgw:250 standalone/drakpxe:138
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -17051,20 +17938,20 @@ msgstr ""
 "Тизимда тармоқ адаптери аниқланмади. Илтимос асбоб-ускунани мословчи "
 "воситани ишга туширинг."
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, c-format
 msgid "Remove a network interface"
 msgstr "Тармоқ интерфейсини олиб ташлаш"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Олиб ташлаш учун тармоқ интерфейсини танланг:"
 
-#: standalone/drakconnect:679
+#: standalone/drakconnect:713
 #, c-format
 msgid ""
-"An error occured while deleting the \"%s\" network interface:\n"
+"An error occurred while deleting the \"%s\" network interface:\n"
 "\n"
 "%s"
 msgstr ""
@@ -17072,70 +17959,70 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:681
+#: standalone/drakconnect:715
 #, c-format
 msgid ""
-"Congratulations, the \"%s\" network interface has been succesfully deleted"
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Табриклаймиз. \"%s\" тармоқ интерфейси муваффақиятли олиб ташланди."
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
-msgstr "Йўқ"
+msgid "No IP"
+msgstr "IP рақами кўрсатилмаган"
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, c-format
 msgid "No Mask"
 msgstr "Маскасиз"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
 msgstr "ишлаяпти"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "down"
 msgstr "ишламаяпти"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
 msgstr "Уланган"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "Уланмаган"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "Узиш..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "Уланиш..."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Deactivate now"
 msgstr "Ўчириш"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Activate now"
 msgstr "Ёқиш"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -17144,79 +18031,102 @@ msgstr ""
 "Сизда мосланган интерфейс йўқ.\n"
 "Аввало, уларни \"Мослаш\"ни босиб мосланг."
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "Локал тармоқни мослаш"
 
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Адаптер %s: %s"
 
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
 #, c-format
 msgid "Boot Protocol"
 msgstr ""
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
 msgstr "Тизим юкланганда ишга туширилган"
 
-#: standalone/drakconnect:868
+#: standalone/drakconnect:919
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrake Control Center"
+"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
 msgstr ""
 "Бу интерфейс ҳали мослангани йўқ.\n"
-"Mandrake бошқарув марказидан \"Интерфейсни қўшиш\" ёрдамчини ишга туширинг."
+"Mandrakelinux бошқарув марказидан \"Интерфейсни қўшиш\" ёрдамчини ишга "
+"туширинг"
 
-#. -PO: here "Internet access" should be translated the same was as in control-center
-#: standalone/drakconnect:923
+#. -PO: here "Add Connection" should be translated the same was as in control-center
+#: standalone/drakconnect:974 standalone/net_applet:46
 #, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
-"Please run \"Internet access\" in control center."
+"Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"
 msgstr ""
+"Интернет билан алоқа мосланмаган.\n"
+"Mandrakelinux бошқарув марказидан \"Янги алоқа\" ёрдамчини ишга туширинг"
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Интернетга уланишни мослаш"
 
-#: standalone/drakconnect:949
+#: standalone/drakconnect:1000
 #, c-format
 msgid "Third DNS server (optional)"
 msgstr "Учинчи DNS сервери (танлаб бўлади)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Интернетга уланишни мослаш"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "Интернетга уланиш"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "Уланишнинг тури: "
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "Ҳолати:"
 
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr "XDM (X Display Manager)"
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr "Дисплей бошқарувчисини танлаш"
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -17224,114 +18134,122 @@ msgid ""
 "several different X sessions on your local machine at the same time."
 msgstr ""
 
-#: standalone/drakedm:77
+#: standalone/drakedm:79
 #, c-format
-msgid "The change is done, do you want to restart the dm service ?"
+msgid "The change is done, do you want to restart the dm service?"
 msgstr "Ўзгаришлар қўлланди, dm хизматини бошқадан ишга туширишни истайсизми?"
 
-#: standalone/drakfloppy:40
+#: standalone/drakedm:80
+#, c-format
+msgid ""
+"You are going to close all running programs and lose your current session. "
+"Are you really sure that you want to restart the dm service?"
+msgstr ""
+
+#: standalone/drakfloppy:41
 #, c-format
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
 #, c-format
 msgid "Boot disk creation"
 msgstr "Тизимни юклаш дискини яратиш"
 
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
 #, c-format
 msgid "General"
 msgstr "Умумий"
 
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
 #, c-format
 msgid "Device"
 msgstr "Ускуна"
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, c-format
 msgid "Kernel version"
 msgstr "Кернелнинг версияси"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "Мослаш"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "Қўшимча мосламалар"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "Ҳажми"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "Mkinitrd учун бошқа аргументлар"
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "мажбурий"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr "RAID модулларсиз"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "агар керак бўлса"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "SCSI модулларсиз"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "Модулни қўшиш"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "Модулни олиб ташлаш"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "%s ускунасида маълумот ташувчи борлигига ишонч ҳосил қилинг"
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
 "Please insert one."
 msgstr ""
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr ""
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "Floppy creation completed"
 msgstr "Дискетни яратиш бажарилди"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr "Тизимни юкаш дискети муваффақиятли бажарилди.\n"
 
-#: standalone/drakfloppy:312
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/drakfloppy:309
 #, c-format
 msgid ""
 "Unable to properly close mkbootdisk:\n"
@@ -17347,7 +18265,7 @@ msgstr "Ўрнатилган шрифтларни қидириш"
 #: standalone/drakfont:185
 #, c-format
 msgid "Unselect fonts installed"
-msgstr "Ўрнатилган шрифтларни белгилашни бекор қилиш"
+msgstr "Ўрнатилган шрифтларни танлашни бекор қилиш"
 
 #: standalone/drakfont:208
 #, c-format
@@ -17466,7 +18384,7 @@ msgstr "Шрифтларнинг рўйхати"
 msgid "About"
 msgstr "Ҳақида"
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
 #, c-format
 msgid "Uninstall"
 msgstr "Ўчириш"
@@ -17476,10 +18394,11 @@ msgstr "Ўчириш"
 msgid "Import"
 msgstr "Импорт қилиш"
 
-#: standalone/drakfont:512
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakfont:514
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by MandrakeSoft \n"
+"Copyright (C) 2001-2002 by Mandrakesoft \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -17489,7 +18408,7 @@ msgid ""
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
 
-#: standalone/drakfont:521
+#: standalone/drakfont:523
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -17509,7 +18428,7 @@ msgid ""
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -17527,12 +18446,12 @@ msgid ""
 "             Convert ttf font files to afm and pfb fonts\n"
 msgstr ""
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr ""
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -17542,123 +18461,128 @@ msgid ""
 "hang up your X Server."
 msgstr ""
 
-#: standalone/drakfont:567
+#: standalone/drakfont:569
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: standalone/drakfont:568
+#: standalone/drakfont:570
 #, c-format
 msgid "StarOffice"
 msgstr "StarOffice"
 
-#: standalone/drakfont:569
+#: standalone/drakfont:571
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: standalone/drakfont:570
+#: standalone/drakfont:572
 #, c-format
 msgid "Generic Printers"
 msgstr "Андоза принтерлар"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "Шрифт файлини ёки директорияни танланг ва \"Қўшиш\" тугмасини босинг"
 
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
-msgstr "Файл танлаш"
+msgstr "Файлни танлаш"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, c-format
 msgid "You've not selected any font"
 msgstr "Сиз ҳеч қандай шрифтни танламадингиз"
 
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, c-format
 msgid "Import fonts"
 msgstr "Шрифтларни импорт қилиш"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, c-format
 msgid "Install fonts"
 msgstr "Шрифтларни ўрнатиш"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr "агар ишончингиз комил бўлса, бу ерни босинг."
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr "бу ерга, агар \"йўқ\" бўлса."
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr "Ҳеч қайсини танламаш"
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr "Ҳаммасини танлаш"
 
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, c-format
 msgid "Remove List"
 msgstr "Рўйхатни олиб ташлаш"
 
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
 #, c-format
 msgid "Importing fonts"
 msgstr "Шрифтлар импорт қилинмоқда"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr "Бошланғич синовлар"
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Тизимга шрифтлардан нусха кўчириш"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Шрифтларни ўрнатиш ва айлантириш"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "Ўрнатишдан кейин амаллар"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Тизимдан шрифтларни олиб ташлаш"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
 msgstr ""
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr ""
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
 #, c-format
-msgid "Internet Connection Sharing currently disabled"
+msgid "Sorry, we support only 2.4 and above kernels."
 msgstr ""
 
 #: standalone/drakgw:125
 #, c-format
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: standalone/drakgw:126
+#, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -17666,39 +18590,39 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "ёқиш"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127
 #, c-format
 msgid "reconfigure"
 msgstr "Бошқадан мослаш"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
 #, c-format
 msgid "dismiss"
 msgstr "воз кечиш"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "Серверлар ёқилмоқда..."
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr ""
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr ""
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -17707,22 +18631,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "ўчириш"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "Серверлар ўчирилмоқда..."
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr ""
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -17736,27 +18660,27 @@ msgid ""
 "(LAN)."
 msgstr ""
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Интерфейс %s (%s модули ишлатилмоқда)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "Интерфейс %s"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Тизимда тармоқ адаптери мавжуд эмас!"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "Тармоқнинг интерфейси"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -17771,19 +18695,24 @@ msgstr ""
 "\n"
 "Мен шу адаптер билан локал тармоғингизни ўрнатаман."
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "Тармоқ интерфейсини танлаш"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Илтимос локал тармоғингизга уланадиган тармоқ адаптерини танланг."
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
 msgstr "Тармоқ интерфейси аллақачон мосланган"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -17793,27 +18722,27 @@ msgid ""
 "You can do it manually but you need to know what you're doing."
 msgstr ""
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Автоматик равишда бошқадан мослаш"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr "Йўқ (фақат экспертлар учун)"
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Жорий интерфейснинг мосламасини кўрсатиш"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr "Жорий интерфейсни мослаш"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -17824,7 +18753,7 @@ msgid ""
 "Driver: %s"
 msgstr ""
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -17840,12 +18769,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr "Локал тармоқнинг манзили"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -17858,73 +18787,73 @@ msgstr ""
 "Бу ерда DHCP серверини мослаш учун турли параметрларни танлашингиз мумкин.\n"
 "Агар бирор параметрнинг маъносини билмасангиз, уни шундай қолдиринг."
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "(Бу) DHCP сервернинг IP рақами"
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
 msgstr "DNS серверининг IP рақами"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
 msgstr ""
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP'нинг пастги чегараси"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP'нинг юқори чегараси"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Интерфейсни ва DHCP серверини бошқадан мослаш"
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr ""
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "Мосланмоқда..."
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "Скриптлар мосланмоқда, дастурлар ўрнатилмоқда, серверлар ишга туширилмоқда..."
 
-#: standalone/drakgw:403 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:405 standalone/drakpxe:231 standalone/drakvpn:278
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Пакетни (%s) ўрнатишда муаммолар пайдо бўлди"
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -17937,14 +18866,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 MandrakeSoft.\n"
+"Copyright (C) 2003-2004 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 MandrakeSoft.\n"
+"Copyright (C) 2003-2004 Mandrakesoft.\n"
 "Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
 "\n"
 "Фойдаланиш:\n"
@@ -17967,14 +18896,19 @@ msgid ""
 "frontend)\n"
 msgstr ""
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Mandrakelinux ёрдам маркази"
+
+#: standalone/drakhelp:36
 #, c-format
 msgid ""
 "%s cannot be displayed \n"
 ". No Help entry of this type\n"
 msgstr ""
 
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
 #, c-format
 msgid ""
 "No browser is installed on your system, Please install one if you want to "
@@ -17983,42 +18917,42 @@ msgstr ""
 "Тизимда ҳеч қандай браузер ўрнатилмаган. Агар ёрдам тизимини кўрмоқчи "
 "бўлсангиз, илтимос бирортасини ўрнатинг"
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, c-format
 msgid "System settings"
 msgstr "Тизим мосламалари"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, c-format
 msgid "Custom settings"
 msgstr "Қўшимча мосламалар"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, c-format
 msgid "Custom & system settings"
-msgstr "Қўшимча ва система мосламалари"
+msgstr "Қўшимча ва тизим мосламалари"
 
-#: standalone/drakperm:43
+#: standalone/drakperm:44
 #, c-format
 msgid "Editable"
 msgstr "Таҳрирлаб бўлади"
 
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
 msgstr "Йўл"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "Фойдаланувчи"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "Group"
 msgstr "Гуруҳ"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
 msgstr "Ҳуқуқлар"
@@ -18076,9 +19010,9 @@ msgid "Delete selected rule"
 msgstr "Белгиланган қоидани ўчириш"
 
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
-#: standalone/drakups:350 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:233
+#: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
+#: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit"
 msgstr "Таҳрирлаш"
@@ -18088,47 +19022,65 @@ msgstr "Таҳрирлаш"
 msgid "Edit current rule"
 msgstr "Жорий қоидани тузатиш"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr "ўтиш"
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "фойдаланувчи"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "group"
+msgstr "гуруҳ"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "other"
+msgstr "бошқа"
+
+#: standalone/drakperm:252
 #, c-format
 msgid "Read"
 msgstr "Ўқиш"
 
-#: standalone/drakperm:257
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:255
 #, c-format
 msgid "Enable \"%s\" to read the file"
 msgstr "Файлни ўқиш учун \"%s\"ни ёқинг"
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, c-format
 msgid "Write"
 msgstr "Ёзиш"
 
-#: standalone/drakperm:261
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:262
 #, c-format
 msgid "Enable \"%s\" to write the file"
 msgstr "Файлга ёзиш учун \"%s\"ни ёқинг"
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr "Бажариш"
 
-#: standalone/drakperm:265
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:269
 #, c-format
 msgid "Enable \"%s\" to execute the file"
 msgstr "Файлни бажариш учун \"%s\"ни ёқинг"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid "Sticky-bit"
 msgstr "Ёпишқоқ бит"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid ""
 "Used for directory:\n"
@@ -18137,52 +19089,52 @@ msgstr ""
 "Директориялар учун ишлатилади:\n"
 " уни фақат директориянинг эгаси ёки шу директориядаги файл ўчириши мумкин"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Set-UID"
 msgstr "UID'ни ўрнатиш"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Use owner id for execution"
 msgstr ""
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Set-GID"
 msgstr "GID'ни ўрнатиш"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Use group id for execution"
 msgstr ""
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
-msgstr "Фойдаланувчи :"
+msgid "User:"
+msgstr "Фойдаланувчи:"
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, c-format
-msgid "Group :"
-msgstr "Гуруҳ :"
+msgid "Group:"
+msgstr "Гуруҳ:"
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, c-format
 msgid "Current user"
 msgstr "Жорий фойдаланувчи"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
 msgstr "Белгиланса, эгаси ва гурҳ ўзгартирилмайди"
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
 msgstr "Йўлни танлаш"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "Эгалик"
@@ -18262,7 +19214,7 @@ msgstr ""
 #: standalone/drakpxe:196
 #, c-format
 msgid "No image found"
-msgstr "Тасвир топилмади"
+msgstr "Расм топилмади"
 
 #: standalone/drakpxe:197
 #, c-format
@@ -18289,54 +19241,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "auto_install.cfg файли жойлашган жой"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr "ҲАММАСИ"
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr "ЛОКАЛ"
 
-#: standalone/draksec:44 standalone/drakvpn:1146
-#, c-format
-msgid "default"
-msgstr "андоза"
-
-#: standalone/draksec:44
+#: standalone/draksec:53
 #, c-format
-msgid "ignore"
-msgstr "эътибор бермаш"
-
-#: standalone/draksec:44
-#, c-format
-msgid "no"
-msgstr "йўқ"
+msgid "Ignore"
+msgstr "Эътибор бермаш"
 
-#: standalone/draksec:44
-#, c-format
-msgid "yes"
-msgstr "ҳа"
-
-#. -PO: Do not alter the <span ..> and </span> tags
-#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words
-#: standalone/draksec:81
+#. -PO: Do not alter the <span ..> and </span> tags.
+#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words.
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX.
+#: standalone/draksec:101
 #, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
 "\n"
 "\n"
-"The Security Administrator is the one who will receive security alerts if "
-"the\n"
-"'Security Alerts' option is set. It can be a username or an email.\n"
+"The '<span weight=\"bold\">Security Administrator</span>' is the one who "
+"will receive security alerts if the\n"
+"'<span weight=\"bold\">Security Alerts</span>' option is set. It can be a "
+"username or an email.\n"
 "\n"
 "\n"
-"The Security Level menu allows you to select one of the six preconfigured "
-"security levels\n"
-"provided with msec. These levels range from poor security and ease of use, "
-"to\n"
-"paranoid config, suitable for very sensitive server applications:\n"
+"The '<span weight=\"bold\">Security Level</span>' menu allows you to select "
+"one of the six preconfigured security levels\n"
+"provided with msec. These levels range from '<span weight=\"bold\">poor</"
+"span>' security and ease of use, to\n"
+"'<span weight=\"bold\">paranoid</span>' config, suitable for very sensitive "
+"server applications:\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
@@ -18371,59 +19311,56 @@ msgid ""
 "maximum"
 msgstr ""
 
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"Майдонларнинг таърифи:\n"
+"\n"
+
+#: standalone/draksec:168
 #, c-format
 msgid "(default value: %s)"
 msgstr "(андоза қиймати: %s)"
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "Хавфсизлик даражаси:"
 
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "Хавфсизлик хабарномаси:"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
 msgstr "Хавфсизлик бошқарувчиси:"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, c-format
 msgid "Basic options"
 msgstr "Асосий параметрлар"
 
-#: standalone/draksec:192
-#, c-format
-msgid ""
-"The following options can be set to customize your\n"
-"system security. If you need an explanation, look at the help tooltip.\n"
-msgstr ""
-
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "Тармоқнинг параметрлари"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "Тизимнинг параметрлари"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "Даврий текширувлар"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Илтимос кутиб туринг, хавфсизлик даражаси ўрнатилмоқда"
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Илтимос кутиб туринг, хавфсизлик даражаси ўрнатилмоқда..."
@@ -18433,7 +19370,8 @@ msgstr "Илтимос кутиб туринг, хавфсизлик дараж�
 msgid "No Sound Card detected!"
 msgstr "Товуш картаси топилмади!"
 
-#: standalone/draksound:48
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/draksound:50
 #, c-format
 msgid ""
 "No Sound Card has been detected on your machine. Please verify that a Linux-"
@@ -18446,7 +19384,7 @@ msgid ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, c-format
 msgid ""
 "\n"
@@ -18485,7 +19423,7 @@ msgstr ""
 #: standalone/draksplash:72
 #, c-format
 msgid "choose image file"
-msgstr "тасвир файлини танлаш"
+msgstr "расм файлини танлаш"
 
 #: standalone/draksplash:73
 #, c-format
@@ -18500,7 +19438,7 @@ msgstr "Танлаш"
 #: standalone/draksplash:93 standalone/draksplash:158
 #, c-format
 msgid "Configure bootsplash picture"
-msgstr "Bootsplash тасвирини мослаш"
+msgstr "Bootsplash расмини мослаш"
 
 #: standalone/draksplash:96
 #, c-format
@@ -18586,204 +19524,214 @@ msgstr "Консолда белгини кўрсатиш"
 msgid "Make kernel message quiet by default"
 msgstr ""
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
 msgstr "Билдиришнома"
 
-#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:161 standalone/draksplash:309
 #, c-format
-msgid "This theme does not yet have a bootsplash in %s !"
+msgid "This theme does not yet have a bootsplash in %s!"
 msgstr "Бу мавзу учун %s'да ҳали bootsplash йўқ!"
 
 #: standalone/draksplash:167
 #, c-format
 msgid "choose image"
-msgstr "Тасвирни танлаш"
+msgstr "Расмни танлаш"
 
 #: standalone/draksplash:209
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "Bootsplash мавзуси сақланмоқда..."
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "Бажариш кўрсатгичининг рангини танлаш"
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
-msgstr "Аввало тасвир файлини танлашингиз шарт!"
+msgstr "Аввало расм файлини танлашингиз шарт!"
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
-msgstr "Олдиндан кўриб чиқиш яратилмоқда..."
+msgid "Generating preview..."
+msgstr "Кўриб чиқиш учун маълумот яратилмоқда..."
 
 #. -PO:  First %s is theme name, second %s (in parenthesis) is resolution
-#: standalone/draksplash:515
+#: standalone/draksplash:497
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s BootSplash'ни (%s) кўриб чиқиш"
 
-#: standalone/drakups:63
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/draksplash:503
+#, c-format
+msgid ""
+"The image \"%s\" cannot be load due to the following issue:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
+msgstr ""
+
+#: standalone/drakups:74
 #, c-format
 msgid "Connected through a serial port or an usb cable"
 msgstr ""
 
-#: standalone/drakups:69
+#: standalone/drakups:80
 #, c-format
 msgid "Add an UPS device"
 msgstr "UPS ускунасини қўшиш"
 
-#: standalone/drakups:72
+#: standalone/drakups:83
 #, c-format
 msgid ""
 "Welcome to the UPS configuration utility.\n"
 "\n"
-"Here, you'll be add a new UPS to your system.\n"
+"Here, you'll add a new UPS to your system.\n"
 msgstr ""
 
-#: standalone/drakups:79
+#: standalone/drakups:90
 #, c-format
 msgid ""
 "We're going to add an UPS device.\n"
 "\n"
-"Do you prefer autodetect UPS devices connected to this machine or  ?"
+"Do you want to autodetect UPS devices connected to this machine or to "
+"manually select them?"
 msgstr ""
 
-#: standalone/drakups:82
+#: standalone/drakups:93
 #, c-format
 msgid "Autodetection"
 msgstr "Авто-аниқлаш"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr "Аниқлаш кетаяпти"
 
-#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
-#: standalone/logdrake:485
+#: standalone/drakups:120 standalone/drakups:156 standalone/logdrake:449
+#: standalone/logdrake:455
 #, c-format
 msgid "Congratulations"
 msgstr "Табриклаймиз!"
 
-#: standalone/drakups:109
+#: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
 msgstr ""
 
-#: standalone/drakups:111
+#: standalone/drakups:123
 #, c-format
 msgid "No new UPS devices was found"
 msgstr "Ҳеч қандай UPS ускуна топилмади"
 
-#: standalone/drakups:116 standalone/drakups:128
+#: standalone/drakups:128 standalone/drakups:140
 #, c-format
 msgid "UPS driver configuration"
 msgstr "UPS драйверини мослаш"
 
-#: standalone/drakups:116
+#: standalone/drakups:128
 #, c-format
 msgid "Please select your UPS model."
 msgstr "Илтимос UPS моделини танланг."
 
-#: standalone/drakups:117
+#: standalone/drakups:129
 #, c-format
 msgid "Manufacturer / Model:"
 msgstr "Ишлаб чиқарувчи / модел:"
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
 "Please fill in its name, its driver and its port."
 msgstr ""
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "Номи:"
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "The name of your ups"
 msgstr "UPS номи"
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
+msgid "The driver that manages your ups"
 msgstr ""
 
-#: standalone/drakups:135
+#: standalone/drakups:147
 #, c-format
 msgid "Port:"
 msgstr "Порт:"
 
-#: standalone/drakups:137
+#: standalone/drakups:149
 #, c-format
 msgid "The port on which is connected your ups"
-msgstr "UPS уланган пoрт"
+msgstr "UPS уланган порт"
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
 msgstr ""
 
-#: standalone/drakups:232
+#: standalone/drakups:246
 #, c-format
 msgid "UPS devices"
 msgstr "UPS ускуналар"
 
-#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
-#: standalone/harddrake2:67
+#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282
+#: standalone/harddrake2:80 standalone/harddrake2:102
 #, c-format
 msgid "Name"
 msgstr "Номи"
 
-#: standalone/drakups:250
+#: standalone/drakups:265
 #, c-format
 msgid "UPS users"
 msgstr "UPS фойдаланувчилари"
 
-#: standalone/drakups:265
+#: standalone/drakups:281
 #, c-format
 msgid "Access Control Lists"
 msgstr ""
 
-#: standalone/drakups:266
+#: standalone/drakups:282
 #, c-format
 msgid "IP mask"
 msgstr ""
 
-#: standalone/drakups:277
+#: standalone/drakups:294
 #, c-format
 msgid "Rules"
 msgstr "Қоидалар"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "Action"
 msgstr "Амал"
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, c-format
 msgid "Level"
 msgstr "Даража"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "ACL name"
 msgstr "ACL номи"
 
-#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
+#: standalone/drakups:325 standalone/drakups:329 standalone/drakups:338
 #, c-format
 msgid "DrakUPS"
 msgstr "DrakUPS"
 
-#: standalone/drakups:307
+#: standalone/drakups:335
 #, c-format
 msgid "Welcome to the UPS configuration tools"
 msgstr "UPS ускунасини мослаш воситасига марҳамат"
@@ -18805,7 +19753,7 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 
 #: standalone/drakvpn:105
@@ -18830,7 +19778,7 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 
 #: standalone/drakvpn:135
@@ -18888,7 +19836,7 @@ msgstr "Кернелнинг модули."
 #: standalone/drakvpn:197
 #, c-format
 msgid ""
-"The kernel need to have ipsec support.\n"
+"The kernel needs to have ipsec support.\n"
 "\n"
 "You're running a %s kernel version.\n"
 "\n"
@@ -18913,13 +19861,13 @@ msgstr "Мослама файли"
 #: standalone/drakvpn:296
 #, c-format
 msgid ""
-"Configuration step !\n"
+"Configuration step!\n"
 "\n"
 "You need to define the Security Policies and then to \n"
 "configure the automatic key exchange (IKE) daemon. \n"
 "The KAME IKE daemon we're using is called 'racoon'.\n"
 "\n"
-"What would you like to configure ?\n"
+"What would you like to configure?\n"
 msgstr ""
 
 #: standalone/drakvpn:307
@@ -18942,12 +19890,12 @@ msgid ""
 "The %s file contents\n"
 "is divided into sections.\n"
 "\n"
-"You can now :\n"
+"You can now:\n"
 "\n"
 "  - display, add, edit, or remove sections, then\n"
 "  - commit the changes\n"
 "\n"
-"What would you like to do ?\n"
+"What would you like to do?\n"
 msgstr ""
 
 #: standalone/drakvpn:333 standalone/drakvpn:694
@@ -18990,7 +19938,7 @@ msgstr ""
 msgid ""
 "The %s file contains different sections.\n"
 "\n"
-"Here is its skeleton :\t'config setup' \n"
+"Here is its skeleton:\t'config setup' \n"
 "\t\t\t\t\t'conn default' \n"
 "\t\t\t\t\t'normal1'\n"
 "\t\t\t\t\t'normal2' \n"
@@ -19017,8 +19965,8 @@ msgstr ""
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, c-format
-msgid "Exists !"
-msgstr ""
+msgid "Exists!"
+msgstr "Мавжуд"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
 #, c-format
@@ -19221,7 +20169,7 @@ msgstr ""
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
 msgstr "Таҳрирлаб бўлмайди!"
 
 #: standalone/drakvpn:591
@@ -19229,10 +20177,10 @@ msgstr "Таҳрирлаб бўлмайди!"
 msgid ""
 "You cannot edit this section.\n"
 "\n"
-"This section is mandatory for Freswan 2.X.\n"
+"This section is mandatory for Freeswan 2.X.\n"
 "One has to specify version 2.0 on the top\n"
 "of the %s file, and eventually, disable or\n"
-"enable the oportunistic encryption.\n"
+"enable the opportunistic encryption.\n"
 msgstr ""
 
 #: standalone/drakvpn:600
@@ -19268,7 +20216,7 @@ msgstr ""
 msgid ""
 "Edit a Security Policy.\n"
 "\n"
-"You can now add a Security Policy.\n"
+"You can now edit a Security Policy.\n"
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
@@ -19293,7 +20241,7 @@ msgid ""
 "The racoon.conf file configuration.\n"
 "\n"
 "The contents of this file is divided into sections.\n"
-"You can now :\n"
+"You can now:\n"
 "  - display \t\t (display the file contents)\n"
 "  - add\t\t\t (add one section)\n"
 "  - edit \t\t\t (modify parameters of an existing section)\n"
@@ -19321,7 +20269,7 @@ msgstr ""
 msgid ""
 "The 'add' sections step.\n"
 "\n"
-"Here below is the racoon.conf file skeleton :\n"
+"Here below is the racoon.conf file skeleton:\n"
 "\t'path'\n"
 "\t'remote'\n"
 "\t'sainfo' \n"
@@ -19362,23 +20310,23 @@ msgstr ""
 #: standalone/drakvpn:750
 #, c-format
 msgid ""
-"path include path : specifies a path to include\n"
+"path include path: specifies a path to include\n"
 "a file. See File Inclusion.\n"
 "\tExample: path include '/etc/racoon'\n"
 "\n"
-"path pre_shared_key file : specifies a file containing\n"
+"path pre_shared_key file: specifies a file containing\n"
 "pre-shared key(s) for various ID(s). See Pre-shared key File.\n"
 "\tExample: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
 "\n"
-"path certificate path : racoon(8) will search this directory\n"
+"path certificate path: racoon(8) will search this directory\n"
 "if a certificate or certificate request is received.\n"
 "\tExample: path certificate '/etc/cert' ;\n"
 "\n"
-"File Inclusion : include file \n"
+"File Inclusion: include file \n"
 "other configuration files can be included.\n"
 "\tExample: include \"remote.conf\" ;\n"
 "\n"
-"Pre-shared key File : Pre-shared key file defines a pair\n"
+"Pre-shared key File: Pre-shared key file defines a pair\n"
 "of the identifier and the shared secret key which are used at\n"
 "Pre-shared key authentication method in phase 1."
 msgstr ""
@@ -19485,7 +20433,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19513,7 +20461,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19538,7 +20486,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19566,7 +20514,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19586,7 +20534,7 @@ msgid ""
 "define the group of Diffie-Hellman exponentiations.\n"
 "If you do not require PFS then you can omit this directive.\n"
 "Any proposal will be accepted if you do not specify one.\n"
-"group is one of following: modp768, modp1024, modp1536.\n"
+"group is one of the following: modp768, modp1024, modp1536.\n"
 "Or you can define 1, 2, or 5 as the DH group number."
 msgstr ""
 
@@ -19600,11 +20548,11 @@ msgstr ""
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
 "posed in the phase 1 negotiations.  Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
+"accepted, and the attribute(s) will not be proposed to\n"
 "the peer if you do not specify it(them).  They can be\n"
 "individually specified in each proposal.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
@@ -19626,18 +20574,18 @@ msgstr ""
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
 "posed in the phase 1 negotiations.  Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
+"accepted, and the attribute(s) will not be proposed to\n"
 "the peer if you do not specify it(them).  They can be\n"
 "individually specified in each proposal.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 30 sec;\n"
 "        lifetime time 30 sec;\n"
 "        lifetime time 60 sec;\n"
-"\tlifetime time 12 hour ;\n"
+"\tlifetime time 12 hour;\n"
 "\n"
 "So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and "
 "'hour'.\n"
@@ -19677,7 +20625,7 @@ msgid ""
 "ments apply to all peers which do not match any other remote\n"
 "directive.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "remote anonymous\n"
 "remote ::1 [8000]"
@@ -19802,7 +20750,7 @@ msgstr ""
 #, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
-"type to use in the phase 1 negotiation.  address, fqdn,\n"
+"type to use in the phase 1 negotiation.  address, FQDN,\n"
 "user_fqdn, keyid and asn1dn can be used as an idtype.\n"
 "they are used like:\n"
 "\tmy_identifier address [address];\n"
@@ -19811,7 +20759,7 @@ msgid ""
 "\tmy_identifier user_fqdn string;\n"
 "\t\tthe type is a USER_FQDN (user fully-qualified\n"
 "\t\tdomain name).\n"
-"\tmy_identifier fqdn string;\n"
+"\tmy_identifier FQDN string;\n"
 "\t\tthe type is a FQDN (fully-qualified domain name).\n"
 "\tmy_identifier keyid file;\n"
 "\t\tthe type is a KEY_ID.\n"
@@ -19820,7 +20768,7 @@ msgid ""
 "\t\tstring is omitted, racoon(8) will get DN from\n"
 "\t\tSubject field in the certificate.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
@@ -19840,9 +20788,9 @@ msgstr ""
 msgid ""
 "specify the encryption algorithm used for the\n"
 "phase 1 negotiation. This directive must be defined. \n"
-"algorithm is one of following: \n"
+"algorithm is one of the following: \n"
 "\n"
-"des, 3des, blowfish, cast128 for oakley.\n"
+"DES, 3DES, blowfish, cast128 for oakley.\n"
 "\n"
 "For other transforms, this statement should not be used."
 msgstr ""
@@ -19939,6 +20887,11 @@ msgstr ""
 
 #: standalone/drakvpn:1146
 #, c-format
+msgid "default"
+msgstr "андоза"
+
+#: standalone/drakvpn:1146
+#, c-format
 msgid "use"
 msgstr ""
 
@@ -19947,67 +20900,67 @@ msgstr ""
 msgid "unique"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
-msgstr "АҚСҲ (кабел)"
+msgstr "АҚШ (кабел)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
 msgstr "Канада (кабел)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
 msgstr ""
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr "Япония (кабел)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
 msgstr ""
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "West Europe"
 msgstr "Ғарбий Ойропа"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "East Europe"
 msgstr "Шарқий Ойропа"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "France [SECAM]"
 msgstr "Франция [SECAM]"
 
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
 #, c-format
 msgid "Newzealand"
 msgstr "Янги Зеландия"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr "Австралия кабел ТВ Optus"
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
@@ -20016,47 +20969,48 @@ msgstr ""
 "Илтимос\n"
 "давлатингизни ва ТВ форматингизни киритинг"
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
 msgstr "ТВ формати:"
 
-#: standalone/drakxtv:86
+#: standalone/drakxtv:88
 #, c-format
 msgid "Area:"
 msgstr ""
 
-#: standalone/drakxtv:91
+#: standalone/drakxtv:93
 #, c-format
-msgid "Scanning for TV channels in progress ..."
+msgid "Scanning for TV channels in progress..."
 msgstr ""
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr ""
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr ""
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "Кунингиз мароқли ўтсин!"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr ""
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "ТВ карта топилмади!"
 
-#: standalone/drakxtv:133
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakxtv:136
 #, c-format
 msgid ""
 "No TV Card has been detected on your machine. Please verify that a Linux-"
@@ -20069,46 +21023,23 @@ msgid ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
 msgstr "Бошқа драйверлар"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "Товуш картаси учун бошқа драйверларнинг рўйхати"
 
-#: standalone/harddrake2:22
-#, c-format
-msgid ""
-"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
-msgstr ""
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "Channel"
-msgstr "Канал"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "EIDE/SCSI channel"
-msgstr "EIDE/SCSI канал"
-
-#: standalone/harddrake2:24
-#, c-format
-msgid "Bogomips"
-msgstr "Bogomips"
-
 #: standalone/harddrake2:24
 #, c-format
 msgid ""
-"the GNU/Linux kernel needs to run a calculation loop at boot time to "
-"initialize a timer counter.  Its result is stored as bogomips as a way to "
-"\"benchmark\" the cpu."
+"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr ""
 
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
 msgstr ""
@@ -20130,130 +21061,279 @@ msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "Cache size"
-msgstr "Кэшнинг ҳажми"
+msgid "Drive capacity"
+msgstr "Ускунанинг ҳажми"
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "size of the (second level) cpu cache"
-msgstr "процессор кэшининг (иккинчи даража) ҳажми"
+msgid "special capacities of the driver (burning ability and or DVD support)"
+msgstr ""
 
 #: standalone/harddrake2:34
 #, c-format
-msgid "Drive capacity"
-msgstr "Ускунанинг ҳажми"
+msgid "this field describes the device"
+msgstr "бу майдон ускунани таърифлайди"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:35
 #, c-format
-msgid "special capacities of the driver (burning ability and or DVD support)"
+msgid "Old device file"
+msgstr "Ускунанинг эски файли"
+
+#: standalone/harddrake2:36
+#, c-format
+msgid "old static device name used in dev package"
 msgstr ""
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
 #: standalone/harddrake2:37
 #, c-format
-msgid "Coma bug"
-msgstr "Вергул хатоси"
+msgid "New devfs device"
+msgstr "Янги devfs ускунаси"
 
-#: standalone/harddrake2:37
+#: standalone/harddrake2:38
 #, c-format
-msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgid "new dynamic device name generated by core kernel devfs"
 msgstr ""
 
-#: standalone/harddrake2:38
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
 #, c-format
-msgid "Cpuid family"
-msgstr "Cpuid оиласи"
+msgid "Module"
+msgstr "Модул"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:41
 #, c-format
-msgid "family of the cpu (eg: 6 for i686 class)"
-msgstr "процессорнинг оиласи (м-н: i686 синфи учун 6)"
+msgid "the module of the GNU/Linux kernel that handles the device"
+msgstr ""
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:42
 #, c-format
-msgid "Cpuid level"
-msgstr "Cpuid' нинг даражаси"
+msgid "Extended partitions"
+msgstr "Дискнинг кенгайтирилган қисмлари"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:42
 #, c-format
-msgid "information level that can be obtained through the cpuid instruction"
-msgstr ""
+msgid "the number of extended partitions"
+msgstr "дискнинг кенгайтирилган қисмлар сони"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:43
 #, c-format
-msgid "Frequency (MHz)"
-msgstr "Частота (МГц)"
+msgid "Geometry"
+msgstr "Геометрия"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:43
 #, c-format
-msgid ""
-"the CPU frequency in MHz (Megahertz which in first approximation may be "
-"coarsely assimilated to number of instructions the cpu is able to execute "
-"per second)"
+msgid "Cylinder/head/sectors geometry of the disk"
 msgstr ""
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:44
 #, c-format
-msgid "this field describes the device"
-msgstr "бу майдон ускунани таърифлайди"
+msgid "Disk controller"
+msgstr "Диск контроллери"
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:44
 #, c-format
-msgid "Old device file"
-msgstr "Ускунанинг эски файли"
+msgid "the disk controller on the host side"
+msgstr ""
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:45
 #, c-format
-msgid "old static device name used in dev package"
-msgstr ""
+msgid "class of hardware device"
+msgstr "асбоб-ускунаниг синфи"
 
-#: standalone/harddrake2:44
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
 #, c-format
-msgid "New devfs device"
-msgstr "Янги devfs ускунаси"
+msgid "Model"
+msgstr "Модел"
 
-#: standalone/harddrake2:45
+#: standalone/harddrake2:46
 #, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr ""
+msgid "hard disk model"
+msgstr "қаттиқ дискнинг модели"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "тармоқдаги принтернинг порти"
 
-#. -PO: here "module" is the "jargon term" for a kernel driver
 #: standalone/harddrake2:48
 #, c-format
-msgid "Module"
-msgstr "Модул"
+msgid "Primary partitions"
+msgstr "Дискнинг асосий қисмлари"
 
 #: standalone/harddrake2:48
 #, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr ""
+msgid "the number of the primary partitions"
+msgstr "дискнинг асосий қисмлар сони"
 
 #: standalone/harddrake2:49
 #, c-format
-msgid "Extended partitions"
-msgstr "Дискнинг кенгайтирилган қисмлари"
+msgid "the vendor name of the device"
+msgstr "Ускунани ишлаб чиқарган фирманинг номи"
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:50
 #, c-format
-msgid "the number of extended partitions"
-msgstr "дискнинг кенгайтирилган қисмлар сони"
+msgid "Bus PCI #"
+msgstr ""
 
 #: standalone/harddrake2:50
 #, c-format
+msgid "the PCI bus on which the device is plugged"
+msgstr ""
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device #"
+msgstr "PCI ускуна #"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device number"
+msgstr "PCI ускунанинг рақами"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function #"
+msgstr ""
+
+#: standalone/harddrake2:52
+#, fuzzy, c-format
+msgid "PCI function number"
+msgstr "Уланишнинг номи"
+
+#: standalone/harddrake2:53
+#, fuzzy, c-format
+msgid "Vendor ID"
+msgstr "Ишлаб чиқарувчи"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "this is the standard numerical identifier of the vendor"
+msgstr ""
+
+#: standalone/harddrake2:54
+#, fuzzy, c-format
+msgid "Device ID"
+msgstr "Ускуна: "
+
+#: standalone/harddrake2:54
+#, fuzzy, c-format
+msgid "this is the numerical identifier of the device"
+msgstr "Ускунани ишлаб чиқарган фирманинг номи"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "Sub vendor ID"
+msgstr ""
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "this is the minor numerical identifier of the vendor"
+msgstr ""
+
+#: standalone/harddrake2:56
+#, fuzzy, c-format
+msgid "Sub device ID"
+msgstr "UPS ускуналар"
+
+#: standalone/harddrake2:56
+#, fuzzy, c-format
+msgid "this is the minor numerical identifier of the device"
+msgstr "Ускунани ишлаб чиқарган фирманинг номи"
+
+#: standalone/harddrake2:57
+#, fuzzy, c-format
+msgid "Device USB ID"
+msgstr "Ускуна: "
+
+#: standalone/harddrake2:57
+#, c-format
+msgid ".."
+msgstr ""
+
+#: standalone/harddrake2:61
+#, c-format
+msgid "Bogomips"
+msgstr "Bogomips"
+
+#: standalone/harddrake2:61
+#, c-format
+msgid ""
+"the GNU/Linux kernel needs to run a calculation loop at boot time to "
+"initialize a timer counter.  Its result is stored as bogomips as a way to "
+"\"benchmark\" the cpu."
+msgstr ""
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "Cache size"
+msgstr "Кэшнинг ҳажми"
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "size of the (second level) cpu cache"
+msgstr "процессор кэшининг (иккинчи даража) ҳажми"
+
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
+#: standalone/harddrake2:65
+#, c-format
+msgid "Coma bug"
+msgstr "Вергул хатоси"
+
+#: standalone/harddrake2:65
+#, c-format
+msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr ""
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "Cpuid family"
+msgstr "Cpuid оиласи"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "family of the cpu (eg: 6 for i686 class)"
+msgstr "процессорнинг оиласи (м-н: i686 синфи учун 6)"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "Cpuid level"
+msgstr "Cpuid' нинг даражаси"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "information level that can be obtained through the cpuid instruction"
+msgstr ""
+
+#: standalone/harddrake2:68
+#, c-format
+msgid "Frequency (MHz)"
+msgstr "Частота (МГц)"
+
+#: standalone/harddrake2:68
+#, c-format
+msgid ""
+"the CPU frequency in MHz (Megahertz which in first approximation may be "
+"coarsely assimilated to number of instructions the cpu is able to execute "
+"per second)"
+msgstr ""
+
+#: standalone/harddrake2:69
+#, c-format
 msgid "Flags"
 msgstr "Байроқлар"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr ""
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
 #, c-format
 msgid "Fdiv bug"
 msgstr "Fdiv хатоси"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -20261,236 +21341,292 @@ msgid ""
 "Floating point DIVision (FDIV)"
 msgstr ""
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "Is FPU present"
 msgstr "FPU мавжудми"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr ""
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr ""
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "F00f bug"
 msgstr "F00f хатоси"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:75
 #, c-format
-msgid "Geometry"
-msgstr "Геометрия"
+msgid "Halt bug"
+msgstr "Halt хатоси"
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:76
 #, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
+msgid ""
+"Some of the early i486DX-100 chips cannot reliably return to operating mode "
+"after the \"halt\" instruction is used"
 msgstr ""
 
-#: standalone/harddrake2:57
+#: standalone/harddrake2:77
 #, c-format
-msgid "Halt bug"
-msgstr "Halt хатоси"
+msgid "sub generation of the cpu"
+msgstr ""
+
+#: standalone/harddrake2:78
+#, c-format
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
+msgstr "процессорнинг авлоди (м-н: Pentium III учун 8,...)"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "Model name"
+msgstr "Моделнинг номи"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "official vendor name of the cpu"
+msgstr "процессор ишлаб чиқарувчининг расмий номи"
+
+#: standalone/harddrake2:80
+#, c-format
+msgid "the name of the CPU"
+msgstr "процессорнинг номи"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:81
+#, c-format
+msgid "Processor ID"
+msgstr "Процессорнинг ИД-си"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "the number of the processor"
+msgstr "процессорлар сони"
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "Model stepping"
+msgstr ""
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "stepping of the cpu (sub model (generation) number)"
+msgstr ""
+
+#: standalone/harddrake2:83
+#, c-format
+msgid "the vendor name of the processor"
+msgstr "Процессорни ишлаб чиқарган фирманинг номи"
+
+#: standalone/harddrake2:84
+#, c-format
+msgid "Write protection"
+msgstr "Ёзишдан ҳимоялаш"
+
+#: standalone/harddrake2:84
 #, c-format
 msgid ""
-"Some of the early i486DX-100 chips cannot reliably return to operating mode "
-"after the \"halt\" instruction is used"
+"the WP flag in the CR0 register of the cpu enforce write protection at the "
+"memory page level, thus enabling the processor to prevent unchecked kernel "
+"accesses to user memory (aka this is a bug guard)"
 msgstr ""
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:88
 #, c-format
 msgid "Floppy format"
 msgstr "Дискетнинг формати"
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:88
 #, c-format
 msgid "format of floppies supported by the drive"
 msgstr ""
 
-#: standalone/harddrake2:61
+#: standalone/harddrake2:92
 #, c-format
-msgid "sub generation of the cpu"
-msgstr ""
+msgid "Channel"
+msgstr "Канал"
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:92
 #, c-format
-msgid "class of hardware device"
-msgstr "асбоб-ускунаниг синфи"
+msgid "EIDE/SCSI channel"
+msgstr "EIDE/SCSI канал"
 
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
+#: standalone/harddrake2:93
 #, c-format
-msgid "Model"
-msgstr "Модел"
+msgid "Disk identifier"
+msgstr ""
 
-#: standalone/harddrake2:63
+#: standalone/harddrake2:93
 #, c-format
-msgid "hard disk model"
-msgstr "қаттиқ дискнинг модели"
+msgid "usually the disk serial number"
+msgstr ""
 
-#: standalone/harddrake2:64
-#, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
-msgstr "процессорнинг авлоди (м-н: PentiumIII учун 8,...)"
+#: standalone/harddrake2:94
+#, fuzzy, c-format
+msgid "Logical unit number"
+msgstr "Локал принтер"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:94
 #, c-format
-msgid "Model name"
-msgstr "Моделнинг номи"
+msgid ""
+"the SCSI target number (LUN). SCSI devices connected to a host are uniquely "
+"identified by a\n"
+"channel number, a target id and a logical unit number"
+msgstr ""
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:99
 #, c-format
-msgid "official vendor name of the cpu"
-msgstr "процессор ишлаб чиқарувчининг расмий номи"
+msgid "Device file"
+msgstr "Ускунанинг файли"
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:99
 #, c-format
-msgid "Number of buttons"
-msgstr "Тугмалар сони"
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr ""
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:100
 #, c-format
-msgid "the number of buttons the mouse has"
-msgstr "сичқончадаги тугмалар сони"
+msgid "Emulated wheel"
+msgstr ""
 
-#: standalone/harddrake2:67
+#: standalone/harddrake2:100
 #, c-format
-msgid "the name of the CPU"
-msgstr "процессорнинг номи"
+msgid "whether the wheel is emulated or not"
+msgstr ""
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:101
 #, c-format
-msgid "network printer port"
-msgstr "тармоқдаги принтернинг порти"
+msgid "the type of the mouse"
+msgstr "сичқончанинг тури"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:102
 #, c-format
-msgid "Processor ID"
-msgstr "Процессорнинг ИД-си"
+msgid "the name of the mouse"
+msgstr "сичқончанинг номи"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:103
 #, c-format
-msgid "the number of the processor"
-msgstr "процессорлар сони"
+msgid "Number of buttons"
+msgstr "Тугмалар сони"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:103
 #, c-format
-msgid "Primary partitions"
-msgstr "Дискнинг асосий қисмлари"
+msgid "the number of buttons the mouse has"
+msgstr "сичқончадаги тугмалар сони"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:104
 #, c-format
-msgid "the number of the primary partitions"
-msgstr "дискнинг асосий қисмлар сони"
+msgid "the type of bus on which the mouse is connected"
+msgstr ""
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:105
 #, c-format
-msgid "Model stepping"
+msgid "Mouse protocol used by X11"
 msgstr ""
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:105
 #, c-format
-msgid "stepping of the cpu (sub model (generation) number)"
+msgid "the protocol that the graphical desktop use with the mouse"
 msgstr ""
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
+#, fuzzy, c-format
+msgid "Identification"
+msgstr "тасдиқлаш"
+
+#: standalone/harddrake2:113 standalone/harddrake2:129
 #, c-format
-msgid "the type of bus on which the mouse is connected"
-msgstr ""
+msgid "Connection"
+msgstr "Уланиш"
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:122
 #, c-format
-msgid "the vendor name of the device"
-msgstr "Ускунани ишлаб чиқарган фирманинг номи"
+msgid "Performances"
+msgstr "Унумдорлик"
 
-#: standalone/harddrake2:74
+#: standalone/harddrake2:123
 #, c-format
-msgid "the vendor name of the processor"
-msgstr "Процессорни ишлаб чиқарган фирманинг номи"
+msgid "Bugs"
+msgstr "Хатолар"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:124
 #, c-format
-msgid "Write protection"
-msgstr "Ёзишдан ҳимоялаш"
+msgid "FPU"
+msgstr ""
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:132
 #, c-format
-msgid ""
-"the WP flag in the CR0 register of the cpu enforce write proctection at the "
-"memory page level, thus enabling the processor to prevent unchecked kernel "
-"accesses to user memory (aka this is a bug guard)"
+msgid "Partitions"
+msgstr "Дискнинг қисмлари"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
 msgstr ""
 
-#. -PO: please keep all "/" charaters !!!
-#: standalone/harddrake2:90 standalone/logdrake:78 standalone/printerdrake:146
-#: standalone/printerdrake:159
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/_Параметрлар"
 
-#: standalone/harddrake2:91 standalone/harddrake2:112 standalone/logdrake:80
-#: standalone/printerdrake:171 standalone/printerdrake:172
-#: standalone/printerdrake:173 standalone/printerdrake:174
+#: standalone/harddrake2:159 standalone/harddrake2:180 standalone/logdrake:79
+#: standalone/printerdrake:177 standalone/printerdrake:178
+#: standalone/printerdrake:179 standalone/printerdrake:180
 #, c-format
 msgid "/_Help"
 msgstr "/_Ёрдам"
 
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
 #, c-format
 msgid "/Autodetect _printers"
 msgstr "/Принтерларни _авто-аниқлаш"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/_Модемларни авто-аниқлаш"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/_Jaz ускуналарини авто-аниқлаш"
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
 #, c-format
 msgid "/_Quit"
 msgstr "/Чи_қиш"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, c-format
 msgid "/_Fields description"
 msgstr "/_Майдонлар таърифи"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr "Harddrake ёрдам"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"Майдонларнинг таърифи:\n"
-"\n"
-
-#: standalone/harddrake2:121
+#: standalone/harddrake2:192
 #, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
@@ -20499,68 +21635,75 @@ msgstr ""
 "Ускунани танласангиз, ўнг тарафдаги \"Маълумот\" фреймида у ҳақида "
 "маълумотни кўришингиз мумкин"
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Хато ҳақида хабар қилиш"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
 #, c-format
 msgid "/_About..."
 msgstr "/_Ҳақида"
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
 msgstr "Harddrake ҳақида"
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:130
+#: standalone/harddrake2:201
 #, c-format
 msgid ""
-"This is HardDrake, a Mandrake hardware configuration tool.\n"
+"This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"HardDrake - Mandrake учун асбоб-ускуналарни мословчи восита.\n"
+"HardDrake - Mandrakelinux учун асбоб-ускуналарни мословчи восита.\n"
 "<span foreground=\"royalblue3\">Версия:</span> %s\n"
 "<span foreground=\"royalblue3\">Муаллиф:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:147
+#: standalone/harddrake2:218
 #, c-format
-msgid "Harddrake2 version %s"
-msgstr "Harddrake2 - версия %s"
+msgid "Harddrake2"
+msgstr "Harddrake2"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
 msgstr "Аниқланган асбоб-ускуналар"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "Модулни мослаш"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr "Мослаш воситасини ишга тушириш"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "номаълум"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "Номаълум"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, c-format
+msgid "Misc"
+msgstr "Хар ҳил"
+
+#: standalone/harddrake2:332
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
@@ -20568,184 +21711,189 @@ msgstr ""
 "Ускуна ҳақида маълумотни бу ерда кўриш учун уни чап тарафдаги рўйхатдан "
 "танланг."
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "secondary"
 msgstr "Иккиламчи"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
 msgstr "Асосий"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "burner"
 msgstr ""
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "DVD"
 msgstr "DVD"
 
-#: standalone/keyboarddrake:24
+#: standalone/keyboarddrake:25
 #, c-format
 msgid "Please, choose your keyboard layout."
 msgstr "Илтимос тугмалар тартибини танланг."
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr ""
 
-#: standalone/localedrake:60
+#: standalone/localedrake:38
+#, c-format
+msgid "LocaleDrake"
+msgstr "LocaleDrake"
+
+#: standalone/localedrake:67
 #, c-format
 msgid "The change is done, but to be effective you must logout"
 msgstr ""
 "Ўзгаришлар бажарилди, аммо амалда тўлиқ қўлланилиши учун сиз чиқишингиз "
 "керак."
 
-#: standalone/logdrake:51
-#, c-format
-msgid "Mandrake Tools Logs"
-msgstr ""
+#: standalone/logdrake:50
+#, fuzzy, c-format
+msgid "Mandrakelinux Tools Logs"
+msgstr "Mandrakelinux бошқарув маркази"
 
-#: standalone/logdrake:52
+#: standalone/logdrake:51
 #, c-format
 msgid "Logdrake"
 msgstr "Logdrake"
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Фақат танланган кун учун кўрсатиш"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr "/Файл/_Янги"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "<control>N"
 msgstr "<control>Н"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_Open"
 msgstr "/Файл/_Очиш"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "<control>O"
 msgstr "<control>О"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "/File/_Save"
 msgstr "/Файл/_Сақлаш"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>S"
 msgstr "<control>С"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:74
 #, c-format
 msgid "/File/Save _As"
 msgstr "/Файл/...сифатида с_ақлаш"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr "/Файл/-"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
 msgstr "/Параметрлар/Синаш"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Ёрдам/_Ҳақида"
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr "Тасдиқлаш"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr "Фойдаланувчи"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr "Хабарлар"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr ""
 
-#: standalone/logdrake:117
+#: standalone/logdrake:116
 #, c-format
 msgid "search"
 msgstr "Қидириш"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Логларни назорат қилиш учун восита"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "Мосламалар"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "Мос келадиган"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "мос келмайдиган"
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "Файлни танлаш"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "Календар"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "Файлнинг таркиби"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr "Хат орқали хабар бериш"
 
-#: standalone/logdrake:170
+#: standalone/logdrake:169
 #, c-format
-msgid "The alert wizard had unexpectly failled:"
+msgid "The alert wizard has failed unexpectedly:"
 msgstr ""
 
 #: standalone/logdrake:221
@@ -20753,62 +21901,57 @@ msgstr ""
 msgid "please wait, parsing file: %s"
 msgstr ""
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache веб-сервери"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
 msgstr ""
 
-#: standalone/logdrake:408
+#: standalone/logdrake:378
 #, c-format
 msgid "Ftp Server"
 msgstr "FTP сервери"
 
-#: standalone/logdrake:409
+#: standalone/logdrake:379
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfix хат-хабар сервери"
 
-#: standalone/logdrake:410
+#: standalone/logdrake:380
 #, c-format
 msgid "Samba Server"
 msgstr "Samba сервери"
 
-#: standalone/logdrake:411
-#, c-format
-msgid "SSH Server"
-msgstr "SSH сервери"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin хизмати"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd хизмати"
 
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, c-format
 msgid "Configure the mail alert system"
 msgstr ""
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr ""
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Хат орқали хабар беришни мослаш"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -20816,66 +21959,66 @@ msgid ""
 "Here, you'll be able to set up the alert system.\n"
 msgstr ""
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, c-format
 msgid "What do you want to do?"
 msgstr "Сиз нима қилмоқчисиз?"
 
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, c-format
 msgid "Services settings"
 msgstr "Хизматларнинг мосламаси"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
 msgstr "Агар танланган хизматларнинг иши тўхтаса сизга хабар жўнатилади"
 
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
 msgstr "Мосламаларни юкаш"
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr ""
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "Юкланганлиги"
 
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, c-format
 msgid "Alert configuration"
 msgstr ""
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Илтимос электрон почтангизни киритинг"
 
-#: standalone/logdrake:460
+#: standalone/logdrake:430
 #, c-format
-msgid "and enter the name (or the IP) of the SMTP server you whish to use"
+msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr ""
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr ""
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr ""
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "...сифатида сақлаш"
@@ -20900,27 +22043,74 @@ msgstr "Сичқончани синаш"
 msgid "Please test your mouse:"
 msgstr "Илтимос сичқончани синаб кўринг:"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, fuzzy, c-format
+msgid "Network is up on interface %s"
+msgstr "Тармоқнинг интерфейси"
+
+#. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
+#: standalone/net_applet:38
+#, fuzzy, c-format
+msgid "Network is down on interface %s. Click on \"Configure Network\""
+msgstr "Тармоқ мосланмаган"
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "%s-ни улаш"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr ""
+
+#: standalone/net_applet:55
+#, c-format
+msgid "Monitor Network"
+msgstr "Тармоқни назорат қилиш"
+
+#: standalone/net_applet:56
+#, c-format
+msgid "Configure Network"
+msgstr "Тармоқни мослаш"
+
+#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
+#: standalone/net_applet:57 standalone/printerdrake:245
+#, c-format
+msgid "Refresh"
+msgstr "Янгилаш"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr ""
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr ""
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
 msgstr "Тармоқни назорат қилиш"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr "Умумий статистика"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
 msgstr ""
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Average"
 msgstr "Ўртача"
 
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
 #, c-format
 msgid ""
 "Sending\n"
@@ -20929,7 +22119,7 @@ msgstr ""
 "Жўнатиш\n"
 "тезлиги:"
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, c-format
 msgid ""
 "Receiving\n"
@@ -20938,7 +22128,7 @@ msgstr ""
 "Қабул қилиш\n"
 "тезлиги:"
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, c-format
 msgid ""
 "Connection\n"
@@ -20947,254 +22137,244 @@ msgstr ""
 "Уланиш\n"
 "вақти: "
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr ""
+
+#: standalone/net_monitor:139
 #, c-format
 msgid "Wait please, testing your connection..."
 msgstr "Илтимос кутиб туринг, алоқа синаб кўрилмоқда..."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Disconnecting from Internet "
 msgstr "Интернет билан алоқа узилмоқда"
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Connecting to Internet "
 msgstr "Интернетга уланилмоқда "
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, c-format
 msgid "Disconnection from Internet failed."
 msgstr "Интернетдан узилиш муваффақиятсиз тугади."
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, c-format
 msgid "Disconnection from Internet complete."
 msgstr "Интернетдан узилиш бажарилди."
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, c-format
 msgid "Connection complete."
 msgstr "Алоқа ўрнатилди."
 
-#: standalone/net_monitor:198
+#: standalone/net_monitor:236
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
+"Verify your configuration in the Mandrakelinux Control Center."
 msgstr ""
-"Уланиш муваффақиятсиз тугади.\n"
-"Мосламангизни Mandrake бошқарув марказида текширинг."
+"Алоқа ўрнатиш муваффақиятсиз тугади.\n"
+"Мосламани Mandrakelinux бошқарув марказида текширинг."
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "Рангни мослаш"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "жўнатилган: "
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "қабул қилинган: "
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr "ўртачаси"
 
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, c-format
 msgid "Local measure"
 msgstr "Локал кўрсатгич"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "жўнатилган"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "қабул қилинган"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr ""
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Connect %s"
-msgstr "%s-ни улаш"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, c-format
 msgid "No internet connection configured"
 msgstr "Интернетга уланиш мосланмаган"
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr "Принтернинг мосламалари юкланмоқда, илтимос кутиб туринг..."
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "Ўрнатилган принтерлар ҳақида маълумот ўқилмоқда..."
 
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr "%s принтерни бошқариш учун восита"
 
-#: standalone/printerdrake:143 standalone/printerdrake:144
-#: standalone/printerdrake:145 standalone/printerdrake:153
-#: standalone/printerdrake:154 standalone/printerdrake:158
+#: standalone/printerdrake:148 standalone/printerdrake:149
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:159 standalone/printerdrake:160
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Actions"
 msgstr "/_Амаллар"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_Принтерни қўшиш"
+
+#: standalone/printerdrake:149
 #, c-format
 msgid "/Set as _Default"
 msgstr "/_Андоза деб белгилаш"
 
-#: standalone/printerdrake:144
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_Edit"
 msgstr "/_Тузатиш"
 
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
 #, c-format
 msgid "/_Delete"
 msgstr "/_Ўчириш"
 
-#: standalone/printerdrake:146
+#: standalone/printerdrake:152
 #, c-format
 msgid "/_Expert mode"
 msgstr "/_Эксперт усули"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Янгилаш"
 
-#: standalone/printerdrake:154
-#, c-format
-msgid "/_Add Printer"
-msgstr "/_Принтерни қўшиш"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/CUPS'ни _мослаш"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, c-format
 msgid "Search:"
 msgstr "Қидириш:"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr "Филтерни қўллаш"
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Def."
 msgstr ""
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Printer Name"
 msgstr "Принтернинг номи"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, c-format
 msgid "Connection Type"
 msgstr "Уланишнинг тури"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, c-format
 msgid "Server Name"
 msgstr "Сервернинг номи"
 
 #. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add Printer"
 msgstr "Принтерни қўшиш"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "Тизимга янги принтерни қўшиш"
 
 #. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set as default"
 msgstr "Андоза деб белгилаш"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "Белгиланган принтерни андоза деб белгилаш"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit selected printer"
 msgstr "Белгиланган принтерни тузатиш"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, c-format
 msgid "Delete selected printer"
 msgstr "Белгиланган принтерни ўчириш"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, c-format
-msgid "Refresh"
-msgstr "Янгилаш"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, c-format
 msgid "Refresh the list"
 msgstr "Рўйхатни янгилаш"
 
 #. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS"
 msgstr "CUPS'ни мослаш"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "CUPS босиб чиқариш тизимини мослаш"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, c-format
+msgid "Enabled"
+msgstr "Ёқилган"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "Ўчирилган"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "Муаллифлар: "
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, c-format
 msgid "Printer Management \n"
 msgstr "Принтер бошқаруви\n"
 
-#: standalone/scannerdrake:50
+#: standalone/scannerdrake:51
 #, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
@@ -21205,176 +22385,165 @@ msgstr ""
 "\n"
 "Уларни ўрнатишни истайсизми?"
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:55
 #, c-format
 msgid "Aborting Scannerdrake."
 msgstr "Scannerdrake тўхтатилмоқда."
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr ""
 
-#: standalone/scannerdrake:66 standalone/scannerdrake:464
+#: standalone/scannerdrake:67 standalone/scannerdrake:460
 #, c-format
-msgid "Searching for configured scanners ..."
+msgid "Searching for configured scanners..."
 msgstr "Мосланган сканнерлар қидирилмоқда..."
 
-#: standalone/scannerdrake:70 standalone/scannerdrake:468
+#: standalone/scannerdrake:71 standalone/scannerdrake:464
 #, c-format
-msgid "Searching for new scanners ..."
+msgid "Searching for new scanners..."
 msgstr "Янги сканнерлар қидирилмоқда..."
 
-#: standalone/scannerdrake:78 standalone/scannerdrake:490
+#: standalone/scannerdrake:79 standalone/scannerdrake:486
 #, c-format
-msgid "Re-generating list of configured scanners ..."
+msgid "Re-generating list of configured scanners..."
 msgstr "Мосланган сканнерларнинг рўйхати бошқадан яратилмоқда..."
 
-#: standalone/scannerdrake:100 standalone/scannerdrake:141
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:101 standalone/scannerdrake:142
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr ""
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "%s %s'да топилди, уни автоматик равишда мослайми?"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr ""
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, c-format
 msgid "Select a scanner model"
 msgstr "Сканнернинг моделини танланг"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, c-format
 msgid "Detected model: %s"
 msgstr "Аниқланган модел: %s"
 
-#: standalone/scannerdrake:134
-#, c-format
-msgid ", "
-msgstr ", "
-
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:136
 #, c-format
 msgid "Port: %s"
 msgstr "Порт: %s"
 
-#: standalone/scannerdrake:161
-#, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr "%s Scannerdrake дастурининг бу версиясига маълум эмас."
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr ""
 
-#: standalone/scannerdrake:173 standalone/scannerdrake:225
+#: standalone/scannerdrake:169 standalone/scannerdrake:221
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
 "it is turned on."
 msgstr ""
 
-#: standalone/scannerdrake:174 standalone/scannerdrake:226
+#: standalone/scannerdrake:170 standalone/scannerdrake:222
 #, c-format
 msgid "If this is the case, you can make this be done automatically."
 msgstr ""
 
-#: standalone/scannerdrake:175 standalone/scannerdrake:229
+#: standalone/scannerdrake:171 standalone/scannerdrake:225
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:176 standalone/scannerdrake:230
+#: standalone/scannerdrake:172 standalone/scannerdrake:226
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
 "manufacturer's home page, or on your Windows partition."
 msgstr ""
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr ""
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, c-format
 msgid "Select firmware file"
 msgstr ""
 
-#: standalone/scannerdrake:201 standalone/scannerdrake:260
+#: standalone/scannerdrake:197 standalone/scannerdrake:256
 #, c-format
 msgid "The firmware file %s does not exist or is unreadable!"
 msgstr ""
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr ""
 
-#: standalone/scannerdrake:228
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
 "firmware here by supplying the new firmware file."
 msgstr ""
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
 msgstr ""
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr ""
 
-#: standalone/scannerdrake:274
+#: standalone/scannerdrake:270
 #, c-format
 msgid "Could not install the firmware file for the %s!"
 msgstr ""
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr ""
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
 msgstr "%s қўлланмаган"
 
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -21384,33 +22553,33 @@ msgstr ""
 "Printerdrake дастурини Mandrake бошқарув марказининг \"Асбоб-ускуналар\" "
 "бўлимидаги \"%s\" бандидан ишга туширишингиз мумкин."
 
-#: standalone/scannerdrake:306 standalone/scannerdrake:313
-#: standalone/scannerdrake:343
+#: standalone/scannerdrake:302 standalone/scannerdrake:309
+#: standalone/scannerdrake:339
 #, c-format
 msgid "Auto-detect available ports"
 msgstr "Мавжуд портларни автоматик равишда топиш"
 
-#: standalone/scannerdrake:308 standalone/scannerdrake:354
+#: standalone/scannerdrake:304 standalone/scannerdrake:350
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr "Илтимос %s уланган ускунани танланг"
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Изоҳ: Параллел портларни авто-аниқлаб бўлмайди)"
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
 msgstr "ускунани танланг"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
 msgstr "Сканнерлар қидирилмоқда..."
 
-#: standalone/scannerdrake:380
+#: standalone/scannerdrake:376
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -21421,7 +22590,7 @@ msgstr ""
 "Ҳужжатларни дастурлар менюсидаги Мултимедиа/Графикада жойлашган \"XSane\" "
 "ёки \"Kooka\" ёрдамида скан қилиш мумкин"
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -21432,9 +22601,9 @@ msgstr ""
 "Қуйидаги сканнерлар\n"
 "\n"
 "%s\n"
-"системангизда мавжуд.\n"
+"компьютерда мавжуд.\n"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -21445,44 +22614,44 @@ msgstr ""
 "Қуйидаги сканнер\n"
 "\n"
 "%s\n"
-"системангизда мавжуд.\n"
+"компьютерда мавжуд.\n"
 
-#: standalone/scannerdrake:408 standalone/scannerdrake:411
+#: standalone/scannerdrake:404 standalone/scannerdrake:407
 #, c-format
 msgid "There are no scanners found which are available on your system.\n"
 msgstr "Тизимда мавжуд бўлган сканнер топилмади.\n"
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, c-format
 msgid "Search for new scanners"
 msgstr "Янги сканнерларни қидириш"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
 msgstr ""
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, c-format
 msgid "Install/Update firmware files"
 msgstr ""
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, c-format
 msgid "Scanner sharing"
 msgstr ""
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, c-format
 msgid "All remote machines"
 msgstr "Масофадаги ҳамма компьютерлар"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, c-format
 msgid "This machine"
 msgstr "Шу компьютер"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -21491,96 +22660,96 @@ msgstr ""
 "Бу ерда, бу компьютерга уланган сканнердан бошқа компьютер ва қайси "
 "компьютер фойдаланса бўладими-йўқми танлашингиз мумкин."
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
 "available on this machine."
 msgstr ""
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "Бу компьютердаги сканнерларни бошқа компьютерлардан ҳам ишлатса бўлади"
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr ""
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Масофадаги компьютерлардаги сканнерлардан фойдаланиш"
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Қуйидаги компьютерлардаги сканнерлардан фойдаланиш:"
 
-#: standalone/scannerdrake:605 standalone/scannerdrake:677
-#: standalone/scannerdrake:827
+#: standalone/scannerdrake:601 standalone/scannerdrake:673
+#: standalone/scannerdrake:823
 #, c-format
 msgid "Sharing of local scanners"
 msgstr ""
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
 "available:"
 msgstr ""
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, c-format
 msgid "Add host"
 msgstr "Компьютерни қўшиш"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "Танланган компьютерни тузатиш"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, c-format
 msgid "Remove selected host"
 msgstr "Танланган компьютерни олиб ташлаш"
 
-#: standalone/scannerdrake:656 standalone/scannerdrake:664
-#: standalone/scannerdrake:669 standalone/scannerdrake:715
-#: standalone/scannerdrake:806 standalone/scannerdrake:814
-#: standalone/scannerdrake:819 standalone/scannerdrake:865
+#: standalone/scannerdrake:652 standalone/scannerdrake:660
+#: standalone/scannerdrake:665 standalone/scannerdrake:711
+#: standalone/scannerdrake:802 standalone/scannerdrake:810
+#: standalone/scannerdrake:815 standalone/scannerdrake:861
 #, c-format
 msgid "Name/IP address of host:"
 msgstr "Компьютернинг номи/IP рақами:"
 
-#: standalone/scannerdrake:678 standalone/scannerdrake:828
+#: standalone/scannerdrake:674 standalone/scannerdrake:824
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
 msgstr ""
 
-#: standalone/scannerdrake:689 standalone/scannerdrake:839
+#: standalone/scannerdrake:685 standalone/scannerdrake:835
 #, c-format
 msgid "You must enter a host name or an IP address.\n"
 msgstr "Компьютернинг номини ёки IP рақамини киритишингиз керак.\n"
 
-#: standalone/scannerdrake:700 standalone/scannerdrake:850
+#: standalone/scannerdrake:696 standalone/scannerdrake:846
 #, c-format
 msgid "This host is already in the list, it cannot be added again.\n"
 msgstr ""
 "Бу компьютернинг номи рўйхатда аллақачон бор, уни яна қўшиб бўлмайди.\n"
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Масофадаги сканнерлардан фойдаланиш"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "Сканнерлардан фойдаланиб бўладиган компьютерлар:"
 
-#: standalone/scannerdrake:913
+#: standalone/scannerdrake:909
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -21591,32 +22760,32 @@ msgstr ""
 "\n"
 "Уни ўрнатишни истайсизми?"
 
-#: standalone/scannerdrake:917 standalone/scannerdrake:921
+#: standalone/scannerdrake:913 standalone/scannerdrake:917
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr "Сканнер(лар)ни тармоқ орқали ишлатиб бўлмайди."
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "\"%s\" асбоб-ускуна синфидаги баъзи бир ускуналар олиб ташланди:\n"
 
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:105
 #, c-format
 msgid "- %s was removed\n"
 msgstr ""
 
-#: standalone/service_harddrake:66
+#: standalone/service_harddrake:108
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr "Баъзи бир ускуналар қўшилди: %s\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
 msgstr ""
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Асбоб-ускуналарни аниқлаш кетаяпти"
@@ -21628,7 +22797,7 @@ msgstr ""
 
 #: standalone/service_harddrake_confirm:8
 #, c-format
-msgid "Do you want to run the appropriate config tool ?"
+msgid "Do you want to run the appropriate config tool?"
 msgstr "Мослаш воситасини ишга туширишни истайсизми?"
 
 #: steps.pm:14
@@ -21699,7 +22868,7 @@ msgstr "Тармоқни мослаш"
 #: steps.pm:28
 #, c-format
 msgid "Install bootloader"
-msgstr "ОС юклагичини ўрнатиш"
+msgstr "ОТ юклагичини ўрнатиш"
 
 #: steps.pm:29
 #, c-format
@@ -21721,22 +22890,22 @@ msgstr "Янгиланишларни ўрнатиш"
 msgid "Exit install"
 msgstr "Ўрнатишдан чиқиш"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "Бу тўғрими?"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "Рўйхатни ёйиш"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "Рўйхатни йиғиш"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr ""
@@ -21748,170 +22917,9 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 "%s ўрнатилмаган\n"
-"Ўрнатиш учун \"Кейингиси\" ёки чиқиш учун \"Бекор қилиш\" тугмасини босинг"
+"Ўрнатиш учун \"Кейинги\" ёки чиқиш учун \"Бекор қилиш\" тугмасини босинг"
 
 #: wizards.pm:99
 #, c-format
 msgid "Installation failed"
 msgstr "Ўрнатиш муваффақиятсиз тугади"
-
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Идора станцияси"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Идора учун дастурлар: матн процессорлари (kword, abiword), электрон "
-"жадваллар (kspread, gnumeric), PDF кўрувчилар ва ҳоказо"
-
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Ўйин станцияси"
-
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Овунчоқ дастурлар: аркада, стол ўйинлари, стратегия ва ҳоказо"
-
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Мултимедиа станцияси"
-
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Аудио ва видеони ўйнаш/таҳрирлаш учун дастурлар"
-
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Интернет станцияси"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Хат-хабар, янгиликларни ўқиш ва жўнатиш (mutt, tin..) ва Интернетда сайр "
-"қилиш учун воситалар тўплами"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Тармоқдаги принтер (клиент)"
-
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Турли протоколлар, шу жумлада SSH, учун клиентлар"
-
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Мослаш"
-
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Компьютерни мослашни енгилаштириш учун воситалар"
-
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Консол воситалари"
-
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Таҳрирчилар, консоллар, файл воситалари, терминаллар"
-
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE станцияси"
-
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "KDE - воситалар тўплами билан бирга асосий график муҳит"
-
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "GNOME станцияси"
-
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Фойдаланувчилар учун қулай дастурлар ва иш столи воситаларидан иборат график "
-"муҳит"
-
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Бошқа график иш столлари"
-
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ва ҳоказо"
-
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Қўлланмалар"
-
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linux ва эркин дастурлар ҳақида китоблар ва Howto'лар"
-
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "Хат-хабар"
-
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix хат-хабар сервери"
-
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Маълумот базаси"
-
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ёки MySQL маълумот базаси"
-
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Файервол/Рутер"
-
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Интернет гейтвэйи"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Тармоқдаги компьютер (сервер)"
-
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS сервери, SMB сервери, Proxy сервери, SSH сервери"
-
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Хат-хабар, янгиликларни ўқиш ва жўнатиш ва Интернетда сайр қилиш учун "
-"воситалар тўплами"
-
author	Pablo Saratxaga <pablo@mandriva.com>	2004-10-10 04:29:15 +0000
committer	Pablo Saratxaga <pablo@mandriva.com>	2004-10-10 04:29:15 +0000
commit	97bd4d3f53be6dd1f657ef305910e027fe9de93f (patch)
tree	37c64a1a7bc84bf0baabecd1431e7b34ca54df59 /perl-install/share/po/uz.po
parent	069349909b91120d26f2762a4c8c3b0b1e42d120 (diff)
download	drakx-backup-do-not-use-97bd4d3f53be6dd1f657ef305910e027fe9de93f.tar drakx-backup-do-not-use-97bd4d3f53be6dd1f657ef305910e027fe9de93f.tar.gz drakx-backup-do-not-use-97bd4d3f53be6dd1f657ef305910e027fe9de93f.tar.bz2 drakx-backup-do-not-use-97bd4d3f53be6dd1f657ef305910e027fe9de93f.tar.xz drakx-backup-do-not-use-97bd4d3f53be6dd1f657ef305910e027fe9de93f.zip