Make merge

1 files changed, 392 insertions, 364 deletions

diff --git a/po/tg.po b/po/tg.po
index 5f989bb6..0567c707 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-tg\n"
-"POT-Creation-Date: 2005-01-14 18:50+0100\n"
+"POT-Creation-Date: 2005-01-18 13:29+0100\n"
 "PO-Revision-Date: 2004-08-28 14:46+0000\n"
 "Last-Translator: Abrorova <H_Abrorova@rambler.ru>\n"
 "Language-Team: Tajik\n"
@@ -21,7 +21,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../edit-urpm-sources.pl:65
+#: ../edit-urpm-sources.pl:66
+#, c-format
+msgid "Choose media type"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:67
+#, c-format
+msgid ""
+"This step enables you to add sources from a Mandrakelinux web or FTP "
+"mirror.\n"
+"\n"
+"There are two kinds of official mirrors. You can choose to add sources that\n"
+"contain the complete set of packages of your distribution (usually a "
+"superset\n"
+"of what comes on the standard installation CDs), or sources that provide "
+"the\n"
+"official updates for your distribution. (You can add both, but you'll have\n"
+"to do this in two steps.)"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:75
+#, c-format
+msgid "Distribution sources"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:75
+#, fuzzy, c-format
+msgid "Official updates"
+msgstr "Навигариҳои оддӣ"
+
+#: ../edit-urpm-sources.pl:78
 #, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
@@ -37,105 +67,95 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../edit-urpm-sources.pl:73
+#: ../edit-urpm-sources.pl:87
 #, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "Интизор шавед, навкунии муҳит..."
 
-#: ../edit-urpm-sources.pl:93
+#: ../edit-urpm-sources.pl:120
 #, c-format
 msgid "Add a medium"
 msgstr "Иловаи сарчашма"
 
-#: ../edit-urpm-sources.pl:94
+#: ../edit-urpm-sources.pl:122
 #, c-format
 msgid "Local files"
 msgstr "Файлҳои маҳаллӣ"
 
-#: ../edit-urpm-sources.pl:94
+#: ../edit-urpm-sources.pl:122
 #, c-format
 msgid "Path:"
 msgstr "Роҳ:"
 
-#: ../edit-urpm-sources.pl:95
+#: ../edit-urpm-sources.pl:123
 #, c-format
 msgid "FTP server"
 msgstr "Хидматрасони FTP"
 
-#: ../edit-urpm-sources.pl:95 ../edit-urpm-sources.pl:96
-#: ../edit-urpm-sources.pl:98 ../edit-urpm-sources.pl:373
+#: ../edit-urpm-sources.pl:123 ../edit-urpm-sources.pl:124
+#: ../edit-urpm-sources.pl:382
 #, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:96
+#: ../edit-urpm-sources.pl:124
 #, c-format
 msgid "HTTP server"
 msgstr "Хидматрасони HTTP"
 
-#: ../edit-urpm-sources.pl:97
+#: ../edit-urpm-sources.pl:125
 #, c-format
 msgid "Removable device"
 msgstr "Дастгоҳи хориҷ шаванда"
 
-#: ../edit-urpm-sources.pl:97
+#: ../edit-urpm-sources.pl:125
 #, c-format
 msgid "Path or mount point:"
 msgstr "Роҳ ё нуқтаи васлкунӣ:"
 
-#: ../edit-urpm-sources.pl:98 ../rpmdrake:859
-#, c-format
-msgid "Security updates"
-msgstr "Навигариҳои бехатарӣ"
-
-#: ../edit-urpm-sources.pl:114
+#: ../edit-urpm-sources.pl:141
 #, c-format
 msgid "Browse..."
 msgstr "Баррасии..."
 
-#: ../edit-urpm-sources.pl:121
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Оинаро интихоб кунед..."
-
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:171
 #, c-format
 msgid "Login:"
 msgstr "Номи дохилӣ (login):"
 
-#: ../edit-urpm-sources.pl:159 ../edit-urpm-sources.pl:450
+#: ../edit-urpm-sources.pl:171 ../edit-urpm-sources.pl:459
 #, c-format
 msgid "Password:"
 msgstr "Гузарвожа:"
 
-#: ../edit-urpm-sources.pl:164 ../edit-urpm-sources.pl:374
+#: ../edit-urpm-sources.pl:176 ../edit-urpm-sources.pl:383
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Роҳи нисби ба synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:166
+#: ../edit-urpm-sources.pl:178
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 "Ҳеҷ чизро нишон надиҳед, агар synthesis/hdlist ба таври автоматӣ тадқиқ "
 "гардад"
 
-#: ../edit-urpm-sources.pl:171
+#: ../edit-urpm-sources.pl:183
 #, c-format
 msgid "Name:"
 msgstr "Ном:"
 
-#: ../edit-urpm-sources.pl:184
+#: ../edit-urpm-sources.pl:194
 #, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:203
+#: ../edit-urpm-sources.pl:212
 #, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Шумо бояд ақаллан ду элементи авваларо пур кунед."
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
@@ -144,127 +164,127 @@ msgstr ""
 "Аллакай миёна бо ин ном вуҷуд дорад, шумо ҳақиқатан\n"
 "онро иваз кардан мехоҳед?"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
 #, c-format
 msgid "Adding a medium:"
 msgstr "Иловаи сарчашма:"
 
-#: ../edit-urpm-sources.pl:219
+#: ../edit-urpm-sources.pl:228
 #, c-format
 msgid "Type of medium:"
 msgstr "Навъи сарчашма:"
 
-#: ../edit-urpm-sources.pl:224 ../edit-urpm-sources.pl:294
-#: ../edit-urpm-sources.pl:380 ../edit-urpm-sources.pl:405
-#: ../edit-urpm-sources.pl:467 ../edit-urpm-sources.pl:548
-#: ../edit-urpm-sources.pl:588 ../edit-urpm-sources.pl:646
-#: ../edit-urpm-sources.pl:786 ../rpmdrake:159 ../rpmdrake:626
-#: ../rpmdrake:1393 ../rpmdrake:1401 ../rpmdrake.pm:505 ../rpmdrake.pm:595
-#: ../rpmdrake.pm:664
+#: ../edit-urpm-sources.pl:233 ../edit-urpm-sources.pl:303
+#: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:414
+#: ../edit-urpm-sources.pl:476 ../edit-urpm-sources.pl:557
+#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:794 ../rpmdrake:159 ../rpmdrake:676
+#: ../rpmdrake:1418 ../rpmdrake:1426 ../rpmdrake.pm:502 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:661
 #, c-format
 msgid "Cancel"
 msgstr "Бекор кардан"
 
