s/Mandrake/Mandriva/

1 files changed, 259 insertions, 247 deletions

diff --git a/po/tg.po b/po/tg.po
index 094f4234..89c8849e 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-04-18 11:38+0200\n"
+"POT-Creation-Date: 2005-05-05 22:04+0200\n"
 "PO-Revision-Date: 2004-08-28 14:46+0000\n"
 "Last-Translator: Abrorova <H_Abrorova@rambler.ru>\n"
 "Language-Team: Tajik\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: ../edit-urpm-sources.pl:67
 #, c-format
 msgid ""
-"This step enables you to add sources from a Mandrakelinux web or FTP "
+"This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
 "\n"
 "There are two kinds of official mirrors. You can choose to add sources that\n"
@@ -57,12 +57,12 @@ msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
 "\n"
-"I need to contact the Mandrakesoft website to get the mirror list.\n"
+"I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Барои гирифтани рӯйхати оинаҳо ба пойгоҳи Mandrakesoft пайваст шудан лозим.\n"
+"Барои гирифтани рӯйхати оинаҳо ба пойгоҳи Mandriva пайваст шудан лозим.\n"
 "Лутфан тафтиш кунед ки шабакаи шумо дуруст кор карда истодааст.\n"
 "\n"
 "Давом додан гирем?"
@@ -123,7 +123,7 @@ msgstr "Баррасии..."
 msgid "Login:"
 msgstr "Номи дохилӣ (login):"
 
-#: ../edit-urpm-sources.pl:170 ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:170 ../edit-urpm-sources.pl:459 ../rpmdrake.pm:123
 #, c-format
 msgid "Password:"
 msgstr "Гузарвожа:"
@@ -178,9 +178,9 @@ msgstr "Навъи сарчашма:"
 #: ../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:165 ../rpmdrake:697
-#: ../rpmdrake:1501 ../rpmdrake:1509 ../rpmdrake.pm:504 ../rpmdrake.pm:594
-#: ../rpmdrake.pm:663
+#: ../edit-urpm-sources.pl:794 ../rpmdrake:165 ../rpmdrake:701
+#: ../rpmdrake:1505 ../rpmdrake:1513 ../rpmdrake.pm:539 ../rpmdrake.pm:628
+#: ../rpmdrake.pm:697
 #, c-format
 msgid "Cancel"
 msgstr "Бекор кардан"
@@ -190,9 +190,9 @@ msgstr "Бекор кардан"
 #: ../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:165 ../rpmdrake:697 ../rpmdrake:714
-#: ../rpmdrake:719 ../rpmdrake:1442 ../rpmdrake:1501 ../rpmdrake:1644
-#: ../rpmdrake.pm:192 ../rpmdrake.pm:249 ../rpmdrake.pm:504
+#: ../edit-urpm-sources.pl:990 ../rpmdrake:165 ../rpmdrake:701 ../rpmdrake:718
+#: ../rpmdrake:723 ../rpmdrake:1446 ../rpmdrake:1505 ../rpmdrake:1648
+#: ../rpmdrake.pm:114 ../rpmdrake.pm:224 ../rpmdrake.pm:281 ../rpmdrake.pm:539
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -364,7 +364,7 @@ msgid "Add"
 msgstr "Илова"
 
 #: ../edit-urpm-sources.pl:635 ../edit-urpm-sources.pl:642
-#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1177
+#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1181
 #, c-format
 msgid "Remove"
 msgstr "Хориҷ"
@@ -399,8 +399,8 @@ msgstr "Ҳудуди сарчашма"
 msgid "Command"
 msgstr "Фармон"
 
-#: ../edit-urpm-sources.pl:684 ../rpmdrake:364 ../rpmdrake:381 ../rpmdrake:512
-#: ../rpmdrake:625
+#: ../edit-urpm-sources.pl:684 ../rpmdrake:364 ../rpmdrake:382 ../rpmdrake:516
+#: ../rpmdrake:629
 #, c-format
 msgid "(none)"
 msgstr "(ҳеҷ)"
@@ -427,8 +427,10 @@ msgstr "Сарчашма"
 
 #: ../edit-urpm-sources.pl:737
 #, c-format
-msgid "Keys"
-msgstr "Калидҳо"
+msgid ""
+"_:cryptographic keys\n"
+"Keys"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:756
 #, c-format
@@ -489,7 +491,7 @@ msgstr "Навкунии сарчашма(ҳо)"
 msgid "Regenerate hdlist"
 msgstr "hdlist-ро барқарор намоед"
 
-#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:587
+#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:621
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Интизор шавед, навкунии муҳит..."
@@ -529,7 +531,7 @@ msgstr "Гузоришҳои глобалии прокси"
 msgid "Help"
 msgstr "Ёрӣ"
 
-#: ../edit-urpm-sources.pl:1002 ../gurpmi.addmedia:74 ../rpmdrake:1755
+#: ../edit-urpm-sources.pl:1002 ../gurpmi.addmedia:74 ../rpmdrake:1759
 #, c-format
 msgid ""
 "%s\n"
@@ -1159,148 +1161,148 @@ msgstr "Бозиҳо"
 msgid "Video"
 msgstr "Видео"
 
-#: ../rpmdrake:387 ../rpmdrake:529 ../rpmdrake:531
+#: ../rpmdrake:388 ../rpmdrake:533 ../rpmdrake:535
 #, c-format
 msgid "(Not available)"
 msgstr "(Дастрас Нест)"
 
-#: ../rpmdrake:416 ../rpmdrake:493
+#: ../rpmdrake:417 ../rpmdrake:497
 #, c-format
 msgid "Search results"
 msgstr "Натиҷаҳои ҷустуҷӯ"
 