-#: ../edit-urpm-sources.pl:226 ../edit-urpm-sources.pl:296
-#: ../edit-urpm-sources.pl:405 ../edit-urpm-sources.pl:457
-#: ../edit-urpm-sources.pl:545 ../edit-urpm-sources.pl:587
-#: ../edit-urpm-sources.pl:639 ../edit-urpm-sources.pl:711
-#: ../edit-urpm-sources.pl:779 ../edit-urpm-sources.pl:832
-#: ../edit-urpm-sources.pl:982 ../rpmdrake:159 ../rpmdrake:626 ../rpmdrake:646
-#: ../rpmdrake:651 ../rpmdrake:1335 ../rpmdrake:1393 ../rpmdrake:1537
-#: ../rpmdrake.pm:196 ../rpmdrake.pm:253 ../rpmdrake.pm:505
+#: ../edit-urpm-sources.pl:235 ../edit-urpm-sources.pl:305
+#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:466
+#: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:596
+#: ../edit-urpm-sources.pl:648 ../edit-urpm-sources.pl:720
+#: ../edit-urpm-sources.pl:787 ../edit-urpm-sources.pl:840
+#: ../edit-urpm-sources.pl:990 ../rpmdrake:159 ../rpmdrake:676 ../rpmdrake:693
+#: ../rpmdrake:698 ../rpmdrake:1360 ../rpmdrake:1418 ../rpmdrake:1561
+#: ../rpmdrake.pm:191 ../rpmdrake.pm:248 ../rpmdrake.pm:502
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl:278
+#: ../edit-urpm-sources.pl:287
 #, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
-#: ../edit-urpm-sources.pl:280
+#: ../edit-urpm-sources.pl:289
 #, c-format
 msgid "always"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:281
+#: ../edit-urpm-sources.pl:290
 #, fuzzy, c-format
 msgid "never"
 msgstr "Хидматрасонҳо"
 
-#: ../edit-urpm-sources.pl:290
+#: ../edit-urpm-sources.pl:299
 #, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Якчанд қуттиро коргузорӣ шуда наметавонад"
 
-#: ../edit-urpm-sources.pl:291
+#: ../edit-urpm-sources.pl:300
 #, fuzzy, c-format
 msgid "Download program to use:"
 msgstr "Фаровири `%s', суръат:%s"
 
-#: ../edit-urpm-sources.pl:321
+#: ../edit-urpm-sources.pl:330
 #, c-format
 msgid "Source Removal"
 msgstr "Сарчашмаи Хориҷшаванда"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:331
 #, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Шумо дар ҳақиқат сарчашмаи \"%s\"-ро хориҷ карданӣ ҳастед?"
 
-#: ../edit-urpm-sources.pl:327
+#: ../edit-urpm-sources.pl:336
 #, c-format
 msgid "Please wait, removing medium..."
 msgstr "Интизор шавед, хориҷи миёна..."
 
-#: ../edit-urpm-sources.pl:364
+#: ../edit-urpm-sources.pl:373
 #, c-format
 msgid "Edit a medium"
 msgstr "Таҳрири сарчашма"
 
-#: ../edit-urpm-sources.pl:370
+#: ../edit-urpm-sources.pl:379
 #, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Таҳрири сарчашмаи \"%s\":"
 
-#: ../edit-urpm-sources.pl:384
+#: ../edit-urpm-sources.pl:393
 #, c-format
 msgid "Save changes"
 msgstr "Нигоҳдории тағиротҳо"
 
-#: ../edit-urpm-sources.pl:392 ../edit-urpm-sources.pl:969
+#: ../edit-urpm-sources.pl:401 ../edit-urpm-sources.pl:977
 #, c-format
 msgid "Proxy..."
 msgstr "Ваколат..."
 
-#: ../edit-urpm-sources.pl:403
+#: ../edit-urpm-sources.pl:412
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Барои давом Шумо бояд миёна дохил кунед"
 
-#: ../edit-urpm-sources.pl:404
+#: ../edit-urpm-sources.pl:413
 #, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 "Барои нигоҳ доштани тағирот, Шумо бояд ба ҳаракатовар миёна дохил кунед."
 
-#: ../edit-urpm-sources.pl:426
+#: ../edit-urpm-sources.pl:435
 #, c-format
 msgid "Configure proxies"
 msgstr "Танзимдарории ноибҳо"
 
-#: ../edit-urpm-sources.pl:436
+#: ../edit-urpm-sources.pl:445
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Гузоришҳои прокси барои муҳити \"%s\""
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:446
 #, c-format
 msgid "Global proxy settings"
 msgstr "Гузоришҳои глобалии прокси"
 
-#: ../edit-urpm-sources.pl:439
+#: ../edit-urpm-sources.pl:448
 #, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
@@ -273,164 +293,164 @@ msgstr ""
 "Ба Шумо ноиб лозим бошад, ба тарафи номихидматгор ва даргоҳи ихтиёрӣ гузоред "
 "(наҳв: <хидматгорноиб[:даргоҳ]>):"
 
-#: ../edit-urpm-sources.pl:442
+#: ../edit-urpm-sources.pl:451
 #, c-format
 msgid "Proxy hostname:"
 msgstr "Ноиби номихидматгор:"
 
-#: ../edit-urpm-sources.pl:445
+#: ../edit-urpm-sources.pl:454
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Шумо метавонед барои аслшиносии ноиб корванд/гузарвожа муайян кунед:"
 
-#: ../edit-urpm-sources.pl:448
+#: ../edit-urpm-sources.pl:457
 #, c-format
 msgid "User:"
 msgstr "Корванд:"
 
-#: ../edit-urpm-sources.pl:516
+#: ../edit-urpm-sources.pl:525
 #, c-format
 msgid "Add a parallel group"
 msgstr "Гурӯҳи параллелиро илова намоед"
 
-#: ../edit-urpm-sources.pl:516
+#: ../edit-urpm-sources.pl:525
 #, c-format
 msgid "Edit a parallel group"
 msgstr "Гурӯҳи параллелиро таҳрир намоед"
 
-#: ../edit-urpm-sources.pl:527
+#: ../edit-urpm-sources.pl:536
 #, c-format
 msgid "Add a medium limit"
 msgstr "Иловаи ҳудуди сарчашма"
 
-#: ../edit-urpm-sources.pl:539
+#: ../edit-urpm-sources.pl:548
 #, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Сарчашмаро барои насби ҳудуди он интихоб намоед:"
 
-#: ../edit-urpm-sources.pl:576
+#: ../edit-urpm-sources.pl:585
 #, c-format
 msgid "Add a host"
 msgstr "Соҳибро ҳамроҳ намоед"
 
-#: ../edit-urpm-sources.pl:582
+#: ../edit-urpm-sources.pl:591
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Номи соҳиби иловашавандаро ё ин ки IP-суроғаи онро дохилнамоед:"
 
-#: ../edit-urpm-sources.pl:613
+#: ../edit-urpm-sources.pl:622
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Таҳрири гурӯҳи параллелӣ \"%s\":"
 
-#: ../edit-urpm-sources.pl:617
+#: ../edit-urpm-sources.pl:626
 #, c-format
 msgid "Group name:"
 msgstr "Номи гурӯҳ:"
 
-#: ../edit-urpm-sources.pl:618
+#: ../edit-urpm-sources.pl:627
 #, c-format
 msgid "Protocol:"
 msgstr "Суратҷаласа:"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:629
 #, c-format
 msgid "Media limit:"
 msgstr "Тағироти сарчашма:"
 
-#: ../edit-urpm-sources.pl:625 ../edit-urpm-sources.pl:632
+#: ../edit-urpm-sources.pl:634 ../edit-urpm-sources.pl:641
 #, c-format
 msgid "Add"
 msgstr "Илова"
 
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:633
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:947 ../rpmdrake:1131
+#: ../edit-urpm-sources.pl:635 ../edit-urpm-sources.pl:642
+#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1154
 #, c-format
 msgid "Remove"
 msgstr "Хориҷ"
 
-#: ../edit-urpm-sources.pl:627
+#: ../edit-urpm-sources.pl:636
 #, c-format
 msgid "Hosts:"
 msgstr "Соҳибҳо:"
 
-#: ../edit-urpm-sources.pl:661
+#: ../edit-urpm-sources.pl:670
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "urpmi параллелиро ба танзим дароред (иҷроиши тақсимотии urpmi)"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Group"
 msgstr "Гурӯҳ"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Protocol"
 msgstr "Суратҷаласа"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Media limit"
 msgstr "Ҳудуди сарчашма"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:674
 #, c-format
 msgid "Command"
 msgstr "Фармон"
 
-#: ../edit-urpm-sources.pl:675 ../rpmdrake:349 ../rpmdrake:366 ../rpmdrake:488
-#: ../rpmdrake:560
+#: ../edit-urpm-sources.pl:684 ../rpmdrake:353 ../rpmdrake:370 ../rpmdrake:492
+#: ../rpmdrake:608
 #, c-format
 msgid "(none)"
 msgstr "(ҳеҷ)"
 
-#: ../edit-urpm-sources.pl:695 ../edit-urpm-sources.pl:951
+#: ../edit-urpm-sources.pl:704 ../edit-urpm-sources.pl:959
 #, c-format
 msgid "Edit"
 msgstr "Таҳрир кардан"
 
-#: ../edit-urpm-sources.pl:703 ../edit-urpm-sources.pl:957
+#: ../edit-urpm-sources.pl:712 ../edit-urpm-sources.pl:965
 #, c-format
 msgid "Add..."
 msgstr "Илова..."
 
-#: ../edit-urpm-sources.pl:719
+#: ../edit-urpm-sources.pl:728
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Идораи калидҳо барои имзоҳои рақамии қуттиҳо"
 
-#: ../edit-urpm-sources.pl:723 ../edit-urpm-sources.pl:866
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:874
 #, c-format
 msgid "Medium"
 msgstr "Сарчашма"
 
-#: ../edit-urpm-sources.pl:728
+#: ../edit-urpm-sources.pl:737
 #, c-format
 msgid "Keys"
 msgstr "Калидҳо"
 
-#: ../edit-urpm-sources.pl:747
+#: ../edit-urpm-sources.pl:756
 #, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "ном ёфт нашудааст, калид дар rpm keyring мавҷуд нест!"
 
-#: ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:769
 #, c-format
 msgid "Add a key"
 msgstr "Калидро илова намоед"
 
-#: ../edit-urpm-sources.pl:773
+#: ../edit-urpm-sources.pl:781
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Интихоби калид барои даровардани иловаҳо ба сарчашма %s"
 
-#: ../edit-urpm-sources.pl:801
+#: ../edit-urpm-sources.pl:809
 #, c-format
 msgid "Remove a key"
 msgstr "Калидро хориҷ намоед"
 
-#: ../edit-urpm-sources.pl:802
+#: ../edit-urpm-sources.pl:810
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -439,77 +459,77 @@ msgstr ""
 "Шумо дар ҳақиқат калиди %s-ро аз сарчашмаи %s хориҷ\n"
 "карданӣ ҳастед? (номи калид:%s)"
 
-#: ../edit-urpm-sources.pl:820
+#: ../edit-urpm-sources.pl:828
 #, c-format
 msgid "Add a key..."
 msgstr "Калидро илова намоед..."
 
-#: ../edit-urpm-sources.pl:824
+#: ../edit-urpm-sources.pl:832
 #, c-format
 msgid "Remove key"
 msgstr "Калидро хориҷ намоед"
 
-#: ../edit-urpm-sources.pl:840
+#: ../edit-urpm-sources.pl:848
 #, c-format
 msgid "Configure media"
 msgstr "Сарчашмаро ба танзим дароред"
 
-#: ../edit-urpm-sources.pl:865
+#: ../edit-urpm-sources.pl:873
 #, c-format
 msgid "Enabled?"
 msgstr "Даргирифта?"
 
-#: ../edit-urpm-sources.pl:878
+#: ../edit-urpm-sources.pl:886
 #, c-format
 msgid "Update medium"
 msgstr "Навкунии сарчашма(ҳо)"
 
-#: ../edit-urpm-sources.pl:878
+#: ../edit-urpm-sources.pl:886
 #, c-format
 msgid "Regenerate hdlist"
 msgstr "hdlist-ро барқарор намоед"
 
-#: ../edit-urpm-sources.pl:890 ../rpmdrake.pm:588
+#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:585
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Интизор шавед, навкунии муҳит..."
 
-#: ../edit-urpm-sources.pl:894
+#: ../edit-urpm-sources.pl:902
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Интизор шавед, навкунии муҳит..."
 
-#: ../edit-urpm-sources.pl:961
+#: ../edit-urpm-sources.pl:969
 #, fuzzy, c-format
 msgid "Add custom..."
 msgstr "Илова..."
 
-#: ../edit-urpm-sources.pl:965
+#: ../edit-urpm-sources.pl:973
 #, c-format
 msgid "Update..."
 msgstr "Навкунӣ..."
 
-#: ../edit-urpm-sources.pl:968
+#: ../edit-urpm-sources.pl:976
 #, c-format
 msgid "Manage keys..."
 msgstr "Идораи калидҳо..."
 
-#: ../edit-urpm-sources.pl:970
+#: ../edit-urpm-sources.pl:978
 #, c-format
 msgid "Parallel..."
 msgstr "Параллел..."
 
-#: ../edit-urpm-sources.pl:971
+#: ../edit-urpm-sources.pl:979
 #, fuzzy, c-format
 msgid "Global options..."
 msgstr "Гузоришҳои глобалии прокси"
 
-#: ../edit-urpm-sources.pl:981
+#: ../edit-urpm-sources.pl:989
 #, c-format
 msgid "Help"
 msgstr "Ёрӣ"
 
-#: ../edit-urpm-sources.pl:993 ../gurpmi.addmedia:75 ../rpmdrake:1648
+#: ../edit-urpm-sources.pl:1001 ../gurpmi.addmedia:75 ../rpmdrake:1672
 #, c-format
 msgid ""
 "%s\n"
@@ -520,7 +540,7 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../edit-urpm-sources.pl:996
+#: ../edit-urpm-sources.pl:1004
 #, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -537,7 +557,7 @@ msgstr ""
 "нав\n"
 "ё иҷрои навигариҳо дастрас мешаванд."
 
-#: ../edit-urpm-sources.pl:1008
+#: ../edit-urpm-sources.pl:1016
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -615,7 +635,7 @@ msgstr "Фишор"
 
 #: ../rpmdrake:169 ../rpmdrake:174 ../rpmdrake:186 ../rpmdrake:197
 #: ../rpmdrake:206 ../rpmdrake:218 ../rpmdrake:230 ../rpmdrake:238
-#: ../rpmdrake:318
+#: ../rpmdrake:322
 #, c-format
 msgid "Other"
 msgstr "Дигар"