-#: ../rpmdrake:416
+#: ../rpmdrake:417
 #, c-format
 msgid "Search results (none)"
 msgstr "Натиҷаҳои ҷустуҷӯ (ҳеҷ)"
 
-#: ../rpmdrake:427 ../rpmdrake:451
+#: ../rpmdrake:428 ../rpmdrake:455
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Интизор шавед, ҷустуҷӯ..."
 
-#: ../rpmdrake:446 ../rpmdrake:572 ../rpmdrake:1231 ../rpmdrake:1542
-#: ../rpmdrake:1754
+#: ../rpmdrake:450 ../rpmdrake:576 ../rpmdrake:1235 ../rpmdrake:1546
+#: ../rpmdrake:1758
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:456
+#: ../rpmdrake:460
 #, c-format
 msgid "Stop"
 msgstr "Ист"
 
-#: ../rpmdrake:494 ../rpmdrake:660
+#: ../rpmdrake:498 ../rpmdrake:664
 #, c-format
 msgid "Upgradable"
 msgstr "Афзоишшаванда"
 
-#: ../rpmdrake:494 ../rpmdrake:660
+#: ../rpmdrake:498 ../rpmdrake:664
 #, c-format
 msgid "Addable"
 msgstr "Иловашаванда"
 
-#: ../rpmdrake:496
+#: ../rpmdrake:500
 #, c-format
 msgid "Selected"
 msgstr "Интихобшуда"
 
-#: ../rpmdrake:496
+#: ../rpmdrake:500
 #, c-format
 msgid "Not selected"
 msgstr "Интихоб нашудааст"
 
-#: ../rpmdrake:526
+#: ../rpmdrake:530
 #, c-format
 msgid "Files:\n"
 msgstr "Файлҳо:\n"
 
-#: ../rpmdrake:531
+#: ../rpmdrake:535
 #, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:536
+#: ../rpmdrake:540
 #, c-format
 msgid "Medium: "
 msgstr "Сарчашма:"
 
-#: ../rpmdrake:538
+#: ../rpmdrake:542
 #, c-format
 msgid "Currently installed version: "
 msgstr "Нусхаи коргузошта шуда: "
 
-#: ../rpmdrake:546
+#: ../rpmdrake:550
 #, c-format
 msgid "Name: "
 msgstr "Ном: "
 
-#: ../rpmdrake:547
+#: ../rpmdrake:551
 #, c-format
 msgid "Version: "
 msgstr "Нусха: "
 
-#: ../rpmdrake:548
+#: ../rpmdrake:552
 #, c-format
 msgid "Size: "
 msgstr "Ҳаҷм: "
 
-#: ../rpmdrake:548
+#: ../rpmdrake:552
 #, c-format
 msgid "%s KB"
 msgstr "%s КБ"
 
-#: ../rpmdrake:551
+#: ../rpmdrake:555
 #, c-format
 msgid "Importance: "
 msgstr "Зарурият: "
 
-#: ../rpmdrake:554
+#: ../rpmdrake:558
 #, c-format
 msgid "Summary: "
 msgstr "Маълумот: "
 
-#: ../rpmdrake:557
+#: ../rpmdrake:561
 #, c-format
 msgid "Reason for update: "
 msgstr "Асос барои навигарӣ: "
 
-#: ../rpmdrake:559
+#: ../rpmdrake:563
 #, c-format
 msgid "Description: "
 msgstr "Тавсиф: "
 
-#: ../rpmdrake:559
+#: ../rpmdrake:563
 #, fuzzy, c-format
 msgid "No description"
 msgstr "дар тавсифҳо"
 
-#: ../rpmdrake:588 ../rpmdrake:710 ../rpmdrake:712 ../rpmdrake:1634
+#: ../rpmdrake:592 ../rpmdrake:714 ../rpmdrake:716 ../rpmdrake:1638
 #, c-format
 msgid "More information on package..."
 msgstr "Маълумоти иловагӣ барои қуттӣ..."
 
-#: ../rpmdrake:589
+#: ../rpmdrake:593
 #, c-format
 msgid "Please choose"
 msgstr "Илтимос интихоб кунед"
 
-#: ../rpmdrake:589
+#: ../rpmdrake:593
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Яке аз қуттиҳои зерин лозим аст:"
 
-#: ../rpmdrake:610
+#: ../rpmdrake:614
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Интизор шавед, рӯйхатсозии қуттиҳо..."
 
-#: ../rpmdrake:627
+#: ../rpmdrake:631
 #, c-format
 msgid "No update"
 msgstr "Навигарӣ нест"
 
-#: ../rpmdrake:628
+#: ../rpmdrake:632
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1311,28 +1313,28 @@ msgstr ""
 "нест барои қуттиҳои дар компутари шумо коргузошта шуда, ё шумо аллакай\n"
 "ҳамаашро коргузошта шудаед."
 
-#: ../rpmdrake:651
+#: ../rpmdrake:655
 #, c-format
 msgid "All"
 msgstr "Ҳама"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:697 ../rpmdrake:702
+#: ../rpmdrake:701 ../rpmdrake:706
 #, c-format
 msgid "More info"
 msgstr "Маълумоти изофа"
 
-#: ../rpmdrake:705 ../rpmdrake:1623
+#: ../rpmdrake:709 ../rpmdrake:1627
 #, c-format
 msgid "Information on packages"
 msgstr "Маълумот дар қуттиҳо"
 
-#: ../rpmdrake:727
+#: ../rpmdrake:731
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Баъзе қуттиҳои иловагӣ бояд хориҷ карда шаванд"
 