@@ -1068,87 +1088,147 @@ msgstr "Бозиҳо"
 msgid "Video"
 msgstr "Видео"
 
-#: ../rpmdrake:372 ../rpmdrake:774 ../rpmdrake:775
+#: ../rpmdrake:376 ../rpmdrake:509 ../rpmdrake:511
 #, c-format
 msgid "(Not available)"
 msgstr "(Дастрас Нест)"
 
-#: ../rpmdrake:401 ../rpmdrake:469
+#: ../rpmdrake:405 ../rpmdrake:473
 #, c-format
 msgid "Search results"
 msgstr "Натиҷаҳои ҷустуҷӯ"
 
-#: ../rpmdrake:401
+#: ../rpmdrake:405
 #, c-format
 msgid "Search results (none)"
 msgstr "Натиҷаҳои ҷустуҷӯ (ҳеҷ)"
 
-#: ../rpmdrake:412 ../rpmdrake:433
+#: ../rpmdrake:416 ../rpmdrake:437
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Интизор шавед, ҷустуҷӯ..."
 
-#: ../rpmdrake:431 ../rpmdrake:1171 ../rpmdrake:1433 ../rpmdrake:1647
+#: ../rpmdrake:435 ../rpmdrake:1194 ../rpmdrake:1458 ../rpmdrake:1671
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:436
+#: ../rpmdrake:440
 #, c-format
 msgid "Stop"
 msgstr "Ист"
 
-#: ../rpmdrake:470 ../rpmdrake:589
+#: ../rpmdrake:474 ../rpmdrake:639
 #, c-format
 msgid "Upgradable"
 msgstr "Афзоишшаванда"
 
-#: ../rpmdrake:470 ../rpmdrake:589
+#: ../rpmdrake:474 ../rpmdrake:639
 #, c-format
 msgid "Addable"
 msgstr "Иловашаванда"
 
-#: ../rpmdrake:472
+#: ../rpmdrake:476
 #, c-format
 msgid "Selected"
 msgstr "Интихобшуда"
 
-#: ../rpmdrake:472
+#: ../rpmdrake:476
 #, c-format
 msgid "Not selected"
 msgstr "Интихоб нашудааст"
 
 #: ../rpmdrake:506
 #, c-format
+msgid "Files:\n"
+msgstr "Файлҳо:\n"
+
+#: ../rpmdrake:511
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
+
+#: ../rpmdrake:516
+#, c-format
+msgid "Medium: "
+msgstr "Сарчашма:"
+
+#: ../rpmdrake:518
+#, c-format
+msgid "Currently installed version: "
+msgstr "Нусхаи коргузошта шуда: "
+
+#: ../rpmdrake:526
+#, c-format
+msgid "Name: "
+msgstr "Ном: "
+
+#: ../rpmdrake:527
+#, c-format
+msgid "Version: "
+msgstr "Нусха: "
+
+#: ../rpmdrake:528
+#, c-format
+msgid "Size: "
+msgstr "Ҳаҷм: "
+
+#: ../rpmdrake:528
+#, c-format
+msgid "%s KB"
+msgstr "%s КБ"
+
+#: ../rpmdrake:531
+#, c-format
+msgid "Importance: "
+msgstr "Зарурият: "
+
+#: ../rpmdrake:534
+#, c-format
+msgid "Summary: "
+msgstr "Маълумот: "
+
+#: ../rpmdrake:537
+#, c-format
+msgid "Reason for update: "
+msgstr "Асос барои навигарӣ: "
+
+#: ../rpmdrake:539
+#, c-format
+msgid "Description: "
+msgstr "Тавсиф: "
+
+#: ../rpmdrake:554
+#, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:524 ../rpmdrake:639 ../rpmdrake:642 ../rpmdrake:1527
+#: ../rpmdrake:571 ../rpmdrake:689 ../rpmdrake:691 ../rpmdrake:1551
 #, c-format
 msgid "More information on package..."
 msgstr "Маълумоти иловагӣ барои қуттӣ..."
 
-#: ../rpmdrake:525
+#: ../rpmdrake:572
 #, c-format
 msgid "Please choose"
 msgstr "Илтимос интихоб кунед"
 
-#: ../rpmdrake:525
+#: ../rpmdrake:572
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Яке аз қуттиҳои зерин лозим аст:"
 
-#: ../rpmdrake:545
+#: ../rpmdrake:593
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Интизор шавед, рӯйхатсозии қуттиҳо..."
 
-#: ../rpmdrake:562
+#: ../rpmdrake:610
 #, c-format
 msgid "No update"
 msgstr "Навигарӣ нест"
 
-#: ../rpmdrake:563
+#: ../rpmdrake:611
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1159,28 +1239,28 @@ msgstr ""
 "нест барои қуттиҳои дар компутари шумо коргузошта шуда, ё шумо аллакай\n"
 "ҳамаашро коргузошта шудаед."
 
-#: ../rpmdrake:583
+#: ../rpmdrake:632
 #, c-format
 msgid "All"
 msgstr "Ҳама"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:626 ../rpmdrake:631
+#: ../rpmdrake:676 ../rpmdrake:681
 #, c-format
 msgid "More info"
 msgstr "Маълумоти изофа"
 
-#: ../rpmdrake:634 ../rpmdrake:1516
+#: ../rpmdrake:684 ../rpmdrake:1540
 #, c-format
 msgid "Information on packages"
 msgstr "Маълумот дар қуттиҳо"
 
-#: ../rpmdrake:659
+#: ../rpmdrake:706
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Баъзе қуттиҳои иловагӣ бояд хориҷ карда шаванд"
 
-#: ../rpmdrake:660
+#: ../rpmdrake:707
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1191,12 +1271,12 @@ msgstr ""
 "шуд:\n"
 "\n"
 
-#: ../rpmdrake:666 ../rpmdrake:675
+#: ../rpmdrake:713 ../rpmdrake:722
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Якчнд қуттӣ коргузорӣ шуда наметавонад"
 
-#: ../rpmdrake:667
+#: ../rpmdrake:714
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1205,7 +1285,7 @@ msgstr ""
 "Хориҷи ин қуттиҳо системи Шуморо вайрон месозад, узр:\n"
 "\n"
 
-#: ../rpmdrake:676 ../rpmdrake:737
+#: ../rpmdrake:723 ../rpmdrake:785
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1216,12 +1296,12 @@ msgstr ""
 "кард:\n"
 "\n"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:752
 #, c-format
 msgid "Additional packages needed"
 msgstr "Қуттиҳои иловагӣ лозиманд"
 
-#: ../rpmdrake:706
+#: ../rpmdrake:753
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1232,17 +1312,17 @@ msgstr ""
 "коргузошта шаванд:\n"
 "\n"
 
-#: ../rpmdrake:720
+#: ../rpmdrake:768
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (ба рӯйхати партофта аҳамият дорад)"
 
-#: ../rpmdrake:722
+#: ../rpmdrake:770
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Якчанд қуттиро коргузорӣ шуда наметавонад"
 
-#: ../rpmdrake:723
+#: ../rpmdrake:771
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1253,177 +1333,122 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:736 ../rpmdrake:1025
+#: ../rpmdrake:784 ../rpmdrake:1048
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Баъзе қуттиҳо бояд хориҷ шаванд"
 
-#: ../rpmdrake:758
+#: ../rpmdrake:807
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Интихобшуда: %d МБ / Фосилаи озоди диск: %d МБ"
 
-#: ../rpmdrake:760
+#: ../rpmdrake:809
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Ҳаҷми интихобшуда %d МБ"
 
-#: ../rpmdrake:766
+#: ../rpmdrake:814
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Барои ин баста тавсифот дастрас нест\n"
 
-#: ../rpmdrake:772
-#, c-format
-msgid "Files:\n"
-msgstr "Файлҳо:\n"
-
-#: ../rpmdrake:775
-#, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
-
-#: ../rpmdrake:777
-#, c-format
-msgid "Medium: "
-msgstr "Сарчашма:"
-
-#: ../rpmdrake:779
-#, c-format
-msgid "Currently installed version: "
-msgstr "Нусхаи коргузошта шуда: "
-
-#: ../rpmdrake:784
-#, c-format
-msgid "Name: "
-msgstr "Ном: "
-
-#: ../rpmdrake:785
-#, c-format
-msgid "Version: "
-msgstr "Нусха: "
-
-#: ../rpmdrake:786
-#, c-format
-msgid "Size: "
-msgstr "Ҳаҷм: "
-
-#: ../rpmdrake:786
-#, c-format
-msgid "%s KB"
-msgstr "%s КБ"
-
-#: ../rpmdrake:788
-#, c-format
-msgid "Importance: "
-msgstr "Зарурият: "
-
-#: ../rpmdrake:790
-#, c-format
-msgid "Summary: "
-msgstr "Маълумот: "
-
-#: ../rpmdrake:792
-#, c-format
-msgid "Reason for update: "
-msgstr "Асос барои навигарӣ: "
-
-#: ../rpmdrake:794
+#: ../rpmdrake:881
 #, c-format
-msgid "Description: "
-msgstr "Тавсиф: "
+msgid "Security updates"
+msgstr "Навигариҳои бехатарӣ"
 
-#: ../rpmdrake:859
+#: ../rpmdrake:881
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Навигариҳои Ғалатислоҳ (Bugfixes)"
 
-#: ../rpmdrake:859
+#: ../rpmdrake:881
 #, c-format
 msgid "Normal updates"
 msgstr "Навигариҳои оддӣ"
 
-#: ../rpmdrake:878
+#: ../rpmdrake:901
 #, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:878
+#: ../rpmdrake:901
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Интихоботи Mandrakelinux"
 
-#: ../rpmdrake:881
+#: ../rpmdrake:904
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Ҳамаи қуттиҳо, аз рӯи алифбо"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:912
 #, c-format
 msgid "All packages, by group"
 msgstr "Ҳаммаи қуттиҳо, мувофиқи гурӯҳ"
 
-#: ../rpmdrake:890
+#: ../rpmdrake:913
 #, c-format
 msgid "All packages, by size"
 msgstr "Ҳаммаи қуттиҳо, мувофиқи андоза"
 
-#: ../rpmdrake:891
+#: ../rpmdrake:914
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Ҳамаи қуттиҳо, аз рӯи ҳолати интихоб"
 
-#: ../rpmdrake:895
+#: ../rpmdrake:918
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Ҳамаи қуттиҳо, аз рӯи нигоҳдории сарчашма"
 
-#: ../rpmdrake:896
+#: ../rpmdrake:919
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Ҳамаи қуттиҳо, аз рӯи дастрас будани навигириҳо"
 
-#: ../rpmdrake:900
+#: ../rpmdrake:923
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Танҳо боқимондаҳо, аз рӯи сана насби ба навъҳо ҷудо шуда"
 
-#: ../rpmdrake:974
+#: ../rpmdrake:997
 #, c-format
 msgid "in names"
 msgstr "дар номҳо"
 
-#: ../rpmdrake:976
+#: ../rpmdrake:999
 #, c-format
 msgid "in descriptions"
 msgstr "дар тавсифҳо"
 
-#: ../rpmdrake:978
+#: ../rpmdrake:1001
 #, c-format
 msgid "in file names"
 msgstr "дар номҳои файл"
 
-#: ../rpmdrake:987
+#: ../rpmdrake:1010
 #, c-format
 msgid "Normal information"
 msgstr "Маълумоти оддӣ"
 
-#: ../rpmdrake:987
+#: ../rpmdrake:1010
 #, c-format
 msgid "Maximum information"
 msgstr "Маълумоти калонтарин"
 
-#: ../rpmdrake:1007
+#: ../rpmdrake:1030
 #, c-format
 msgid "You need to select some packages first."
 msgstr "Пеш аз ҳама шумо бояд якчанд қуттиҳоро интихоб намоед."
 
-#: ../rpmdrake:1012
+#: ../rpmdrake:1035
 #, c-format
 msgid "Too many packages are selected"
 msgstr "Аз ҳад зиёд қуттиҳо интихоб шудаанд"
 
-#: ../rpmdrake:1013
+#: ../rpmdrake:1036
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1440,7 +1465,7 @@ msgstr ""
 "\n"
 "Шумо ҳақиқатан ҳамаи қуттиҳои интихобшударо коргузоштан мехоҳед?"
 
-#: ../rpmdrake:1026
+#: ../rpmdrake:1049
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1455,93 +1480,93 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../rpmdrake:1059
+#: ../rpmdrake:1082
 #, c-format
 msgid "Software Packages Removal"
 msgstr "Хориҷкунии Қуттиҳои Нармафзор"
 
-#: ../rpmdrake:1060
+#: ../rpmdrake:1083
 #, c-format
 msgid "Software Packages Update"
 msgstr "Навсозии Бастаи Нармафзор"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1084
 #, c-format
 msgid "Software Packages Installation"
 msgstr "Коргузории Қуттиҳои Нармафзор"
 
-#: ../rpmdrake:1067 ../rpmdrake:1070 ../rpmdrake:1079 ../rpmdrake:1090
-#: ../rpmdrake:1095
+#: ../rpmdrake:1090 ../rpmdrake:1093 ../rpmdrake:1102 ../rpmdrake:1113
+#: ../rpmdrake:1118
 #, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../rpmdrake:1070
+#: ../rpmdrake:1093
 #, fuzzy, c-format
 msgid "/_Update media"
 msgstr "Навкунии сарчашма(ҳо)"
 
-#: ../rpmdrake:1079
+#: ../rpmdrake:1102
 #, fuzzy, c-format
 msgid "/_Reset the selection"
 msgstr "Бознишондодани интихоб"
 
-#: ../rpmdrake:1090
+#: ../rpmdrake:1113
 #, fuzzy, c-format
 msgid "/Reload the _packages list"
 msgstr "Бозборкунии рӯйхати қуттиҳо"
 
-#: ../rpmdrake:1095
+#: ../rpmdrake:1118
 #, c-format
 msgid "/_Quit"
 msgstr "/_Баромадан"
 
-#: ../rpmdrake:1096
+#: ../rpmdrake:1119
 #, fuzzy, c-format
 msgid "/_View"
 msgstr "Назар"
 
-#: ../rpmdrake:1098 ../rpmdrake:1099 ../rpmdrake:1106
+#: ../rpmdrake:1121 ../rpmdrake:1122 ../rpmdrake:1129
 #, c-format
 msgid "/_Options"
 msgstr "/_Интихобҳо"
 