-#: ../rpmdrake:728
+#: ../rpmdrake:732
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1343,12 +1345,12 @@ msgstr ""
 "шуд:\n"
 "\n"
 
-#: ../rpmdrake:734 ../rpmdrake:743
+#: ../rpmdrake:738 ../rpmdrake:747
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Якчнд қуттӣ коргузорӣ шуда наметавонад"
 
-#: ../rpmdrake:735
+#: ../rpmdrake:739
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1357,7 +1359,7 @@ msgstr ""
 "Хориҷи ин қуттиҳо системи Шуморо вайрон месозад, узр:\n"
 "\n"
 
-#: ../rpmdrake:744 ../rpmdrake:806
+#: ../rpmdrake:748 ../rpmdrake:810
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1368,12 +1370,12 @@ msgstr ""
 "кард:\n"
 "\n"
 
-#: ../rpmdrake:773
+#: ../rpmdrake:777
 #, c-format
 msgid "Additional packages needed"
 msgstr "Қуттиҳои иловагӣ лозиманд"
 
-#: ../rpmdrake:774
+#: ../rpmdrake:778
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1384,17 +1386,17 @@ msgstr ""
 "коргузошта шаванд:\n"
 "\n"
 
-#: ../rpmdrake:789
+#: ../rpmdrake:793
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (ба рӯйхати партофта аҳамият дорад)"
 
-#: ../rpmdrake:791
+#: ../rpmdrake:795
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Якчанд қуттиро коргузорӣ шуда наметавонад"
 
-#: ../rpmdrake:792
+#: ../rpmdrake:796
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1405,122 +1407,122 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:805 ../rpmdrake:1071
+#: ../rpmdrake:809 ../rpmdrake:1075
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Баъзе қуттиҳо бояд хориҷ шаванд"
 
-#: ../rpmdrake:830
+#: ../rpmdrake:834
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Интихобшуда: %d МБ / Фосилаи озоди диск: %d МБ"
 
-#: ../rpmdrake:831
+#: ../rpmdrake:835
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Ҳаҷми интихобшуда %d МБ"
 
-#: ../rpmdrake:837
+#: ../rpmdrake:841
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Барои ин баста тавсифот дастрас нест\n"
 
-#: ../rpmdrake:904
+#: ../rpmdrake:908
 #, c-format
 msgid "Security updates"
 msgstr "Навигариҳои бехатарӣ"
 
-#: ../rpmdrake:904
+#: ../rpmdrake:908
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Навигариҳои Ғалатислоҳ (Bugfixes)"
 
-#: ../rpmdrake:904
+#: ../rpmdrake:908
 #, c-format
 msgid "Normal updates"
 msgstr "Навигариҳои оддӣ"
 
-#: ../rpmdrake:924
+#: ../rpmdrake:928
 #, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:924
+#: ../rpmdrake:928
 #, c-format
-msgid "Mandrakelinux choices"
-msgstr "Интихоботи Mandrakelinux"
+msgid "Mandriva Linux choices"
+msgstr "Интихоботи Mandriva Linux"
 
-#: ../rpmdrake:927
+#: ../rpmdrake:931
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Ҳамаи қуттиҳо, аз рӯи алифбо"
 
-#: ../rpmdrake:935
+#: ../rpmdrake:939
 #, c-format
 msgid "All packages, by group"
 msgstr "Ҳаммаи қуттиҳо, мувофиқи гурӯҳ"
 
-#: ../rpmdrake:936
+#: ../rpmdrake:940
 #, c-format
 msgid "All packages, by size"
 msgstr "Ҳаммаи қуттиҳо, мувофиқи андоза"
 
-#: ../rpmdrake:937
+#: ../rpmdrake:941
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Ҳамаи қуттиҳо, аз рӯи ҳолати интихоб"
 
-#: ../rpmdrake:941
+#: ../rpmdrake:945
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Ҳамаи қуттиҳо, аз рӯи нигоҳдории сарчашма"
 
-#: ../rpmdrake:942
+#: ../rpmdrake:946
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Ҳамаи қуттиҳо, аз рӯи дастрас будани навигириҳо"
 
-#: ../rpmdrake:946
+#: ../rpmdrake:950
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Танҳо боқимондаҳо, аз рӯи сана насби ба навъҳо ҷудо шуда"
 
-#: ../rpmdrake:1020
+#: ../rpmdrake:1024
 #, c-format
 msgid "in names"
 msgstr "дар номҳо"
 
-#: ../rpmdrake:1022
+#: ../rpmdrake:1026
 #, c-format
 msgid "in descriptions"
 msgstr "дар тавсифҳо"
 
-#: ../rpmdrake:1024
+#: ../rpmdrake:1028
 #, c-format
 msgid "in file names"
 msgstr "дар номҳои файл"
 
-#: ../rpmdrake:1033
+#: ../rpmdrake:1037
 #, c-format
 msgid "Normal information"
 msgstr "Маълумоти оддӣ"
 
-#: ../rpmdrake:1033
+#: ../rpmdrake:1037
 #, c-format
 msgid "Maximum information"
 msgstr "Маълумоти калонтарин"
 
-#: ../rpmdrake:1053
+#: ../rpmdrake:1057
 #, c-format
 msgid "You need to select some packages first."
 msgstr "Пеш аз ҳама шумо бояд якчанд қуттиҳоро интихоб намоед."
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1062
 #, c-format
 msgid "Too many packages are selected"
 msgstr "Аз ҳад зиёд қуттиҳо интихоб шудаанд"
 
-#: ../rpmdrake:1059
+#: ../rpmdrake:1063
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1537,7 +1539,7 @@ msgstr ""
 "\n"
 "Шумо ҳақиқатан ҳамаи қуттиҳои интихобшударо коргузоштан мехоҳед?"
 