-#: ../rpmdrake:1099 ../rpmdrake:1106
+#: ../rpmdrake:1122 ../rpmdrake:1129
 #, fuzzy, c-format
 msgid "/_Show automatically selected packages"
 msgstr "Ба таври автоматӣ қуттиҳои интихобшударо нишон диҳед"
 
-#: ../rpmdrake:1103 ../rpmdrake:1104
+#: ../rpmdrake:1126 ../rpmdrake:1127
 #, c-format
 msgid "/_Help"
 msgstr "/_Ёрӣ"
 
-#: ../rpmdrake:1120
+#: ../rpmdrake:1143
 #, c-format
 msgid "Find:"
 msgstr "Ёфтан:"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1148
 #, c-format
 msgid "Search"
 msgstr "Ҷустуҷӯ"
 
-#: ../rpmdrake:1131
+#: ../rpmdrake:1154
 #, c-format
 msgid "Install"
 msgstr "Коргузорӣ"
 
-#: ../rpmdrake:1163
+#: ../rpmdrake:1186
 #, c-format
 msgid "Fatal error"
 msgstr "Хатогии ҷиддӣ"
 
-#: ../rpmdrake:1164
+#: ../rpmdrake:1187
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Хатогии ҷиддӣ рӯй дод: %s."
 
-#: ../rpmdrake:1172
+#: ../rpmdrake:1195
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1554,12 +1579,12 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../rpmdrake:1181
+#: ../rpmdrake:1204
 #, c-format
 msgid "Already existing update media"
 msgstr "сарчашмаи нави аллакай вуҷуд дошта"
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1205
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1577,12 +1602,12 @@ msgstr ""
 "\n"
 "Сониян, %s-ро дуюм маротиба ба кор дароред."
 
-#: ../rpmdrake:1192
+#: ../rpmdrake:1215
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "Чӣ тавр оинаатонро дастӣ интихоб мекунед"
 
-#: ../rpmdrake:1193
+#: ../rpmdrake:1216
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1597,62 +1622,62 @@ msgstr ""
 "\n"
 "Пас, %s-ро бозоғоз кунед."
 
-#: ../rpmdrake:1224
+#: ../rpmdrake:1249
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Интизор шавед, ёфтани қуттиҳои дастрас..."
 
-#: ../rpmdrake:1272
+#: ../rpmdrake:1297
 #, c-format
 msgid "Inspecting %s"
 msgstr "Бозрасии(Назорати) %s"
 
-#: ../rpmdrake:1291
+#: ../rpmdrake:1316
 #, c-format
 msgid "changes:"
 msgstr "тағиротҳо:"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1320
 #, c-format
 msgid "Remove .%s"
 msgstr "Хориҷи .%s"
 
-#: ../rpmdrake:1297
+#: ../rpmdrake:1322
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Истифодаи .%s ҳамчун файли асосӣ"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1324
 #, c-format
 msgid "Do nothing"
 msgstr "Ҳеҷ кор накунед"
 
-#: ../rpmdrake:1312
+#: ../rpmdrake:1337
 #, c-format
 msgid "Installation finished"
 msgstr "Коргузориш шуд"
 
-#: ../rpmdrake:1327
+#: ../rpmdrake:1352
 #, c-format
 msgid "Inspect..."
 msgstr "Бозрас(Назорат)..."
 
-#: ../rpmdrake:1356 ../rpmdrake:1512
+#: ../rpmdrake:1381 ../rpmdrake:1536
 #, c-format
 msgid "Everything installed successfully"
 msgstr "Ҳама чиз бомуваффақият коргузорӣ|шудааст"
 
-#: ../rpmdrake:1357 ../rpmdrake:1513
+#: ../rpmdrake:1382 ../rpmdrake:1537
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Ҳамаи қуттиҳои талабшуда бомуваффақият коргузошташуданд."
 
-#: ../rpmdrake:1359 ../rpmdrake:1497
+#: ../rpmdrake:1384 ../rpmdrake:1521
 #, c-format
 msgid "Problem during installation"
 msgstr "Муаммоҳо ҳангоми коргузорӣ"
 
-#: ../rpmdrake:1360 ../rpmdrake:1498 ../rpmdrake:1553
+#: ../rpmdrake:1385 ../rpmdrake:1522 ../rpmdrake:1577
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1663,17 +1688,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1373
+#: ../rpmdrake:1398
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Қуттиҳои сарчашмавӣ гирифта нашуд."
 
-#: ../rpmdrake:1374
+#: ../rpmdrake:1399
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Узр, қуттиҳоро бо сарчашмааш гирифта намешавад. %s"
 
-#: ../rpmdrake:1375 ../rpmdrake:1444
+#: ../rpmdrake:1400 ../rpmdrake:1469
 #, c-format
 msgid ""
 "\n"
@@ -1686,39 +1711,39 @@ msgstr ""
 "Ҳисоботи Хатогӣ(ҳо):\n"
 "%s"
 
-#: ../rpmdrake:1382
+#: ../rpmdrake:1407
 #, c-format
 msgid "Package installation..."
 msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
-#: ../rpmdrake:1382
+#: ../rpmdrake:1407
 #, c-format
 msgid "Initializing..."
 msgstr "Коргузорӣ..."
 
-#: ../rpmdrake:1391
+#: ../rpmdrake:1416
 #, c-format
 msgid "Change medium"
 msgstr "Ивази миёна"
 
-#: ../rpmdrake:1392
+#: ../rpmdrake:1417
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 "Лутфан, сарчашмаи ифодашударо \"%s\" дар миён ҷо дохил намоед, аз рӯи дастгоҳ"
 "[%s]"
 
-#: ../rpmdrake:1399
+#: ../rpmdrake:1424
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Фаровиркунии қутии `%s' (%s/%s)..."
 
-#: ../rpmdrake:1422
+#: ../rpmdrake:1447
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr "Тафтиши имзоҳои қуттиҳо..."
 
-#: ../rpmdrake:1434
+#: ../rpmdrake:1459
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1733,12 +1758,12 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../rpmdrake:1441 ../rpmdrake:1552
+#: ../rpmdrake:1466 ../rpmdrake:1576
 #, c-format
 msgid "Installation failed"
 msgstr "Коргузорӣ амалӣ нагардид"
 
-#: ../rpmdrake:1442
+#: ../rpmdrake:1467
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1751,22 +1776,22 @@ msgstr ""
 "\n"
 "Мумкин шумо хоҳиши навкунии манбаи додаҳои сарчашмаро доред."
 
-#: ../rpmdrake:1456
+#: ../rpmdrake:1480
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
-#: ../rpmdrake:1459
+#: ../rpmdrake:1483
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Коргузории қуттии `%s' (%s/%s)..."
 
-#: ../rpmdrake:1475
+#: ../rpmdrake:1499
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "файли rpm [%s] дастрас нест"
 
-#: ../rpmdrake:1510
+#: ../rpmdrake:1534
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1779,48 +1804,48 @@ msgstr ""
 "Баъзе файлҳои танзимдарорӣ ҳамчун `.rpmnew' ё `.rpmsave' офарида шуда\n"
 "буд, акнун метавонед баъзеашонро барои амалиётҳо бозрасӣ кунед:"
 