-#: ../rpmdrake:1072
+#: ../rpmdrake:1076
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1552,98 +1554,98 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../rpmdrake:1105
+#: ../rpmdrake:1109
 #, c-format
 msgid "Software Packages Removal"
 msgstr "Хориҷкунии Қуттиҳои Нармафзор"
 
-#: ../rpmdrake:1106
+#: ../rpmdrake:1110
 #, c-format
 msgid "Software Packages Update"
 msgstr "Навсозии Бастаи Нармафзор"
 
-#: ../rpmdrake:1107
+#: ../rpmdrake:1111
 #, c-format
 msgid "Software Packages Installation"
 msgstr "Коргузории Қуттиҳои Нармафзор"
 
-#: ../rpmdrake:1113 ../rpmdrake:1116 ../rpmdrake:1125 ../rpmdrake:1136
-#: ../rpmdrake:1141
+#: ../rpmdrake:1117 ../rpmdrake:1120 ../rpmdrake:1129 ../rpmdrake:1140
+#: ../rpmdrake:1145
 #, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../rpmdrake:1116
+#: ../rpmdrake:1120
 #, c-format
 msgid "/_Update media"
 msgstr "/_Навкунии сарчашма(ҳо)"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1129
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/_Бознишондодани интихоб"
 
-#: ../rpmdrake:1136
+#: ../rpmdrake:1140
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/Бозборкунии рӯйхати _қуттиҳо"
 
-#: ../rpmdrake:1141
+#: ../rpmdrake:1145
 #, c-format
 msgid "/_Quit"
 msgstr "/_Баромадан"
 
-#: ../rpmdrake:1141
+#: ../rpmdrake:1145
 #, c-format
 msgid "<control>Q"
-msgstr ""
+msgstr "<control>Q"
 
-#: ../rpmdrake:1144 ../rpmdrake:1145 ../rpmdrake:1152
+#: ../rpmdrake:1148 ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Options"
 msgstr "/_Интихобҳо"
 
-#: ../rpmdrake:1145 ../rpmdrake:1152
+#: ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/Ба _таври автоматӣ қуттиҳои интихобшударо нишон диҳед"
 
-#: ../rpmdrake:1149 ../rpmdrake:1150
+#: ../rpmdrake:1153 ../rpmdrake:1154
 #, c-format
 msgid "/_Help"
 msgstr "/_Ёрӣ"
 
-#: ../rpmdrake:1166
+#: ../rpmdrake:1170
 #, c-format
 msgid "Find:"
 msgstr "Ёфтан:"
 
-#: ../rpmdrake:1171
+#: ../rpmdrake:1175
 #, c-format
 msgid "Search"
 msgstr "Ҷустуҷӯ"
 
-#: ../rpmdrake:1177
+#: ../rpmdrake:1181
 #, c-format
 msgid "Install"
 msgstr "Коргузорӣ"
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1186
 #, c-format
 msgid "Quit"
 msgstr "Баромад"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1227
 #, c-format
 msgid "Fatal error"
 msgstr "Хатогии ҷиддӣ"
 
-#: ../rpmdrake:1224
+#: ../rpmdrake:1228
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Хатогии ҷиддӣ рӯй дод: %s."
 
-#: ../rpmdrake:1232
+#: ../rpmdrake:1236
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1656,12 +1658,12 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../rpmdrake:1241
+#: ../rpmdrake:1245
 #, c-format
 msgid "Already existing update media"
 msgstr "сарчашмаи нави аллакай вуҷуд дошта"
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1246
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1679,12 +1681,12 @@ msgstr ""
 "\n"
 "Сониян, %s-ро дуюм маротиба ба кор дароред."
 
-#: ../rpmdrake:1252
+#: ../rpmdrake:1256
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "Чӣ тавр оинаатонро дастӣ интихоб мекунед"
 
-#: ../rpmdrake:1253
+#: ../rpmdrake:1257
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1699,62 +1701,62 @@ msgstr ""
 "\n"
 "Пас, %s-ро бозоғоз кунед."
 
-#: ../rpmdrake:1286
+#: ../rpmdrake:1290
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Интизор шавед, ёфтани қуттиҳои дастрас..."
 
-#: ../rpmdrake:1364
+#: ../rpmdrake:1368
 #, c-format
 msgid "Inspecting %s"
 msgstr "Бозрасии(Назорати) %s"
 
-#: ../rpmdrake:1387
+#: ../rpmdrake:1391
 #, c-format
 msgid "changes:"
 msgstr "тағиротҳо:"
 
-#: ../rpmdrake:1395
+#: ../rpmdrake:1399
 #, c-format
 msgid "Remove .%s"
 msgstr "Хориҷи .%s"
 
-#: ../rpmdrake:1399
+#: ../rpmdrake:1403
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Истифодаи .%s ҳамчун файли асосӣ"
 
-#: ../rpmdrake:1403
+#: ../rpmdrake:1407
 #, c-format
 msgid "Do nothing"
 msgstr "Ҳеҷ кор накунед"
 
-#: ../rpmdrake:1419
+#: ../rpmdrake:1423
 #, c-format
 msgid "Installation finished"
 msgstr "Коргузориш шуд"
 
-#: ../rpmdrake:1434
+#: ../rpmdrake:1438
 #, c-format
 msgid "Inspect..."
 msgstr "Бозрас(Назорат)..."
 
-#: ../rpmdrake:1464 ../rpmdrake:1619
+#: ../rpmdrake:1468 ../rpmdrake:1623
 #, c-format
 msgid "Everything installed successfully"
 msgstr "Ҳама чиз бомуваффақият коргузорӣ|шудааст"
 
-#: ../rpmdrake:1465 ../rpmdrake:1620
+#: ../rpmdrake:1469 ../rpmdrake:1624
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Ҳамаи қуттиҳои талабшуда бомуваффақият коргузошташуданд."
 
-#: ../rpmdrake:1467 ../rpmdrake:1604
+#: ../rpmdrake:1471 ../rpmdrake:1608
 #, c-format
 msgid "Problem during installation"
 msgstr "Муаммоҳо ҳангоми коргузорӣ"
 
-#: ../rpmdrake:1468 ../rpmdrake:1605 ../rpmdrake:1660
+#: ../rpmdrake:1472 ../rpmdrake:1609 ../rpmdrake:1664
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1765,17 +1767,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1481
+#: ../rpmdrake:1485
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Қуттиҳои сарчашмавӣ гирифта нашуд."
 
-#: ../rpmdrake:1482
+#: ../rpmdrake:1486
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Узр, қуттиҳоро бо сарчашмааш гирифта намешавад. %s"
 
-#: ../rpmdrake:1483 ../rpmdrake:1554
+#: ../rpmdrake:1487 ../rpmdrake:1558
 #, c-format
 msgid ""
 "\n"
@@ -1788,39 +1790,39 @@ msgstr ""
 "Ҳисоботи Хатогӣ(ҳо):\n"
 "%s"
 
-#: ../rpmdrake:1490
+#: ../rpmdrake:1494
 #, c-format
 msgid "Package installation..."
 msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
-#: ../rpmdrake:1490
+#: ../rpmdrake:1494
 #, c-format
 msgid "Initializing..."
 msgstr "Коргузорӣ..."
 
-#: ../rpmdrake:1499
+#: ../rpmdrake:1503
 #, c-format
 msgid "Change medium"
 msgstr "Ивази миёна"
 
-#: ../rpmdrake:1500
+#: ../rpmdrake:1504
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 "Лутфан, сарчашмаи ифодашударо \"%s\" дар миён ҷо дохил намоед, аз рӯи дастгоҳ"
 "[%s]"
 
-#: ../rpmdrake:1507
+#: ../rpmdrake:1511
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Фаровиркунии қутии `%s' (%s/%s)..."
 
-#: ../rpmdrake:1530
+#: ../rpmdrake:1534
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Тафтиши имзоҳои қуттиҳо..."
 
-#: ../rpmdrake:1543
+#: ../rpmdrake:1547
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1835,12 +1837,12 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../rpmdrake:1551 ../rpmdrake:1659
+#: ../rpmdrake:1555 ../rpmdrake:1663
 #, c-format
 msgid "Installation failed"
 msgstr "Коргузорӣ амалӣ нагардид"
 
-#: ../rpmdrake:1552
+#: ../rpmdrake:1556
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1853,22 +1855,22 @@ msgstr ""
 "\n"
 "Мумкин шумо хоҳиши навкунии манбаи додаҳои сарчашмаро доред."
 
-#: ../rpmdrake:1565
+#: ../rpmdrake:1569
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
 
-#: ../rpmdrake:1568
+#: ../rpmdrake:1572
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Коргузории қуттии `%s' (%s/%s)..."
 
-#: ../rpmdrake:1584
+#: ../rpmdrake:1588
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "файли rpm [%s] дастрас нест"
 
-#: ../rpmdrake:1617
+#: ../rpmdrake:1621
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1881,48 +1883,48 @@ msgstr ""
 "Баъзе файлҳои танзимдарорӣ ҳамчун `.rpmnew' ё `.rpmsave' офарида шуда\n"
 "буд, акнун метавонед баъзеашонро барои амалиётҳо бозрасӣ кунед:"
 
-#: ../rpmdrake:1617
+#: ../rpmdrake:1621
 #, c-format
 msgid "everything was installed correctly"
 msgstr "ҳама чиз дуруст коргузорӣ шудааст"
 
-#: ../rpmdrake:1625
+#: ../rpmdrake:1629
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Ин бастаҳо бо ахбороти густаришёфта меоянд"
 
-#: ../rpmdrake:1637
+#: ../rpmdrake:1641
 #, fuzzy, c-format
 msgid "More information on package... [%s]"
 msgstr "Маълумоти иловагӣ барои қуттӣ..."
 
-#: ../rpmdrake:1650
+#: ../rpmdrake:1654
 #, c-format
 msgid "No package found for installation."
 msgstr "Барои амалӣ намудани коргузорӣ ягон қуттӣ ёфт нашуд."
 
-#: ../rpmdrake:1651
+#: ../rpmdrake:1655
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Хатогии бартарафнашаванда: афсӯс, ки қуттӣ барои коргузорӣ намудан ёфт нашуд."
 
-#: ../rpmdrake:1673
+#: ../rpmdrake:1677
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "Интизор шавед, хониши манбаи маълумоти қуттиҳо..."
 
-#: ../rpmdrake:1720
+#: ../rpmdrake:1724
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Интизор шавед, хориҷи қуттиҳо..."
 
-#: ../rpmdrake:1725
+#: ../rpmdrake:1729
 #, c-format
 msgid "Problem during removal"
 msgstr "Муаммо ҳангоми хориҷкунӣ"
 
-#: ../rpmdrake:1726
+#: ../rpmdrake:1730
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1933,7 +1935,7 @@ msgstr ""
 "\n"
 "%s "
 
-#: ../rpmdrake:1759
+#: ../rpmdrake:1763
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1946,7 +1948,7 @@ msgstr ""
 "Ин асбоб ба шумо барои интихоби нармафзор барои хориҷ аз компютери Шумо\n"
 "ёрӣ медиҳад."
 