-#: ../rpmdrake:1510
+#: ../rpmdrake:1534
 #, c-format
 msgid "everything was installed correctly"
 msgstr "ҳама чиз дуруст коргузорӣ шудааст"
 
-#: ../rpmdrake:1518
+#: ../rpmdrake:1542
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Ин бастаҳо бо ахбороти густаришёфта меоянд"
 
-#: ../rpmdrake:1530
+#: ../rpmdrake:1554
 #, fuzzy, c-format
 msgid "More information on package... [%s]"
 msgstr "Маълумоти иловагӣ барои қуттӣ..."
 
-#: ../rpmdrake:1543
+#: ../rpmdrake:1567
 #, c-format
 msgid "No package found for installation."
 msgstr "Барои амалӣ намудани коргузорӣ ягон қуттӣ ёфт нашуд."
 
-#: ../rpmdrake:1544
+#: ../rpmdrake:1568
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Хатогии бартарафнашаванда: афсӯс, ки қуттӣ барои коргузорӣ намудан ёфт нашуд."
 
-#: ../rpmdrake:1566
+#: ../rpmdrake:1590
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "Интизор шавед, хониши манбаи маълумоти қуттиҳо..."
 
-#: ../rpmdrake:1613
+#: ../rpmdrake:1637
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Интизор шавед, хориҷи қуттиҳо..."
 
-#: ../rpmdrake:1618
+#: ../rpmdrake:1642
 #, c-format
 msgid "Problem during removal"
 msgstr "Муаммо ҳангоми хориҷкунӣ"
 
-#: ../rpmdrake:1619
+#: ../rpmdrake:1643
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1831,7 +1856,7 @@ msgstr ""
 "\n"
 "%s "
 
-#: ../rpmdrake:1652
+#: ../rpmdrake:1676
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1844,7 +1869,7 @@ msgstr ""
 "Ин асбоб ба шумо барои интихоби нармафзор барои хориҷ аз компютери Шумо\n"
 "ёрӣ медиҳад."
 
-#: ../rpmdrake:1657
+#: ../rpmdrake:1681
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1857,12 +1882,12 @@ msgstr ""
 "Ин асбоб ба шумо барои интихоби навигарӣ барои коргузоштан ба компютери\n"
 "Шумо ёрӣ медиҳад."
 
-#: ../rpmdrake:1662
+#: ../rpmdrake:1686
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1663
+#: ../rpmdrake:1687
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1877,183 +1902,183 @@ msgstr ""
 "ё DVD пешниҳод карда мешавад. Ин асбоб ба шумо барои интихоби нармафзор\n"
 "барои коргузоштан ба компютери Шумо ёрӣ медиҳад."
 
-#: ../rpmdrake.pm:95
+#: ../rpmdrake.pm:93
 #, fuzzy, c-format
 msgid "Software Update"
 msgstr "Навсозии Бастаи Нармафзор"
 
-#: ../rpmdrake.pm:95
+#: ../rpmdrake.pm:93
 #, c-format
 msgid "Mandrakelinux Update"
 msgstr "Навигарии Mandrakelinux"
 
-#: ../rpmdrake.pm:187
+#: ../rpmdrake.pm:182
 #, c-format
 msgid "No"
 msgstr "Не"
 
-#: ../rpmdrake.pm:191
+#: ../rpmdrake.pm:186
 #, c-format
 msgid "Yes"
 msgstr "Ҳа"
 
-#: ../rpmdrake.pm:239
+#: ../rpmdrake.pm:234
 #, c-format
 msgid "Info..."
 msgstr "Маълумот..."
 
-#: ../rpmdrake.pm:315
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Austria"
 msgstr "Австрия"
 
-#: ../rpmdrake.pm:316
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Australia"
 msgstr "Остролиё"
 
-#: ../rpmdrake.pm:317
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Belgium"
 msgstr "Белжик"
 
-#: ../rpmdrake.pm:318
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Brazil"
 msgstr "Бразил"
 
-#: ../rpmdrake.pm:319
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rpmdrake.pm:320
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Switzerland"
 msgstr "Суис"
 
-#: ../rpmdrake.pm:321
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Costa Rica"
 msgstr "Косто Рико"
 
-#: ../rpmdrake.pm:322
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Czech Republic"
 msgstr "Ҷумҳурии Чех"
 
-#: ../rpmdrake.pm:323
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Germany"
 msgstr "Олмон"
 
-#: ../rpmdrake.pm:324
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Danmark"
 msgstr "Донморк"
 
-#: ../rpmdrake.pm:325 ../rpmdrake.pm:329
+#: ../rpmdrake.pm:320 ../rpmdrake.pm:324
 #, c-format
 msgid "Greece"
 msgstr "Юнон"
 
-#: ../rpmdrake.pm:326
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "Spain"
 msgstr "Успаниё"
 
-#: ../rpmdrake.pm:327
+#: ../rpmdrake.pm:322
 #, c-format
 msgid "Finland"
 msgstr "Финлонд"
 
-#: ../rpmdrake.pm:328
+#: ../rpmdrake.pm:323
 #, c-format
 msgid "France"
 msgstr "Фаронса"
 
-#: ../rpmdrake.pm:330
+#: ../rpmdrake.pm:325
 #, c-format
 msgid "Hungary"
 msgstr "Маҷористон"
 
-#: ../rpmdrake.pm:331
+#: ../rpmdrake.pm:326
 #, c-format
 msgid "Israel"
 msgstr "Исроил"
 
-#: ../rpmdrake.pm:332
+#: ../rpmdrake.pm:327
 #, c-format
 msgid "Italy"
 msgstr "Италия"
 
-#: ../rpmdrake.pm:333
+#: ../rpmdrake.pm:328
 #, c-format
 msgid "Japan"
 msgstr "Ҷопон"
 
-#: ../rpmdrake.pm:334
+#: ../rpmdrake.pm:329
 #, c-format
 msgid "Korea"
 msgstr "Куриё"
 
-#: ../rpmdrake.pm:335
+#: ../rpmdrake.pm:330
 #, c-format
 msgid "Netherlands"
 msgstr "Ҳуланд"
 
-#: ../rpmdrake.pm:336
+#: ../rpmdrake.pm:331
 #, c-format
 msgid "Norway"
 msgstr "Норвеж"
 
-#: ../rpmdrake.pm:337
+#: ../rpmdrake.pm:332
 #, c-format
 msgid "Poland"
 msgstr "Лаҳистон"
 
-#: ../rpmdrake.pm:338
+#: ../rpmdrake.pm:333
 #, c-format
 msgid "Portugal"
 msgstr "Пуртуқол"
 
-#: ../rpmdrake.pm:339
+#: ../rpmdrake.pm:334
 #, c-format
 msgid "Russia"
 msgstr "Русия"
 
-#: ../rpmdrake.pm:340
+#: ../rpmdrake.pm:335
 #, c-format
 msgid "Sweden"
 msgstr "Шветсия"
 
-#: ../rpmdrake.pm:341
+#: ../rpmdrake.pm:336
 #, c-format
 msgid "Slovakia"
 msgstr "Услувок"
 