-#: ../rpmdrake:1764
+#: ../rpmdrake:1768
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1959,203 +1961,213 @@ msgstr ""
 "Ин асбоб ба шумо барои интихоби навигарӣ барои коргузоштан ба компютери\n"
 "Шумо ёрӣ медиҳад."
 
-#: ../rpmdrake:1769
+#: ../rpmdrake:1773
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1770
+#: ../rpmdrake:1774
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
-"Your Mandrakelinux system comes with several thousands of software\n"
+"Your Mandriva Linux system comes with several thousands of software\n"
 "packages on CDROM or DVD. This tool will help you choose which software\n"
 "you want to install on your computer."
 msgstr ""
 "Марҳамат ба асбоби коргузориши нармафзор!\n"
 "\n"
-"Системи Шумо, Mandrakelinux бо якчанд ҳазор қуттиҳои нармафзор дар CDROM\n"
+"Системи Шумо, Mandriva Linux бо якчанд ҳазор қуттиҳои нармафзор дар CDROM\n"
 "ё DVD пешниҳод карда мешавад. Ин асбоб ба шумо барои интихоби нармафзор\n"
 "барои коргузоштан ба компютери Шумо ёрӣ медиҳад."
 
-#: ../rpmdrake.pm:94
+#: ../rpmdrake.pm:95
 #, fuzzy, c-format
 msgid "Software Update"
 msgstr "Навсозии Бастаи Нармафзор"
 
-#: ../rpmdrake.pm:94
+#: ../rpmdrake.pm:95
 #, c-format
-msgid "Mandrakelinux Update"
-msgstr "Навигарии Mandrakelinux"
+msgid "Mandriva Linux Update"
+msgstr "Навигарии Mandriva Linux"
+
+#: ../rpmdrake.pm:122
+#, fuzzy, c-format
+msgid "Please enter your credentials for accessing proxy\n"
+msgstr "Лутфан. дар поён суроғаи электронии худро дохил намоед "
 
-#: ../rpmdrake.pm:183
+#: ../rpmdrake.pm:123
+#, fuzzy, c-format
+msgid "User name:"
+msgstr "Номи корванд:"
+
+#: ../rpmdrake.pm:215
 #, c-format
 msgid "No"
 msgstr "Не"
 
-#: ../rpmdrake.pm:187
+#: ../rpmdrake.pm:219
 #, c-format
 msgid "Yes"
 msgstr "Ҳа"
 
-#: ../rpmdrake.pm:235
+#: ../rpmdrake.pm:267
 #, c-format
 msgid "Info..."
 msgstr "Маълумот..."
 
-#: ../rpmdrake.pm:311
+#: ../rpmdrake.pm:343
 #, c-format
 msgid "Austria"
 msgstr "Австрия"
 
-#: ../rpmdrake.pm:312
+#: ../rpmdrake.pm:344
 #, c-format
 msgid "Australia"
 msgstr "Остролиё"
 
-#: ../rpmdrake.pm:313
+#: ../rpmdrake.pm:345
 #, c-format
 msgid "Belgium"
 msgstr "Белжик"
 
-#: ../rpmdrake.pm:314
+#: ../rpmdrake.pm:346
 #, c-format
 msgid "Brazil"
 msgstr "Бразил"
 
-#: ../rpmdrake.pm:315
+#: ../rpmdrake.pm:347
 #, c-format
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rpmdrake.pm:316
+#: ../rpmdrake.pm:348
 #, c-format
 msgid "Switzerland"
 msgstr "Суис"
 
-#: ../rpmdrake.pm:317
+#: ../rpmdrake.pm:349
 #, c-format
 msgid "Costa Rica"
 msgstr "Косто Рико"
 
-#: ../rpmdrake.pm:318
+#: ../rpmdrake.pm:350
 #, c-format
 msgid "Czech Republic"
 msgstr "Ҷумҳурии Чех"
 
-#: ../rpmdrake.pm:319
+#: ../rpmdrake.pm:351
 #, c-format
 msgid "Germany"
 msgstr "Олмон"
 
-#: ../rpmdrake.pm:320
+#: ../rpmdrake.pm:352
 #, c-format
 msgid "Danmark"
 msgstr "Донморк"
 
-#: ../rpmdrake.pm:321 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:353 ../rpmdrake.pm:357
 #, c-format
 msgid "Greece"
 msgstr "Юнон"
 
-#: ../rpmdrake.pm:322
+#: ../rpmdrake.pm:354
 #, c-format
 msgid "Spain"
 msgstr "Успаниё"
 
-#: ../rpmdrake.pm:323
+#: ../rpmdrake.pm:355
 #, c-format
 msgid "Finland"
 msgstr "Финлонд"
 
-#: ../rpmdrake.pm:324
+#: ../rpmdrake.pm:356
 #, c-format
 msgid "France"
 msgstr "Фаронса"
 
-#: ../rpmdrake.pm:326
+#: ../rpmdrake.pm:358
 #, c-format
 msgid "Hungary"
 msgstr "Маҷористон"
 
-#: ../rpmdrake.pm:327
+#: ../rpmdrake.pm:359
 #, c-format
 msgid "Israel"
 msgstr "Исроил"
 
-#: ../rpmdrake.pm:328
+#: ../rpmdrake.pm:360
 #, c-format
 msgid "Italy"
 msgstr "Италия"
 
-#: ../rpmdrake.pm:329
+#: ../rpmdrake.pm:361
 #, c-format
 msgid "Japan"
 msgstr "Ҷопон"
 
-#: ../rpmdrake.pm:330
+#: ../rpmdrake.pm:362
 #, c-format
 msgid "Korea"
 msgstr "Куриё"
 
-#: ../rpmdrake.pm:331
+#: ../rpmdrake.pm:363
 #, c-format
 msgid "Netherlands"
 msgstr "Ҳуланд"
 
-#: ../rpmdrake.pm:332
+#: ../rpmdrake.pm:364
 #, c-format
 msgid "Norway"
 msgstr "Норвеж"
 
-#: ../rpmdrake.pm:333
+#: ../rpmdrake.pm:365
 #, c-format
 msgid "Poland"
 msgstr "Лаҳистон"
 
-#: ../rpmdrake.pm:334
+#: ../rpmdrake.pm:366
 #, c-format
 msgid "Portugal"
 msgstr "Пуртуқол"
 
-#: ../rpmdrake.pm:335
+#: ../rpmdrake.pm:367
 #, c-format
 msgid "Russia"
 msgstr "Русия"
 
-#: ../rpmdrake.pm:336
+#: ../rpmdrake.pm:368
 #, c-format
 msgid "Sweden"
 msgstr "Шветсия"
 
-#: ../rpmdrake.pm:337
+#: ../rpmdrake.pm:369
 #, c-format
 msgid "Slovakia"
 msgstr "Услувок"
 
-#: ../rpmdrake.pm:338
+#: ../rpmdrake.pm:370
 #, c-format
 msgid "Taiwan"
 msgstr "Тойвон"
 
-#: ../rpmdrake.pm:339
+#: ../rpmdrake.pm:371
 #, c-format
 msgid "United Kingdom"
 msgstr "Подшоҳии Муттаҳида"
 
-#: ../rpmdrake.pm:340
+#: ../rpmdrake.pm:372
 #, c-format
 msgid "China"
 msgstr "Хитой"
 
-#: ../rpmdrake.pm:341 ../rpmdrake.pm:342 ../rpmdrake.pm:343 ../rpmdrake.pm:344
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:373 ../rpmdrake.pm:374 ../rpmdrake.pm:375 ../rpmdrake.pm:376
+#: ../rpmdrake.pm:453
 #, c-format
 msgid "United States"
 msgstr "Иёлоти Муттаҳида"
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:468
 #, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2163,43 +2175,40 @@ msgid ""
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Барои гирифтани рӯйхати оинаҳо ба пойгоҳи Mandrakesoft пайваст шудан лозим.\n"
+"Барои гирифтани рӯйхати оинаҳо ба пойгоҳи Mandriva пайваст шудан лозим.\n"
 "Лутфан тафтиш кунед ки шабакаи шумо дуруст кор карда истодааст.\n"
 "\n"
 "Давом додан гирем?"
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:472
 #, c-format
 msgid ""
-"I need to contact the Mandrakesoft website to get the mirror list.\n"
+"I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Барои гирифтани рӯйхати оинаҳо ба пойгоҳи Mandrakesoft пайваст шудан лозим.\n"
+"Барои гирифтани рӯйхати оинаҳо ба пойгоҳи Mandriva пайваст шудан лозим.\n"
 "Лутфан тафтиш кунед ки шабакаи шумо дуруст кор карда истодааст.\n"
 "\n"
 "Давом додан гирем?"
 
-#: ../rpmdrake.pm:443
+#: ../rpmdrake.pm:478
 #, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
-msgstr ""
-"Лутфан интизор шавед, фаровири адресҳои оинаҳо аз пойгоҳи Mandrakesoft."
+msgstr "Лутфан интизор шавед, фаровири адресҳои оинаҳо аз пойгоҳи Mandriva."
 
-#: ../rpmdrake.pm:444
+#: ../rpmdrake.pm:479
 #, c-format
-msgid ""
-"Please wait, downloading mirror addresses from the Mandrakesoft website."
-msgstr ""
-"Лутфан интизор шавед, фаровири адресҳои оинаҳо аз пойгоҳи Mandrakesoft."
+msgid "Please wait, downloading mirror addresses from the Mandriva website."
+msgstr "Лутфан интизор шавед, фаровири адресҳои оинаҳо аз пойгоҳи Mandriva."
 
-#: ../rpmdrake.pm:450
+#: ../rpmdrake.pm:485
 #, c-format
 msgid "Error during download"
 msgstr "Хатогӣ ҳангоми фаровир"
 
-#: ../rpmdrake.pm:452
+#: ../rpmdrake.pm:487
 #, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2211,106 +2220,106 @@ msgstr ""
 "Ҳангоми фаровиркунии рӯйхати оинаҳо хатогӣ рух дод:\n"
 "\n"
 "%s\n"
-"Шабака, ё пойгоҳи Mandrakesoft, мумкин дастрас набошанд.\n"
+"Шабака, ё пойгоҳи Mandriva, мумкин дастрас набошанд.\n"
 "Лутфан дертар такрор кунед."
 
-#: ../rpmdrake.pm:457
+#: ../rpmdrake.pm:492
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
 "%s\n"
-"The network, or the Mandrakesoft website, may be unavailable.\n"
+"The network, or the Mandriva website, may be unavailable.\n"
 "Please try again later."
 msgstr ""
 "Ҳангоми фаровиркунии рӯйхати оинаҳо хатогӣ рух дод:\n"
 "\n"
 "%s\n"
-"Шабака, ё пойгоҳи Mandrakesoft, мумкин дастрас набошанд.\n"
+"Шабака, ё пойгоҳи Mandriva, мумкин дастрас набошанд.\n"
 "Лутфан дертар такрор кунед."
 
-#: ../rpmdrake.pm:466
+#: ../rpmdrake.pm:501
 #, c-format
 msgid "No mirror"
 msgstr "Оина нест"
 