-#: ../rpmdrake.pm:342
+#: ../rpmdrake.pm:337
 #, c-format
 msgid "Taiwan"
 msgstr "Тойвон"
 
-#: ../rpmdrake.pm:343
+#: ../rpmdrake.pm:338
 #, c-format
 msgid "United Kingdom"
 msgstr "Подшоҳии Муттаҳида"
 
-#: ../rpmdrake.pm:344
+#: ../rpmdrake.pm:339
 #, c-format
 msgid "China"
 msgstr "Хитой"
 
-#: ../rpmdrake.pm:345 ../rpmdrake.pm:346 ../rpmdrake.pm:347 ../rpmdrake.pm:348
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:340 ../rpmdrake.pm:341 ../rpmdrake.pm:342 ../rpmdrake.pm:343
+#: ../rpmdrake.pm:419
 #, c-format
 msgid "United States"
 msgstr "Иёлоти Муттаҳида"
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:431
 #, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2066,7 +2091,7 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:435
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -2079,25 +2104,25 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../rpmdrake.pm:443
+#: ../rpmdrake.pm:441
 #, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Лутфан интизор шавед, фаровири адресҳои оинаҳо аз пойгоҳи Mandrakesoft."
 
-#: ../rpmdrake.pm:444
+#: ../rpmdrake.pm:442
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 "Лутфан интизор шавед, фаровири адресҳои оинаҳо аз пойгоҳи Mandrakesoft."
 
-#: ../rpmdrake.pm:451
+#: ../rpmdrake.pm:448
 #, c-format
 msgid "Error during download"
 msgstr "Хатогӣ ҳангоми фаровир"
 
-#: ../rpmdrake.pm:453
+#: ../rpmdrake.pm:450
 #, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2112,7 +2137,7 @@ msgstr ""
 "Шабака, ё пойгоҳи Mandrakesoft, мумкин дастрас набошанд.\n"
 "Лутфан дертар такрор кунед."
 
-#: ../rpmdrake.pm:458
+#: ../rpmdrake.pm:455
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2127,17 +2152,17 @@ msgstr ""
 "Шабака, ё пойгоҳи Mandrakesoft, мумкин дастрас набошанд.\n"
 "Лутфан дертар такрор кунед."
 
-#: ../rpmdrake.pm:467
+#: ../rpmdrake.pm:464
 #, c-format
 msgid "No mirror"
 msgstr "Оина нест"
 
-#: ../rpmdrake.pm:469
+#: ../rpmdrake.pm:466
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:470
+#: ../rpmdrake.pm:467
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2152,63 +2177,63 @@ msgstr ""
 "ҳолате ки сохти пардозандаи шумо бо Навигариҳои Расмии Mandrakelinux\n"
 "дастгир нашудааст."
 
-#: ../rpmdrake.pm:489
+#: ../rpmdrake.pm:486
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Лутфан оинаи хоҳиширо интихоб кунед."
 
-#: ../rpmdrake.pm:548
+#: ../rpmdrake.pm:545
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Нусхабардории файл барои сарчашмаи `%s'..."
 
-#: ../rpmdrake.pm:551
+#: ../rpmdrake.pm:548
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Дида баромадани файли сарчашмаи `%s'..."
 
-#: ../rpmdrake.pm:554
+#: ../rpmdrake.pm:551
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Санҷидани файли дури сарчашмаи `%s'..."
 
-#: ../rpmdrake.pm:558
+#: ../rpmdrake.pm:555
 #, c-format
 msgid " done."
 msgstr " шуд."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:559
 #, c-format
 msgid " failed!"
 msgstr " нагузашт!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:566
+#: ../rpmdrake.pm:563
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s аз сарчашмаи %s"
 
-#: ../rpmdrake.pm:570
+#: ../rpmdrake.pm:567
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Ба гирифтани маълумот сар намудан `%s'..."
 
-#: ../rpmdrake.pm:574
+#: ../rpmdrake.pm:571
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Фаровири `%s', вақт:%s, суръат:%s"
 
-#: ../rpmdrake.pm:577
+#: ../rpmdrake.pm:574
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Фаровири `%s', суръат:%s"
 
-#: ../rpmdrake.pm:614
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Хатогии бозгардонии бастаҳо"
 
-#: ../rpmdrake.pm:615
+#: ../rpmdrake.pm:612
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2224,27 +2249,27 @@ msgstr ""
 "истифода баред бо мақсади азнавтанзимкунии он, ё дар айни замон он\n"
 "дастнорас аст ва шумо бояд дертар кӯшиш кунед."
 
-#: ../rpmdrake.pm:646
+#: ../rpmdrake.pm:643
 #, c-format
 msgid "Update media"
 msgstr "Навкунии сарчашма(ҳо)"
 
-#: ../rpmdrake.pm:654
+#: ../rpmdrake.pm:651
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Сарчашмаҳое, ки аз нав кардан мехоҳед, интихоб кунед:"
 
-#: ../rpmdrake.pm:668
+#: ../rpmdrake.pm:665
 #, fuzzy, c-format
 msgid "Select all"
 msgstr "Интихобшуда"
 
-#: ../rpmdrake.pm:672
+#: ../rpmdrake.pm:669
 #, c-format
 msgid "Update"
 msgstr "Нав кардан"
 
-#: ../rpmdrake.pm:694
+#: ../rpmdrake.pm:691
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2258,7 +2283,7 @@ msgstr ""
 "Хатогиҳо:\n"
 "%s"
 
-#: ../rpmdrake.pm:718 ../rpmdrake.pm:727
+#: ../rpmdrake.pm:715 ../rpmdrake.pm:724
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2269,17 +2294,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:739
+#: ../rpmdrake.pm:736
 #, c-format
 msgid "Unable to create medium."
 msgstr "Тартиби сарчашма номумкин мебошад."
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:741
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Нокомӣ ҳангоми иловакунии муҳит"
 
-#: ../rpmdrake.pm:745
+#: ../rpmdrake.pm:742
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2290,7 +2315,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:758
+#: ../rpmdrake.pm:755
 #, fuzzy, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2301,7 +2326,7 @@ msgstr ""
 "коргузорӣ карда истодаи (%s) мувофиқат намекунад.\n"
 "Он хомӯш мегардад."
 
-#: ../rpmdrake.pm:761
+#: ../rpmdrake.pm:758
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2312,12 +2337,12 @@ msgstr ""
 "коргузорӣ карда истодаи (%s) мувофиқат намекунад.\n"
 "Он хомӯш мегардад."
 
-#: ../rpmdrake.pm:777
+#: ../rpmdrake.pm:774
 #, c-format
 msgid "Help launched in background"
 msgstr "Дар ҳолати паснамо маълумотгирӣ ба кор роҳ монда шудааст"
 
-#: ../rpmdrake.pm:778
+#: ../rpmdrake.pm:775
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -2597,6 +2622,9 @@ msgstr "Хориҷи Нармафзор"
 msgid "Software Media Manager"
 msgstr "Мудири Сарчашмаҳои Нармафзор"
 
+#~ msgid "Choose a mirror..."
+#~ msgstr "Оинаро интихоб кунед..."
+
 #~ msgid "Reset the selection"
 #~ msgstr "Бознишондодани интихоб"