-#: ../rpmdrake.pm:468
+#: ../rpmdrake.pm:503
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:469
+#: ../rpmdrake.pm:504
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
 "There can be many reasons for this problem; the most frequent is\n"
 "the case when the architecture of your processor is not supported\n"
-"by Mandrakelinux Official Updates."
+"by Mandriva Linux Official Updates."
 msgstr ""
 "Ин ягон оинаи мувофиқ ёфта наметавонад.\n"
 "\n"
 "Барои ин муаммо якчанд асосҳо шуданаш мумкин; аз ҳама бисёртараш ин\n"
-"ҳолате ки сохти пардозандаи шумо бо Навигариҳои Расмии Mandrakelinux\n"
+"ҳолате ки сохти пардозандаи шумо бо Навигариҳои Расмии Mandriva Linux\n"
 "дастгир нашудааст."
 
-#: ../rpmdrake.pm:488
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Лутфан оинаи хоҳиширо интихоб кунед."
 
-#: ../rpmdrake.pm:547
+#: ../rpmdrake.pm:581
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Нусхабардории файл барои сарчашмаи `%s'..."
 
-#: ../rpmdrake.pm:550
+#: ../rpmdrake.pm:584
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Дида баромадани файли сарчашмаи `%s'..."
 
-#: ../rpmdrake.pm:553
+#: ../rpmdrake.pm:587
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Санҷидани файли дури сарчашмаи `%s'..."
 
-#: ../rpmdrake.pm:557
+#: ../rpmdrake.pm:591
 #, c-format
 msgid " done."
 msgstr " шуд."
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:595
 #, c-format
 msgid " failed!"
 msgstr " нагузашт!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:565
+#: ../rpmdrake.pm:599
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s аз сарчашмаи %s"
 
-#: ../rpmdrake.pm:569
+#: ../rpmdrake.pm:603
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Ба гирифтани маълумот сар намудан `%s'..."
 
-#: ../rpmdrake.pm:573
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Фаровири `%s', вақт:%s, суръат:%s"
 
-#: ../rpmdrake.pm:576
+#: ../rpmdrake.pm:610
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Фаровири `%s', суръат:%s"
 
-#: ../rpmdrake.pm:613
+#: ../rpmdrake.pm:647
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Хатогии бозгардонии бастаҳо"
 
-#: ../rpmdrake.pm:614
+#: ../rpmdrake.pm:648
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2326,27 +2335,27 @@ msgstr ""
 "истифода баред бо мақсади азнавтанзимкунии он, ё дар айни замон он\n"
 "дастнорас аст ва шумо бояд дертар кӯшиш кунед."
 
-#: ../rpmdrake.pm:645
+#: ../rpmdrake.pm:679
 #, c-format
 msgid "Update media"
 msgstr "Навкунии сарчашма(ҳо)"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Сарчашмаҳое, ки аз нав кардан мехоҳед, интихоб кунед:"
 
-#: ../rpmdrake.pm:667
+#: ../rpmdrake.pm:701
 #, fuzzy, c-format
 msgid "Select all"
 msgstr "Интихобшуда"
 
-#: ../rpmdrake.pm:671
+#: ../rpmdrake.pm:705
 #, c-format
 msgid "Update"
 msgstr "Нав кардан"
 
-#: ../rpmdrake.pm:693
+#: ../rpmdrake.pm:727
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2360,7 +2369,7 @@ msgstr ""
 "Хатогиҳо:\n"
 "%s"
 
-#: ../rpmdrake.pm:717 ../rpmdrake.pm:726
+#: ../rpmdrake.pm:751 ../rpmdrake.pm:760
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2371,17 +2380,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:772
 #, c-format
 msgid "Unable to create medium."
 msgstr "Тартиби сарчашма номумкин мебошад."
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:777
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Нокомӣ ҳангоми иловакунии муҳит"
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:778
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2392,34 +2401,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:757
+#: ../rpmdrake.pm:791
 #, fuzzy, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
 "It will be disabled."
 msgstr ""
-"`%s'-и миёнаи шумо, ки навсозӣ карда мешавад, ба нусхаи Mandrakelinux "
+"`%s'-и миёнаи шумо, ки навсозӣ карда мешавад, ба нусхаи Mandriva Linux "
 "коргузорӣ карда истодаи (%s) мувофиқат намекунад.\n"
 "Он хомӯш мегардад."
 
-#: ../rpmdrake.pm:760
+#: ../rpmdrake.pm:794
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of "
-"Mandrakelinux you're running (%s).\n"
+"Your medium `%s', used for updates, does not match the version of Mandriva "
+"Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
-"`%s'-и миёнаи шумо, ки навсозӣ карда мешавад, ба нусхаи Mandrakelinux "
+"`%s'-и миёнаи шумо, ки навсозӣ карда мешавад, ба нусхаи Mandriva Linux "
 "коргузорӣ карда истодаи (%s) мувофиқат намекунад.\n"
 "Он хомӯш мегардад."
 
-#: ../rpmdrake.pm:776
+#: ../rpmdrake.pm:810
 #, c-format
 msgid "Help launched in background"
 msgstr "Дар ҳолати паснамо маълумотгирӣ ба кор роҳ монда шудааст"
 
-#: ../rpmdrake.pm:777
+#: ../rpmdrake.pm:811
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -2699,6 +2708,9 @@ msgstr "Хориҷи Нармафзор"
 msgid "Software Media Manager"
 msgstr "Мудири Сарчашмаҳои Нармафзор"
 
+#~ msgid "Keys"
+#~ msgstr "Калидҳо"
+
 #~ msgid "Rpmdrake %s"
 #~ msgstr "Rpmdrake %s"